Skip to content

Commit 7df712a

Browse files
akonczakakonczak
committed
DATAES-2 Applied spring-data formatting to all sources
1 parent 5e917b5 commit 7df712a

File tree

107 files changed

+8356
-7087
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+8356
-7087
lines changed

‎formatting.xml

Lines changed: 820 additions & 0 deletions
Large diffs are not rendered by default.

‎pom.xml

Lines changed: 150 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -1,170 +1,172 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
3-
<modelVersion>4.0.0</modelVersion>
4-
5-
<groupId>org.springframework.data</groupId>
6-
<artifactId>spring-data-elasticsearch</artifactId>
7-
<version>1.0.0.BUILD-SNAPSHOT</version>
8-
9-
<parent>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<groupId>org.springframework.data</groupId>
7+
<artifactId>spring-data-elasticsearch</artifactId>
8+
<version>1.0.0.BUILD-SNAPSHOT</version>
9+
10+
<parent>
1011
<groupId>org.springframework.data.build</groupId>
1112
<artifactId>spring-data-parent</artifactId>
1213
<version>1.1.0.BUILD-SNAPSHOT</version>
1314
<relativePath>../spring-data-build/parent/pom.xml</relativePath>
1415
</parent>
15-
16-
<name>Spring Data Elasticsearch</name>
17-
<description>Spring Data Implementation for Elasticsearch</description>
18-
<url>https://github.com/SpringSource/spring-data-elasticsearch</url>
19-
20-
<properties>
21-
22-
<dist.key>DATAES</dist.key>
23-
24-
<commonscollections>3.2.1</commonscollections>
25-
<commonslang>2.6</commonslang>
26-
<elasticsearch>0.90.0</elasticsearch>
27-
<jackson>1.9.2</jackson>
28-
<springdata.commons>1.6.0.BUILD-SNAPSHOT</springdata.commons>
29-
30-
</properties>
31-
32-
<dependencies>
33-
34-
<!-- Spring -->
35-
<dependency>
36-
<groupId>org.springframework</groupId>
37-
<artifactId>spring-context</artifactId>
38-
<version>${spring}</version>
39-
<exclusions>
40-
<exclusion>
41-
<groupId>commons-logging</groupId>
42-
<artifactId>commons-logging</artifactId>
43-
</exclusion>
44-
</exclusions>
45-
</dependency>
46-
47-
<dependency>
48-
<groupId>org.springframework</groupId>
49-
<artifactId>spring-tx</artifactId>
50-
<version>${spring}</version>
51-
</dependency>
52-
53-
<!-- For JavaConfig -->
54-
<dependency>
55-
<groupId>cglib</groupId>
56-
<artifactId>cglib</artifactId>
57-
<version>2.2.2</version>
58-
<scope>test</scope>
59-
</dependency>
60-
61-
<!-- SPRING DATA -->
62-
<dependency>
63-
<groupId>org.springframework.data</groupId>
64-
<artifactId>spring-data-commons</artifactId>
65-
<version>${springdata.commons}</version>
66-
</dependency>
67-
68-
<!-- APACHE -->
69-
<dependency>
70-
<groupId>commons-lang</groupId>
71-
<artifactId>commons-lang</artifactId>
72-
<version>${commonslang}</version>
73-
</dependency>
74-
<dependency>
75-
<groupId>commons-collections</groupId>
76-
<artifactId>commons-collections</artifactId>
77-
<version>${commonscollections}</version>
78-
</dependency>
79-
80-
<!-- JODA Time -->
81-
<dependency>
82-
<groupId>joda-time</groupId>
83-
<artifactId>joda-time</artifactId>
84-
<version>${jodatime}</version>
85-
</dependency>
86-
87-
<!-- Elasticsearch -->
88-
<dependency>
89-
<groupId>org.elasticsearch</groupId>
90-
<artifactId>elasticsearch</artifactId>
91-
<version>${elasticsearch}</version>
92-
</dependency>
93-
94-
<!-- Jackson JSON Mapper -->
95-
<dependency>
96-
<groupId>org.codehaus.jackson</groupId>
97-
<artifactId>jackson-mapper-asl</artifactId>
98-
<version>${jackson}</version>
99-
</dependency>
100-
101-
<!-- CDI -->
102-
<dependency>
103-
<groupId>javax.enterprise</groupId>
104-
<artifactId>cdi-api</artifactId>
105-
<version>${cdi}</version>
106-
<scope>provided</scope>
107-
<optional>true</optional>
108-
</dependency>
109-
110-
<!-- Test -->
111-
<dependency>
112-
<groupId>org.springframework</groupId>
113-
<artifactId>spring-test</artifactId>
114-
<version>${spring}</version>
115-
<scope>test</scope>
116-
</dependency>
117-
<dependency>
118-
<groupId>org.apache.openwebbeans.test</groupId>
119-
<artifactId>cditest-owb</artifactId>
120-
<version>${webbeans}</version>
121-
<scope>test</scope>
122-
</dependency>
123-
124-
</dependencies>
125-
126-
<build>
127-
<plugins>
128-
<plugin>
16+
17+
<name>Spring Data Elasticsearch</name>
18+
<description>Spring Data Implementation for Elasticsearch</description>
19+
<url>https://github.com/SpringSource/spring-data-elasticsearch</url>
20+
21+
<properties>
22+
23+
<dist.key>DATAES</dist.key>
24+
25+
<commonscollections>3.2.1</commonscollections>
26+
<commonslang>2.6</commonslang>
27+
<elasticsearch>0.90.0</elasticsearch>
28+
<jackson>1.9.2</jackson>
29+
<springdata.commons>1.6.0.BUILD-SNAPSHOT</springdata.commons>
30+
31+
</properties>
32+
33+
<dependencies>
34+
35+
<!-- Spring -->
36+
<dependency>
37+
<groupId>org.springframework</groupId>
38+
<artifactId>spring-context</artifactId>
39+
<version>${spring}</version>
40+
<exclusions>
41+
<exclusion>
42+
<groupId>commons-logging</groupId>
43+
<artifactId>commons-logging</artifactId>
44+
</exclusion>
45+
</exclusions>
46+
</dependency>
47+
48+
<dependency>
49+
<groupId>org.springframework</groupId>
50+
<artifactId>spring-tx</artifactId>
51+
<version>${spring}</version>
52+
</dependency>
53+
54+
<!-- For JavaConfig -->
55+
<dependency>
56+
<groupId>cglib</groupId>
57+
<artifactId>cglib</artifactId>
58+
<version>2.2.2</version>
59+
<scope>test</scope>
60+
</dependency>
61+
62+
<!-- SPRING DATA -->
63+
<dependency>
64+
<groupId>org.springframework.data</groupId>
65+
<artifactId>spring-data-commons</artifactId>
66+
<version>${springdata.commons}</version>
67+
</dependency>
68+
69+
<!-- APACHE -->
70+
<dependency>
71+
<groupId>commons-lang</groupId>
72+
<artifactId>commons-lang</artifactId>
73+
<version>${commonslang}</version>
74+
</dependency>
75+
<dependency>
76+
<groupId>commons-collections</groupId>
77+
<artifactId>commons-collections</artifactId>
78+
<version>${commonscollections}</version>
79+
</dependency>
80+
81+
<!-- JODA Time -->
82+
<dependency>
83+
<groupId>joda-time</groupId>
84+
<artifactId>joda-time</artifactId>
85+
<version>${jodatime}</version>
86+
</dependency>
87+
88+
<!-- Elasticsearch -->
89+
<dependency>
90+
<groupId>org.elasticsearch</groupId>
91+
<artifactId>elasticsearch</artifactId>
92+
<version>${elasticsearch}</version>
93+
</dependency>
94+
95+
<!-- Jackson JSON Mapper -->
96+
<dependency>
97+
<groupId>org.codehaus.jackson</groupId>
98+
<artifactId>jackson-mapper-asl</artifactId>
99+
<version>${jackson}</version>
100+
</dependency>
101+
102+
<!-- CDI -->
103+
<dependency>
104+
<groupId>javax.enterprise</groupId>
105+
<artifactId>cdi-api</artifactId>
106+
<version>${cdi}</version>
107+
<scope>provided</scope>
108+
<optional>true</optional>
109+
</dependency>
110+
111+
<!-- Test -->
112+
<dependency>
113+
<groupId>org.springframework</groupId>
114+
<artifactId>spring-test</artifactId>
115+
<version>${spring}</version>
116+
<scope>test</scope>
117+
</dependency>
118+
<dependency>
119+
<groupId>org.apache.openwebbeans.test</groupId>
120+
<artifactId>cditest-owb</artifactId>
121+
<version>${webbeans}</version>
122+
<scope>test</scope>
123+
</dependency>
124+
125+
</dependencies>
126+
127+
<build>
128+
<plugins>
129+
<plugin>
129130
<groupId>org.apache.maven.plugins</groupId>
130131
<artifactId>maven-assembly-plugin</artifactId>
131132
</plugin>
132133
<plugin>
133134
<groupId>org.codehaus.mojo</groupId>
134135
<artifactId>wagon-maven-plugin</artifactId>
135136
</plugin>
136-
</plugins>
137-
</build>
138-
139-
<developers>
140-
<developer>
141-
<id>biomedcentral</id>
142-
<name>BioMed Central Development Team</name>
143-
<timezone>+0</timezone>
144-
</developer>
145-
</developers>
146-
147-
<repositories>
137+
</plugins>
138+
</build>
139+
140+
<developers>
141+
<developer>
142+
<id>biomedcentral</id>
143+
<name>BioMed Central Development Team</name>
144+
<timezone>+0</timezone>
145+
</developer>
146+
</developers>
147+
148+
<repositories>
148149
<repository>
149150
<id>spring-libs-snapshot</id>
150151
<url>http://repo.springsource.org/lib-snapshot-local</url>
151152
</repository>
152153
</repositories>
153-
154+
154155
<scm>
155-
<url>https://github.com/SpringSource/spring-data-elasticsearch</url>
156-
<connection>scm:git:git://github.com/SpringSource/spring-data-elasticsearch.git</connection>
157-
<developerConnection>scm:git:ssh://[email protected]:SpringSource/spring-data-elasticsearch.git</developerConnection>
158-
</scm>
159-
160-
<ciManagement>
161-
<system>Bamboo</system>
162-
<url>http://build.springsource.org/browse/SPRINGDATAESh</url>
163-
</ciManagement>
164-
165-
<issueManagement>
166-
<system>JIRA</system>
167-
<url>https://jira.springsource.org/browse/DATAES</url>
156+
<url>https://github.com/SpringSource/spring-data-elasticsearch</url>
157+
<connection>scm:git:git://github.com/SpringSource/spring-data-elasticsearch.git</connection>
158+
<developerConnection>scm:git:ssh://[email protected]:SpringSource/spring-data-elasticsearch.git
159+
</developerConnection>
160+
</scm>
161+
162+
<ciManagement>
163+
<system>Bamboo</system>
164+
<url>http://build.springsource.org/browse/SPRINGDATAES</url>
165+
</ciManagement>
166+
167+
<issueManagement>
168+
<system>JIRA</system>
169+
<url>https://jira.springsource.org/browse/DATAES</url>
168170
</issueManagement>
169171

