From 5a450afa09ad1c0c418f1e39504810565314e58f Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Sat, 28 Jan 2017 09:27:42 +0100
Subject: [PATCH] #251 - Polishing.

Fixed package structure in sources (nested folders instead of dot-separated ones). Removed obsolete dependency in POM and point to relative POMs.
---
 ldap/example/pom.xml                                 |  1 +
 .../springdata/ldap}/ApplicationConfiguration.java   |  0
 .../springdata/ldap}/Person.java                     | 12 ++++--------
 .../springdata/ldap}/PersonRepository.java           |  0
 ldap/pom.xml                                         |  9 ++-------
 5 files changed, 7 insertions(+), 15 deletions(-)
 rename ldap/example/src/main/java/{example.springdata.ldap => example/springdata/ldap}/ApplicationConfiguration.java (100%)
 rename ldap/example/src/main/java/{example.springdata.ldap => example/springdata/ldap}/Person.java (86%)
 rename ldap/example/src/main/java/{example.springdata.ldap => example/springdata/ldap}/PersonRepository.java (100%)

diff --git a/ldap/example/pom.xml b/ldap/example/pom.xml
index d3975f66..22668267 100644
--- a/ldap/example/pom.xml
+++ b/ldap/example/pom.xml
@@ -10,6 +10,7 @@
 		<groupId>org.springframework.data.examples</groupId>
 		<artifactId>spring-data-ldap-examples</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 </project>
diff --git a/ldap/example/src/main/java/example.springdata.ldap/ApplicationConfiguration.java b/ldap/example/src/main/java/example/springdata/ldap/ApplicationConfiguration.java
similarity index 100%
rename from ldap/example/src/main/java/example.springdata.ldap/ApplicationConfiguration.java
rename to ldap/example/src/main/java/example/springdata/ldap/ApplicationConfiguration.java
diff --git a/ldap/example/src/main/java/example.springdata.ldap/Person.java b/ldap/example/src/main/java/example/springdata/ldap/Person.java
similarity index 86%
rename from ldap/example/src/main/java/example.springdata.ldap/Person.java
rename to ldap/example/src/main/java/example/springdata/ldap/Person.java
index 9f0f0156..cd283b32 100644
--- a/ldap/example/src/main/java/example.springdata.ldap/Person.java
+++ b/ldap/example/src/main/java/example/springdata/ldap/Person.java
@@ -33,13 +33,9 @@ import org.springframework.ldap.odm.annotations.Id;
 @Data
 public class Person {
 
-	@Id private Name id;
-
-	@DnAttribute(value = "uid", index = 3) private String uid;
-
-	@Attribute(name = "cn") private String fullName;
-
-	@Attribute(name = "sn") private String lastname;
-
+	private @Id Name id;
+	private @DnAttribute(value = "uid", index = 3) String uid;
+	private @Attribute(name = "cn") String fullName;
+	private @Attribute(name = "sn") String lastname;
 	private String userPassword;
 }
diff --git a/ldap/example/src/main/java/example.springdata.ldap/PersonRepository.java b/ldap/example/src/main/java/example/springdata/ldap/PersonRepository.java
similarity index 100%
rename from ldap/example/src/main/java/example.springdata.ldap/PersonRepository.java
rename to ldap/example/src/main/java/example/springdata/ldap/PersonRepository.java
diff --git a/ldap/pom.xml b/ldap/pom.xml
index f32f2fc6..1b95136f 100644
--- a/ldap/pom.xml
+++ b/ldap/pom.xml
@@ -9,12 +9,12 @@
 		<groupId>org.springframework.data.examples</groupId>
 		<artifactId>spring-data-examples</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<name>Spring Data LDAP - Examples</name>
 	<description>Sample projects for Spring Data LDAP</description>
 	<url>http://projects.spring.io/spring-data-ldap</url>
-	<inceptionYear>2016-2017</inceptionYear>
 
 	<modules>
 		<module>example</module>
@@ -27,11 +27,6 @@
 			<artifactId>spring-boot-starter-data-ldap</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>com.unboundid</groupId>
 			<artifactId>unboundid-ldapsdk</artifactId>
@@ -40,4 +35,4 @@
 
 	</dependencies>
 
-</project>
\ No newline at end of file
+</project>