diff --git a/changelog.txt b/changelog.txt index cdffca00..4f39c8fb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -33,6 +33,8 @@ Changes in version 1.3.0 (Nov 2008) * Added spring-tx as required dependency (the DataAccessExceptions require this). +* Added demo projects to simplify refactoring demonstrations. (LDAP-154) + Changes in version 1.3.0.RC1 (Oct 2008) ------------------------------------------- * TLS connections are now supported using the DefaultTlsDirContextAuthenticationStrategy diff --git a/samples/article/pom.xml b/samples/article/pom.xml index c0bbb0e0..9d0e4eaf 100644 --- a/samples/article/pom.xml +++ b/samples/article/pom.xml @@ -1,9 +1,6 @@ - - + org.springframework.ldap spring-ldap-parent diff --git a/samples/article/src/main/java/log4j.properties b/samples/article/src/main/java/log4j.properties deleted file mode 100644 index 80ee2eb0..00000000 --- a/samples/article/src/main/java/log4j.properties +++ /dev/null @@ -1,16 +0,0 @@ -log4j.rootCategory=INFO, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n - -log4j.appender.logfile=org.apache.log4j.RollingFileAppender -log4j.appender.logfile.File=${ldaptemplate.root}/ldaptemplate.log -log4j.appender.logfile.MaxFileSize=512KB - -# Keep three backup files -log4j.appender.logfile.MaxBackupIndex=3 -log4j.appender.logfile.layout=org.apache.log4j.PatternLayout - -#Pattern to output : date priority [category] - line_separator -log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - <%m>%n diff --git a/samples/article/src/main/resources/log4j.properties b/samples/article/src/main/resources/log4j.properties new file mode 100644 index 00000000..5ce7a3ee --- /dev/null +++ b/samples/article/src/main/resources/log4j.properties @@ -0,0 +1,7 @@ +log4j.rootCategory=INFO, stdout + +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n + +log4j.logger.org.apache.directory=ERROR \ No newline at end of file diff --git a/samples/demos/pom.xml b/samples/demos/pom.xml index 5dd63397..9161a236 100644 --- a/samples/demos/pom.xml +++ b/samples/demos/pom.xml @@ -10,7 +10,7 @@ 1.3.0.CI-SNAPSHOT 4.0.0 - spring-ldap-samples + spring-ldap-demos pom Spring LDAP Demos