diff --git a/.gitignore b/.gitignore index c4415cf3e..6f6082b81 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ atlassian-ide-plugin.xml .svn target +data ## Ignore project files created by Eclipse .settings diff --git a/pom.xml b/pom.xml index b5ce8797e..898e85c8a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,78 +1,41 @@ 4.0.0 + org.springframework.data spring-data-elasticsearch 1.0.0.BUILD-SNAPSHOT - jar - 2013 - https://github.com/BioMedCentralLtd/spring-data-elasticsearch + + + org.springframework.data.build + spring-data-parent + 1.1.0.BUILD-SNAPSHOT + ../spring-data-build/parent/pom.xml + + Spring Data Elasticsearch Spring Data Implementation for Elasticsearch - - BioMed Central - http://www.biomedcentral.com - - + https://github.com/SpringSource/spring-data-elasticsearch + - UTF-8 - 4.11 - 3.1.4.RELEASE - 1.7.1 - 2.6 - 0.20.5 - 4.2.2 - 1.5.0.RELEASE - 2.1 - 1.0.7 - 1.9.5 - 1.3 - 1.0-SP4 - 1.1.5 - ${project.artifactId}-${project.version} + + DATAES + + 3.2.1 + 2.6 + 0.20.5 + 1.9.2 + 1.6.0.BUILD-SNAPSHOT + - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - Copyright 2013 the original author or authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. - See the License for the specific language governing permissions and - limitations under the License. - - - - - - https://github.com/biomedcentral/spring-data-elasticsearch - scm:git:git://github.com/biomedcentral/spring-data-elasticsearch.git - scm:git:ssh://git@github.com:biomedcentral/spring-data-elasticsearch.git - - - - Travis - https://travis-ci.org/BioMedCentralLtd/spring-data-elasticsearch - - - + + org.springframework spring-context - ${spring.version} + ${spring} commons-logging @@ -80,10 +43,11 @@ + org.springframework spring-tx - ${spring.version} + ${spring} @@ -98,105 +62,62 @@ org.springframework.data spring-data-commons - ${spring.data-commons.version} + ${springdata.commons} commons-lang commons-lang - ${commons-lang.version} + ${commonslang} commons-collections commons-collections - 3.2.1 + ${commonscollections} joda-time joda-time - ${joda-time.version} + ${jodatime} - + org.elasticsearch elasticsearch - ${elasticsearch.version} + ${elasticsearch} org.codehaus.jackson jackson-mapper-asl - 1.9.2 - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - test - - - ch.qos.logback - logback-classic - ${logback-classic.version} - test + ${jackson} javax.enterprise cdi-api - ${cdi.version} + ${cdi} provided true - + org.springframework spring-test - ${spring.version} - test - - - junit - junit - ${junit.version} - test - - - org.mockito - mockito-core - ${mockito.version} - - - org.hamcrest - hamcrest-core - - - test - - - org.hamcrest - hamcrest-all - ${hamcrest.version} + ${spring} test org.apache.openwebbeans.test cditest-owb - ${webbeans.version} + ${webbeans} test @@ -205,193 +126,16 @@ - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.1 - - true - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.12 - - - integration-test - - integration-test - - - - verify - - verify - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12 - - - org.sonatype.maven.plugin - emma-maven-plugin - 1.2 - + org.apache.maven.plugins + maven-assembly-plugin + + + org.codehaus.mojo + wagon-maven-plugin + - - - jar-with-dependencies - - - - maven-assembly-plugin - 2.3 - - src/main/assembly/jar-with-dependencies.descriptor.xml - - - - - - - distribute - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8 - - - - javadoc - - package - - - - true -
Spring Data Elasticsearch
- ${project.version} - true - - true - - http://static.springframework.org/spring/docs/3.1.x/javadoc-api - http://download.oracle.com/javase/1.5.0/docs/api - http://static.springsource.org/spring-data/data-commons/docs/${spring.data-commons.version}/api - - - - - com.agilejava.docbkx - docbkx-maven-plugin - 2.0.7 - - - - generate-html - generate-pdf - - package - - - - - org.docbook - docbook-xml - 4.4 - runtime - - - - index.xml - true - ${project.basedir}/src/docbkx/resources/xsl/fopdf.xsl - css/html.css - false - ${project.basedir}/src/docbkx/resources/xsl/html.xsl - 1 - 1 - - - version - ${project.version} - - - - - - - - - - - - - - - - - - - - - - - - maven-assembly-plugin - 2.2.1 - - - distribution - - single - - package - - - ${project.basedir}/src/main/assembly/distribution.xml - - false - - - - - - - - - biomedcentral @@ -399,5 +143,28 @@ +0 + + + + spring-libs-snapshot + http://repo.springsource.org/lib-snapshot-local + + + + + https://github.com/SpringSource/spring-data-elasticsearch + scm:git:git://github.com/SpringSource/spring-data-elasticsearch.git + scm:git:ssh://git@github.com:SpringSource/spring-data-elasticsearch.git + + + + Bamboo + http://build.springsource.org/browse/SPRINGDATAESh + + + + JIRA + https://jira.springsource.org/browse/DATAES + diff --git a/src/test/java/org/springframework/data/elasticsearch/NestedObjectTest.java b/src/test/java/org/springframework/data/elasticsearch/NestedObjectTests.java similarity index 95% rename from src/test/java/org/springframework/data/elasticsearch/NestedObjectTest.java rename to src/test/java/org/springframework/data/elasticsearch/NestedObjectTests.java index 00065b99f..5ddde6b71 100644 --- a/src/test/java/org/springframework/data/elasticsearch/NestedObjectTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/NestedObjectTests.java @@ -35,7 +35,7 @@ import static org.junit.Assert.assertThat; */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("classpath:/repository-test-nested-object.xml") -public class NestedObjectTest{ +public class NestedObjectTests{ @Resource private SampleElasticSearchBookRepository repository; diff --git a/src/test/java/org/springframework/data/elasticsearch/NonDocumentEntityTest.java b/src/test/java/org/springframework/data/elasticsearch/NonDocumentEntityTests.java similarity index 94% rename from src/test/java/org/springframework/data/elasticsearch/NonDocumentEntityTest.java rename to src/test/java/org/springframework/data/elasticsearch/NonDocumentEntityTests.java index 3d7274200..bca4b6ffd 100644 --- a/src/test/java/org/springframework/data/elasticsearch/NonDocumentEntityTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/NonDocumentEntityTests.java @@ -24,7 +24,7 @@ import org.springframework.data.elasticsearch.repositories.NonDocumentEntityRepo * @author Rizwan Idrees * @author Mohsin Husen */ -public class NonDocumentEntityTest { +public class NonDocumentEntityTests { @Test(expected = BeanCreationException.class) diff --git a/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchNamespaceHandlerTest.java b/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchNamespaceHandlerTests.java similarity index 95% rename from src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchNamespaceHandlerTest.java rename to src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchNamespaceHandlerTests.java index 929816a00..87ba04b11 100644 --- a/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchNamespaceHandlerTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchNamespaceHandlerTests.java @@ -37,7 +37,7 @@ import static org.junit.Assert.assertThat; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("namespace.xml") -public class ElasticsearchNamespaceHandlerTest { +public class ElasticsearchNamespaceHandlerTests { @Autowired private ApplicationContext context; diff --git a/src/test/java/org/springframework/data/elasticsearch/config/EnableElasticsearchRepositoriesTest.java b/src/test/java/org/springframework/data/elasticsearch/config/EnableElasticsearchRepositoriesTests.java similarity index 95% rename from src/test/java/org/springframework/data/elasticsearch/config/EnableElasticsearchRepositoriesTest.java rename to src/test/java/org/springframework/data/elasticsearch/config/EnableElasticsearchRepositoriesTests.java index 8081da5a1..7794ca986 100644 --- a/src/test/java/org/springframework/data/elasticsearch/config/EnableElasticsearchRepositoriesTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/config/EnableElasticsearchRepositoriesTests.java @@ -39,7 +39,7 @@ import static org.junit.Assert.assertThat; */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration -public class EnableElasticsearchRepositoriesTest { +public class EnableElasticsearchRepositoriesTests { @Configuration @EnableElasticsearchRepositories(basePackages = "org.springframework.data.elasticsearch.repositories") diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTest.java b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java similarity index 97% rename from src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTest.java rename to src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java index e7f539031..f74510e57 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java @@ -51,7 +51,7 @@ import static org.junit.Assert.*; */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("classpath:elasticsearch-template-test.xml") -public class ElasticsearchTemplateTest { +public class ElasticsearchTemplateTests { @Autowired private ElasticsearchTemplate elasticsearchTemplate; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/convert/DateTimeConvertersTest.java b/src/test/java/org/springframework/data/elasticsearch/core/convert/DateTimeConvertersTests.java similarity index 95% rename from src/test/java/org/springframework/data/elasticsearch/core/convert/DateTimeConvertersTest.java rename to src/test/java/org/springframework/data/elasticsearch/core/convert/DateTimeConvertersTests.java index 90d85936d..efbeac6df 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/convert/DateTimeConvertersTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/convert/DateTimeConvertersTests.java @@ -30,7 +30,7 @@ import java.util.TimeZone; * @author Rizwan Idrees * @author Mohsin Husen */ -public class DateTimeConvertersTest { +public class DateTimeConvertersTests { @Test public void testJodaDateTimeConverterWithNullValue() { Assert.assertNull(DateTimeConverters.JodaDateTimeConverter.INSTANCE.convert(null)); diff --git a/src/test/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverterTest.java b/src/test/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverterTests.java similarity index 95% rename from src/test/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverterTest.java rename to src/test/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverterTests.java index ee68c5956..9b6a7dfe1 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverterTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverterTests.java @@ -27,7 +27,7 @@ import static org.junit.Assert.assertThat; * @author Rizwan Idrees * @author Mohsin Husen */ -public class MappingElasticsearchConverterTest { +public class MappingElasticsearchConverterTests { @Test(expected = IllegalArgumentException.class) public void shouldFailToInitializeGivenMappingContextIsNull(){ diff --git a/src/test/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntityTest.java b/src/test/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntityTests.java similarity index 96% rename from src/test/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntityTest.java rename to src/test/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntityTests.java index aa13c9d0f..daeeea195 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntityTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntityTests.java @@ -28,7 +28,7 @@ import java.beans.PropertyDescriptor; * @author Rizwan Idrees * @author Mohsin Husen */ -public class SimpleElasticsearchPersistentEntityTest { +public class SimpleElasticsearchPersistentEntityTests { @Test(expected = IllegalArgumentException.class) public void shouldThrowExceptionGivenVersionPropertyIsNotLong() throws NoSuchFieldException, IntrospectionException { diff --git a/src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTest.java b/src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTests.java similarity index 97% rename from src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTest.java rename to src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTests.java index 4759129d5..a57d9bc74 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTests.java @@ -42,7 +42,7 @@ import static org.junit.Assert.assertTrue; */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("classpath:elasticsearch-template-test.xml") -public class CriteriaQueryTest { +public class CriteriaQueryTests { @Resource private ElasticsearchTemplate elasticsearchTemplate; diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTest.java b/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java similarity index 97% rename from src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTest.java rename to src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java index 9fd08ad80..20ca76252 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java @@ -44,7 +44,7 @@ import static org.junit.Assert.assertThat; */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("classpath:custom-method-repository-test.xml") -public class CustomMethodRepositoryTest { +public class CustomMethodRepositoryTests { @Resource private SampleCustomMethodRepository repository; diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTest.java b/src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTests.java similarity index 99% rename from src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTest.java rename to src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTests.java index 094e7d5ae..00fdc986e 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTests.java @@ -50,7 +50,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("classpath:/simple-repository-test.xml") -public class DoubleIDRepositoryTest { +public class DoubleIDRepositoryTests { @Resource diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchRepositoryFactoryTest.java b/src/test/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchRepositoryFactoryTests.java similarity index 95% rename from src/test/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchRepositoryFactoryTest.java rename to src/test/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchRepositoryFactoryTests.java index c522aa33a..66993ca11 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchRepositoryFactoryTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchRepositoryFactoryTests.java @@ -38,7 +38,7 @@ import static org.mockito.Mockito.when; * @author Mohsin Husen */ @RunWith(MockitoJUnitRunner.class) -public class ElasticsearchRepositoryFactoryTest { +public class ElasticsearchRepositoryFactoryTests { @Mock private ElasticsearchOperations operations; diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTest.java b/src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTests.java similarity index 99% rename from src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTest.java rename to src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTests.java index 16f290f6d..f9a749620 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTests.java @@ -50,7 +50,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("classpath:/simple-repository-test.xml") -public class IntegerIDRepositoryTest { +public class IntegerIDRepositoryTests { @Resource diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTest.java b/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java similarity index 97% rename from src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTest.java rename to src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java index 13247c872..093265fb6 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTest.java +++ b/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java @@ -47,7 +47,7 @@ import static org.junit.Assert.*; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("classpath:/simple-repository-test.xml") -public class SimpleElasticsearchRepositoryTest { +public class SimpleElasticsearchRepositoryTests { @Resource private SampleElasticsearchRepository repository; diff --git a/template.mf b/template.mf new file mode 100644 index 000000000..76f78ed99 --- /dev/null +++ b/template.mf @@ -0,0 +1,20 @@ +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.springframework.data.elasticsearch +Bundle-Name: ${project.name} +Bundle-Vendor: SpringSource +Bundle-Version: ${project.version} +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Export-Template: + org.springframework.data.elasticsearch.*;version="${project.version}" +Import-Template: + javax.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional, + org.apache.commons.collections.*;version="${commonscollections:[=.=.=,+1.0.0)}";resolution:=optional, + org.apache.commons.lang.*;version="${commonslang:[=.=.=,+1.0.0)}", + org.codehaus.jackson.*;version="${jackson:[=.=.=,+1.0.0)}", + org.elasticsearch.*;version="${elasticsearch:[=.=.=,+1.0.0)}", + org.joda.time.*;version="${jodatime:[=.=.=,+1.0.0)}", + org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}", + org.springframework.*;version="${spring30:[=.=.=.=,+1.0.0)}", + org.springframework.data.*;version="${springdata.commons:[=.=.=.=,+1.0.0)}", + org.w3c.*;version="0.0.0" + \ No newline at end of file