From e8cbd1f9846a31cdb1972d9ee95ac64135cfb286 Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Fri, 23 Jun 2006 12:52:57 +0000
Subject: [PATCH] Added extension folder to WAR distribution, added sample
 config for SQL Server, removed label from version and removed
 log4j.properties from core.jar

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3221 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../extension/custom-db-connection.properties.sample   | 10 +++++++++-
 config/alfresco/version.properties                     |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/config/alfresco/extension/custom-db-connection.properties.sample b/config/alfresco/extension/custom-db-connection.properties.sample
index 44d5da9cf3..d09219b796 100644
--- a/config/alfresco/extension/custom-db-connection.properties.sample
+++ b/config/alfresco/extension/custom-db-connection.properties.sample
@@ -29,4 +29,12 @@
 # SQLServer connection (requires jdts-1.2.jar or equivalent - http://jtds.sourceforge.net/)
 #
 #db.driver=net.sourceforge.jtds.jdbc.Driver
-#db.url=jdbc:jtds:sqlserver://your-server-name/alfresco
\ No newline at end of file
+#db.url=jdbc:jtds:sqlserver://localhost/alfresco
+
+#
+# SQLServer connection using Microsoft JDDB driver
+#
+#db.username=sa
+#db.password=sa
+#db.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
+#db.url=jdbc:sqlserver://localhost;DatabaseName=alfresco
diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties
index 83d88a8a59..75f6391fd4 100644
--- a/config/alfresco/version.properties
+++ b/config/alfresco/version.properties
@@ -7,7 +7,7 @@
 version.major=1
 version.minor=3
 version.revision=0
-version.label=RC2 (dev)
+version.label=
 
 # Edition label