170172
</project>

‎src/docbkx/index.xml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<bookinfo>
66
<title>Spring Data Elasticsearch</title>
77
<authorgroup>
8-
<author>
9-
<firstname>BioMed Central</firstname>
10-
<surname>Development Team</surname>
11-
</author>
12-
</authorgroup>
8+
<author>
9+
<firstname>BioMed Central</firstname>
10+
<surname>Development Team</surname>
11+
</author>
12+
</authorgroup>
1313
<legalnotice>
1414
<para>
1515
Copies of this document may be made for your own use and for
@@ -35,8 +35,10 @@
3535
<part id="reference">
3636
<title>Reference Documentation</title>
3737

38-
<xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.4.0.RC1/src/docbkx/repositories.xml">
39-
<xi:fallback href="../../../spring-data-commons/src/docbkx/repositories.xml" />
38+
<xi:include
39+
href="https://raw.github.com/SpringSource/spring-data-commons/1.4.0.RC1/src/docbkx/repositories.xml">
40+
<xi:fallback
41+
href="../../../spring-data-commons/src/docbkx/repositories.xml" />
4042
</xi:include>
4143

4244
<xi:include href="reference/data-elasticsearch.xml" />

‎src/docbkx/preface.xml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,25 @@
33
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
44
<preface id="preface">
55
<title>Preface</title>
6-
<para>The Spring Data Elasticsearch project applies core Spring concepts to
6+
<para>The Spring Data Elasticsearch project applies core Spring
7+
concepts to
78
the
8-
development of solutions using the Elasticsearch Search Engine.
9+
development of solutions using the Elasticsearch Search
10+
Engine.
911
We have povided a "template" as a high-level abstraction for
10-
storing,querying,sorting and faceting documents. You will notice similarities
11-
to the Spring data solr and
12-
mongodb support in the Spring Framework.
12+
storing,querying,sorting and faceting documents. You will notice
13+
similarities
14+
to the Spring data solr and
15+
mongodb support in the Spring Framework.
1316
</para>
1417
<section id="project">
1518
<title>Project Metadata</title>
1619
<itemizedlist spacing="compact">
1720
<listitem>
1821
<para>
1922
Version Control -
20-
<ulink url="git://github.com/BioMedCentralLtd/spring-data-elasticsearch.git">git://github.com/BioMedCentralLtd/spring-data-elasticsearch.git
23+
<ulink
24+
url="git://github.com/BioMedCentralLtd/spring-data-elasticsearch.git">git://github.com/BioMedCentralLtd/spring-data-elasticsearch.git
2125
</ulink>
2226
</para>
2327
</listitem>
@@ -28,7 +32,8 @@
2832
<para>
2933
Requires
3034
<ulink url="http://www.elasticsearch.org/download/">Elasticsearch</ulink>
31-
0.20.2 and above or optional dependency or not even that if you are using Embedded Node Client
32-
</para>
35+
0.20.2 and above or optional dependency or not even that if you are
36+
using Embedded Node Client
37+
</para>
3338
</section>
3439
</preface>

0 commit comments

Comments
 (0)