anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switched MapDB to version 2.0.0-SNAPSHOT

Browse Source
This commit is contained in:
andrea
2015-01-27 00:15:44 +01:00
parent 72c8445693
commit a3d505dd97
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/pom.xml
+6 -1
View File
@@ -110,7 +110,8 @@
<dependency>
<groupId>org.mapdb</groupId>
<artifactId>mapdb</artifactId>
<version>1.1.0-SNAPSHOT</version>
<!--version>1.1.0-SNAPSHOT</version-->
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -211,5 +212,9 @@
<url>https://repo.eclipse.org/content/repositories/paho-releases/</url>
</repository>
<repository>
<id>sonatype-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>
</project>
broker/src/test/resources/log4j.properties
+6 -6
View File
@@ -2,12 +2,12 @@
#log4j.rootLogger=ERROR, A1
log4j.rootLogger=ERROR, stdout, file
log4j.logger.org.eclipse.moquette=WARN
log4j.logger.org.eclipse.moquette.server.ServerIntegrationFuseTest=DEBUG
log4j.logger.org.eclipse.moquette=DEBUG
#log4j.logger.org.eclipse.moquette.server.ServerIntegrationFuseTest=DEBUG
#log4j.logger.org.eclipse.moquette.server.ServerLowlevelMessagesIntegrationTests=DEBUG
log4j.logger.org.eclipse.moquette.server.ServerIntegrationQoSValidationTest=INFO
log4j.logger.org.eclipse.moquette.spi.impl.ProtocolProcessor=WARN
#log4j.logger.org.eclipse.moquette.spi.impl.ProtocolProcessor=DEBUG
#log4j.logger.org.eclipse.moquette.spi.impl.ProtocolProcessor=INFO
log4j.logger.org.eclipse.moquette.spi.impl.ProtocolProcessor=DEBUG
#log4j.logger.org.eclipse.moquette.spi.impl.ProtocolProcessor=TRACE
log4j.logger.org.eclipse.moquette.spi.impl.SimpleMessaging=WARN
@@ -28,13 +28,13 @@ log4j.appender.stdout.Threshold=DEBUG
#log4j.appender.stdout.Threshold=TRACE
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
#log4j.appender.stdout.layout.ConversionPattern=%-4r [%t] %-5p %c{1} %x - %m%n
log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%t] %-5p %c{1} %L %x - %m%n
log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%t] %-5p %c{1} %M %L %x - %m%n
#file appender
log4j.appender.file=org.apache.log4j.RollingFileAppender
log4j.appender.file.Threshold=INFO
log4j.appender.file.File=moquette.log
log4j.appender.file.MaxFileSize=1MB
log4j.appender.file.MaxFileSize=100MB
log4j.appender.file.MaxBackupIndex=1
log4j.appender.file.layout=org.apache.log4j.PatternLayout
#log4j.appender.file.layout.ConversionPattern=%-4r [%t] %-5p %c{1} %x - %m%n
bundle/pom.xml
+11 -7
View File
@@ -187,8 +187,11 @@
${project.groupId}.*,
com.lmax.*
</Private-Package>
<Import-Package>!org.eclipse.moquette,*</Import-Package>
<Bundle-Activator>${project.groupId}.moquette.bundle.Activator</Bundle-Activator>
<Import-Package>!org.eclipse.moquette,
sun.misc;resolution:=optional,
*
</Import-Package>
<Bundle-Activator>${project.groupId}.bundle.Activator</Bundle-Activator>
</instructions>
</configuration>
</plugin>
@@ -199,13 +202,14 @@
<version>1.5</version>
<configuration>
<!-- Pax Runner version -->
<runner>1.8.5</runner>
<!--runner>1.8.5</runner-->
<runner>1.8.6</runner>
<!-- OSGi framework type (equinox, felix, knopflerfish) -->
<framework>equinox</framework>
<!--<framework>felix</framework>-->
<!--<framework>equinox</framework>-->
<framework>felix</framework>
<provision>
<!-- <param> - -log=debug</param>
<param> - -workingDirectory=target/runner</param> -->
<!--param>- -log=debug</param -->
<!-- <param> - -workingDirectory=target/runner</param> -->
</provision>
</configuration>
</plugin>