From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 4 Apr 2009 17:54:42 +0000 (+0000)
Subject: Remove logging
X-Git-Tag: argeo-slc-2.1.7~1992
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=f901dd99ecf6b8f5990a68d2f7819280110f35b7;hp=2232eeb5ff9bc995b9d931ead9c2d38642aaa63d;p=gpl%2Fargeo-slc.git

Remove logging
Add JDBC

git-svn-id: https://svn.argeo.org/slc/trunk@2320 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/server/org.argeo.slc.siteserver/bundles/logging/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/logging/META-INF/MANIFEST.MF
deleted file mode 100644
index 8f6fb5a59..000000000
--- a/server/org.argeo.slc.siteserver/bundles/logging/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-Name: Log4j configuration bundle
-Bundle-SymbolicName: server.logging
-Bundle-Version: 0.1.0.qualifier
-Fragment-Host: com.springsource.org.apache.log4j
-
diff --git a/server/org.argeo.slc.siteserver/bundles/logging/log4j.properties b/server/org.argeo.slc.siteserver/bundles/logging/log4j.properties
deleted file mode 100644
index f8b5d3e8a..000000000
--- a/server/org.argeo.slc.siteserver/bundles/logging/log4j.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-log4j.rootLogger=WARN, console
-
-## Levels
-log4j.logger.org.argeo=DEBUG
-log4j.logger.org.argeo.slc.execution.ExecutionParameterPostProcessor=TRACE
-log4j.logger.org.argeo.slc.execution.ExecutionContext=DEBUG
-log4j.logger.org.argeo.slc.execution.SimpleExecutionSpec=DEBUG
-log4j.logger.org.argeo.slc.services.impl=TRACE
-
-log4j.logger.org.springframework=WARN
-
-log4j.logger.org.apache.activemq=WARN
-log4j.logger.org.apache.activemq.transport=WARN
-log4j.logger.org.apache.activemq.selector=WARN
-
-log4j.logger.org.apache.catalina=INFO
-log4j.logger.org.apache.coyote=INFO
-log4j.logger.org.apache.tomcat=INFO
-
-## Appenders
-# console is set to be a ConsoleAppender.
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-
-# console uses PatternLayout.
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jdbc/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jdbc/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..12f9325bc
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jdbc/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Bundle-SymbolicName: org.argeo.slc.server.jdbc
+Bundle-Version: 1.0.0
+Fragment-Host: org.springframework.jdbc
+Import-Package: 
+ org.hsqldb;resolution:=optional,
+ net.sourceforge.jtds.jdbc;resolution:=optional,
+ com.mysql.jdbc;resolution:=optional
diff --git a/server/org.argeo.slc.siteserver/deploy/pom.xml b/server/org.argeo.slc.siteserver/deploy/pom.xml
index ef8425d66..83f5d549d 100644
--- a/server/org.argeo.slc.siteserver/deploy/pom.xml
+++ b/server/org.argeo.slc.siteserver/deploy/pom.xml
@@ -212,13 +212,13 @@
 			<artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
 		</dependency>
 
-		<!-- For demo -->
+		<!-- For demo
 		<dependency>
 			<groupId>org.argeo.slc.demo</groupId>
 			<artifactId>org.argeo.slc.demo.deploy</artifactId>
 			<version>${project.version}</version>
 			<type>pom</type>
 		</dependency>
-
+ -->
 	</dependencies>
 </project>
\ No newline at end of file