Merge pull request #52 from sharmalab/dev

Fix the logs to be in h2 database

.gitignore

@@ -11,3 +11,4 @@ lib/
 .settings
 dependencies/bundles/
 distribution/build-configuration/version.info
+bin/

dependencies/configuration/config.ini

@@ -1,4 +1,4 @@
-osgi.bundles=com.google.gson_2.1.0.v201303041604.jar@start,org.eclipse.equinox.console-1.1.200.jar@start,org.apache.felix.gogo.shell-0.10.0.jar@start,org.apache.felix.gogo.runtime-0.10.0.jar@start,org.apache.felix.gogo.command_0.10.0.v201209301215.jar@start,org.apache.felix.configadmin-1.6.0.jar@start,org.apache.felix.eventadmin-1.3.2.jar@start,org.apache.felix.fileinstall-3.2.6.jar@start
+osgi.bundles=com.google.gson_2.1.0.v201303041604.jar@start,org.eclipse.equinox.console-1.1.200.jar@start,org.apache.felix.gogo.shell-0.10.0.jar@start,org.apache.felix.gogo.runtime-0.10.0.jar@start,org.apache.felix.gogo.command_0.10.0.v201209301215.jar@start,org.apache.felix.configadmin-1.6.0.jar@start,log4j.osgi-1.2.15-SNAPSHOT.jar@start,org.apache.felix.eventadmin-1.3.2.jar@start,org.apache.felix.fileinstall-3.2.6.jar@start
 felix.fileinstall.dir=../bundles/third-party,../bundles/system,../bundles/pickup
 eclipse.ignoreApp=true
 org.osgi.service.http.port=8080

distribution/build-configuration/version.info

@@ -1,5 +1,5 @@
-#Thu, 29 Nov 2018 15:55:41 -0500
+#Thu, 13 Dec 2018 19:27:40 -0500
 bindaas.framework.version.major=3
 bindaas.framework.version.minor=3
-bindaas.framework.version.revision=0
+bindaas.framework.version.revision=1
 bindaas.build.date=201811291555

distribution/pom.xml

@@ -161,6 +161,12 @@
             <version>${project.snapshot.version}</version>
             <type>jar</type>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>log4j.config</artifactId>
+            <version>${project.snapshot.version}</version>
+            <type>jar</type>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mongodb-datasource-provider</artifactId>

distribution/src/main/assembly/package.xml

@@ -22,6 +22,7 @@
                 <include>${project.groupId}:generic-sql-datasource-provider-0.0.1-SNAPSHOT:jar</include>
                 <include>${project.groupId}:http-datasource-provider-0.0.1-SNAPSHOT:jar</include>
                 <include>${project.groupId}:ldap-bindaas-authentication-provider-0.0.1-SNAPSHOT:jar</include>
+                <include>${project.groupId}:log4j.config-0.0.1-SNAPSHOT:jar</include>
                 <include>${project.groupId}:mongodb-datasource-provider-0.0.1-SNAPSHOT:jar</include>
                 <include>${project.groupId}:mysql-datasource-provider-0.0.1-SNAPSHOT:jar</include>
                 <include>${project.groupId}:postgres-datasource-provider-0.0.1-SNAPSHOT:jar</include>

projects/core/bindaas-core-impl/src/main/resources/META-INF/MANIFEST.MF

@@ -46,6 +46,7 @@ Import-Package: com.google.gson;version="2.1.0",
  org.apache.cxf.security;version="3.0.0",
  org.apache.cxf.transport.http;version="3.0.0",
  org.apache.felix.gogo.api;version="0.10.0",
+ org.apache.log4j;version="1.2.15",
  org.eclipse.osgi.framework.console;version="1.0.0",
  org.hibernate,
  org.hibernate.annotations,

projects/core/log4j.config/log4j.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+    <appender name="console" class="org.apache.log4j.ConsoleAppender">
+        <param name="Target" value="System.out" />
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d{DATE} %-5p %c{2} - %m%n" />
+        </layout>
+    </appender>
+
+    <appender name="R" class="org.apache.log4j.RollingFileAppender">
+        <param name="file" value="../log/bindaas.log" />
+        <param name="MaxFileSize" value="500KB" />
+        <!-- Keep one backup file -->
+        <param name="MaxBackupIndex" value="5" />
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d{DATE} %-5p %c{2} - %m%n" />
+        </layout>
+    </appender>
+    <category name="edu" additivity="true">
+        <priority value="debug" />
+
+    </category>
+    <root>
+        <priority value="warn" />
+        <appender-ref ref="console" />
+        <appender-ref ref="R" />
+    </root>
+</log4j:configuration>

projects/core/log4j.config/pom.xml

@@ -0,0 +1,10 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>bindaas</groupId>
+        <artifactId>core</artifactId>
+        <version>0.0.1</version>
+    </parent>
+    <artifactId>log4j.config</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+</project>

projects/core/log4j.config/src/main/resources/META-INF/MANIFEST.MF

@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Log4j Config File
+Bundle-SymbolicName: log4j.config
+Bundle-Version: 1.0.0
+Fragment-Host: org.springframework.osgi.log4j.osgi;bundle-version="1.2.15"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

projects/core/pom.xml

@@ -26,5 +26,6 @@
         <module>heartbeat-monitor/heartbeat-monitor-client</module>
         <module>heartbeat-monitor/heartbeat-monitor-server</module>
         <module>bindaas-trusted-application-manager</module>
+        <module>log4j.config</module>
     </modules>
 </project>