Skip to content

Commit a8aca3e

Browse files
committed
DATAES-3 - Moved to Spring Data build system.
Updated pom to use Spring Data build parent file. Renamed Test files to …Tests for the Surefire plugin be able to find it. Added data folder to .gitignore. Added template.mf for Bundlor to create an OSGi MANIFEST.MF.
1 parent 03e3b59 commit a8aca3e

17 files changed

+101
-313
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ atlassian-ide-plugin.xml
44
.svn
55

66
target
7+
data
78

89
## Ignore project files created by Eclipse
910
.settings

pom.xml

Lines changed: 66 additions & 299 deletions
Large diffs are not rendered by default.

src/test/java/org/springframework/data/elasticsearch/NestedObjectTest.java renamed to src/test/java/org/springframework/data/elasticsearch/NestedObjectTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
*/
3636
@RunWith(SpringJUnit4ClassRunner.class)
3737
@ContextConfiguration("classpath:/repository-test-nested-object.xml")
38-
public class NestedObjectTest{
38+
public class NestedObjectTests{
3939

4040
@Resource
4141
private SampleElasticSearchBookRepository repository;

src/test/java/org/springframework/data/elasticsearch/NonDocumentEntityTest.java renamed to src/test/java/org/springframework/data/elasticsearch/NonDocumentEntityTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* @author Rizwan Idrees
2525
* @author Mohsin Husen
2626
*/
27-
public class NonDocumentEntityTest {
27+
public class NonDocumentEntityTests {
2828

2929

3030
@Test(expected = BeanCreationException.class)

src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchNamespaceHandlerTest.java renamed to src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchNamespaceHandlerTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
@RunWith(SpringJUnit4ClassRunner.class)
3939
@ContextConfiguration("namespace.xml")
40-
public class ElasticsearchNamespaceHandlerTest {
40+
public class ElasticsearchNamespaceHandlerTests {
4141

4242
@Autowired
4343
private ApplicationContext context;

src/test/java/org/springframework/data/elasticsearch/config/EnableElasticsearchRepositoriesTest.java renamed to src/test/java/org/springframework/data/elasticsearch/config/EnableElasticsearchRepositoriesTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
*/
4040
@RunWith(SpringJUnit4ClassRunner.class)
4141
@ContextConfiguration
42-
public class EnableElasticsearchRepositoriesTest {
42+
public class EnableElasticsearchRepositoriesTests {
4343

4444
@Configuration
4545
@EnableElasticsearchRepositories(basePackages = "org.springframework.data.elasticsearch.repositories")

src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTest.java renamed to src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
*/
5252
@RunWith(SpringJUnit4ClassRunner.class)
5353
@ContextConfiguration("classpath:elasticsearch-template-test.xml")
54-
public class ElasticsearchTemplateTest {
54+
public class ElasticsearchTemplateTests {
5555

5656
@Autowired
5757
private ElasticsearchTemplate elasticsearchTemplate;

src/test/java/org/springframework/data/elasticsearch/core/convert/DateTimeConvertersTest.java renamed to src/test/java/org/springframework/data/elasticsearch/core/convert/DateTimeConvertersTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* @author Rizwan Idrees
3131
* @author Mohsin Husen
3232
*/
33-
public class DateTimeConvertersTest {
33+
public class DateTimeConvertersTests {
3434
@Test
3535
public void testJodaDateTimeConverterWithNullValue() {
3636
Assert.assertNull(DateTimeConverters.JodaDateTimeConverter.INSTANCE.convert(null));
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @author Rizwan Idrees
2828
* @author Mohsin Husen
2929
*/
30-
public class MappingElasticsearchConverterTest {
30+
public class MappingElasticsearchConverterTests {
3131

3232
@Test(expected = IllegalArgumentException.class)
3333
public void shouldFailToInitializeGivenMappingContextIsNull(){
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* @author Rizwan Idrees
2929
* @author Mohsin Husen
3030
*/
31-
public class SimpleElasticsearchPersistentEntityTest {
31+
public class SimpleElasticsearchPersistentEntityTests {
3232

3333
@Test(expected = IllegalArgumentException.class)
3434
public void shouldThrowExceptionGivenVersionPropertyIsNotLong() throws NoSuchFieldException, IntrospectionException {

src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTest.java renamed to src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
*/
4343
@RunWith(SpringJUnit4ClassRunner.class)
4444
@ContextConfiguration("classpath:elasticsearch-template-test.xml")
45-
public class CriteriaQueryTest {
45+
public class CriteriaQueryTests {
4646

4747
@Resource
4848
private ElasticsearchTemplate elasticsearchTemplate;

src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTest.java renamed to src/test/java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
*/
4545
@RunWith(SpringJUnit4ClassRunner.class)
4646
@ContextConfiguration("classpath:custom-method-repository-test.xml")
47-
public class CustomMethodRepositoryTest {
47+
public class CustomMethodRepositoryTests {
4848

4949
@Resource
5050
private SampleCustomMethodRepository repository;

src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTest.java renamed to src/test/java/org/springframework/data/elasticsearch/repository/support/DoubleIDRepositoryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
@RunWith(SpringJUnit4ClassRunner.class)
5252
@ContextConfiguration("classpath:/simple-repository-test.xml")
53-
public class DoubleIDRepositoryTest {
53+
public class DoubleIDRepositoryTests {
5454

5555

5656
@Resource
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* @author Mohsin Husen
3939
*/
4040
@RunWith(MockitoJUnitRunner.class)
41-
public class ElasticsearchRepositoryFactoryTest {
41+
public class ElasticsearchRepositoryFactoryTests {
4242

4343
@Mock
4444
private ElasticsearchOperations operations;

src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTest.java renamed to src/test/java/org/springframework/data/elasticsearch/repository/support/IntegerIDRepositoryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
@RunWith(SpringJUnit4ClassRunner.class)
5252
@ContextConfiguration("classpath:/simple-repository-test.xml")
53-
public class IntegerIDRepositoryTest {
53+
public class IntegerIDRepositoryTests {
5454

5555

5656
@Resource
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
@RunWith(SpringJUnit4ClassRunner.class)
4949
@ContextConfiguration("classpath:/simple-repository-test.xml")
50-
public class SimpleElasticsearchRepositoryTest {
50+
public class SimpleElasticsearchRepositoryTests {
5151

5252
@Resource
5353
private SampleElasticsearchRepository repository;

template.mf

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Bundle-ManifestVersion: 2
2+
Bundle-SymbolicName: org.springframework.data.elasticsearch
3+
Bundle-Name: ${project.name}
4+
Bundle-Vendor: SpringSource
5+
Bundle-Version: ${project.version}
6+
Bundle-RequiredExecutionEnvironment: J2SE-1.5
7+
Export-Template:
8+
org.springframework.data.elasticsearch.*;version="${project.version}"
9+
Import-Template:
10+
javax.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional,
11+
org.apache.commons.collections.*;version="${commonscollections:[=.=.=,+1.0.0)}";resolution:=optional,
12+
org.apache.commons.lang.*;version="${commonslang:[=.=.=,+1.0.0)}",
13+
org.codehaus.jackson.*;version="${jackson:[=.=.=,+1.0.0)}",
14+
org.elasticsearch.*;version="${elasticsearch:[=.=.=,+1.0.0)}",
15+
org.joda.time.*;version="${jodatime:[=.=.=,+1.0.0)}",
16+
org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",
17+
org.springframework.*;version="${spring30:[=.=.=.=,+1.0.0)}",
18+
org.springframework.data.*;version="${springdata.commons:[=.=.=.=,+1.0.0)}",
19+
org.w3c.*;version="0.0.0"
20+

0 commit comments

Comments
 (0)