Index: core/project.properties
===================================================================
--- core/project.properties	(revision 226596)
+++ core/project.properties	(working copy)
@@ -28,6 +28,8 @@
 maven.ldap.server.schema.deps.system=
 maven.ldap.server.schema.deps.dhcp=system,core
 maven.ldap.server.schema.deps.samba=cosine,inetorg,nis
+maven.ldap.server.schema.deps.atlassian=system
+maven.ldap.server.schema.package.atlassian=com.atlassian.user.ldap.schema
 
 maven.license.licenseFile=${basedir}/../LICENSE.txt
 
Index: main/project.properties
===================================================================
--- main/project.properties	(revision 226596)
+++ main/project.properties	(working copy)
@@ -1,3 +1,7 @@
+#
+# Main properties
+#
+maven.jar.excludes=log4j.properties
 
 #
 # Javaapp plugin properties
@@ -3,5 +7,5 @@
 #
 
-maven.javaapp.jar.exclude=junit, maven-javaapp-plugin
+maven.javaapp.jar.exclude=junit, maven-javaapp-plugin,log4j.properties
 maven.javaapp.mainclass=org.apache.ldap.server.ServerMain
 maven.javaapp.jar.name=${maven.final.name}.jar
Index: main/maven.xml
===================================================================
--- main/maven.xml	(revision 226596)
+++ main/maven.xml	(working copy)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?> 
   
 <project default="javaapp"
-  xmlns:ant="jelly:ant">
+  xmlns:ant="jelly:ant" xmlns:j="jelly:core">
 
   <preGoal name="javaapp">
     <attainGoal name="java:compile"/>
@@ -17,5 +17,55 @@
       <fileset dir="." includes="*.db"/>
       <fileset dir="." includes="*.lg"/>
     </ant:delete>
+
+      <delete dir="target" />
   </goal>
+
+    <!-- Build a standalone jar for the server -->
+    <goal name="standalone" prereqs="clean, java:compile">
+        <j:set var="classpath" value="" />
+
+        <j:forEach var="lib" items="${pom.artifacts}">
+             <j:set var="dep" value="${lib.dependency}"/>
+
+             <j:set var="classpath" value="${classpath} lib/${dep.artifactId}-${dep.version}.jar"/>
+             <ant:copy todir="target/standalone/lib" file="${lib.path}"/>
+
+        </j:forEach>
+
+        <copy file="src/main/resources/log4j.properties" todir="target/classes" />
+
+        <j:set var="dynamicManifest" value="target/executable_manifest.MF" />
+
+        <echo file="${dynamicManifest}">Main-Class: org.apache.ldap.server.ServerMain
+Class-Path: log4j.properties ${classpath}
+        </echo>
+
+        <attainGoal name="server-scripts" />
+
+        <copy file="server.xml" tofile="target/standalone/apacheds-server.xml" /> 
+
+        <jar destfile="target/standalone/${pom.artifactId}-${pom.currentVersion}.jar" manifest="${dynamicManifest}">
+            <fileset dir="target/classes"/>
+        </jar>
+
+          <zip destfile="target/apacheds-standalone-${pom.currentVersion}.zip"
+           basedir="target/standalone"/>
+    </goal>
+
+    <!-- create an apacheds-startup.sh and an apacheds-server.bat -->
+    <goal name="server-scripts">
+
+        <copy file="src/main/resources/apacheds-server.sh" todir="target/standalone" />
+        <copy file="src/main/resources/apacheds-server.bat" todir="target/standalone" />
+
+        <replace file="target/standalone/apacheds-server.sh"
+         token="@APACHE_DS_MAIN_JAR@" value="${pom.artifactId}-${pom.currentVersion}.jar"/>
+
+        <replace file="target/standalone/apacheds-server.bat"
+            token="@APACHE_DS_MAIN_JAR@" value="${pom.artifactId}-${pom.currentVersion}.jar"/>
+
+        <chmod file="target/standalone/apacheds-server.sh" perm="ugo+rwx"/>
+    </goal>
+
 </project>
Index: main/src/main/java/org/apache/ldap/server/ServerMain.java
===================================================================
--- main/src/main/java/org/apache/ldap/server/ServerMain.java	(revision 226596)
+++ main/src/main/java/org/apache/ldap/server/ServerMain.java	(working copy)
@@ -57,7 +57,7 @@
 
         if ( args.length > 0 )
         {
-            log.info( "server: loading settings from " + args[0] );
+            log.info( "server: loading settings from {}", args[0] );
             ApplicationContext factory = new FileSystemXmlApplicationContext( args[0] );
             cfg = ( ServerStartupConfiguration ) factory.getBean( "configuration" );
             env = ( Properties ) factory.getBean( "environment" );
@@ -77,8 +77,8 @@
 
         if (log.isInfoEnabled())
         {
-            log.info( "server: started in " + ( System.currentTimeMillis() - startTime )
-                    + " milliseconds");
+            log.info( "server: started in {} milliseconds",
+                    ( System.currentTimeMillis() - startTime ) + "");
         }
 
         while ( true )
Index: main/src/main/resources/log4j.properties
===================================================================
--- main/src/main/resources/log4j.properties	(revision 226596)
+++ main/src/main/resources/log4j.properties	(working copy)
@@ -1,5 +1,10 @@
-log4j.rootCategory=INFO, stdout
+log4j.rootCategory=INFO, stdout, record
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n
+
+log4j.appender.record=org.apache.log4j.FileAppender
+log4j.appender.record.File=logs/apacheds.log
+log4j.appender.record.layout=org.apache.log4j.PatternLayout
+log4j.appender.record.layout.ConversionPattern=[%d{HH:mm:ss}] %p - [%l] - %m%n
\ No newline at end of file