status-im
/
ethereumj-personal
mirror of https://github.com/status-im/ethereumj-personal.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge tiny changes

This commit is contained in:
romanman 2014-10-24 21:15:49 -05:00
parent aa204e3475
commit b70315532e
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ethereumj-core/bintray-publish-version.xml
View File

@ -28,7 +28,7 @@
<property name="artifact.id" value="ethereumj"/> <property name="artifact.id" value="ethereumj"/>
<property name="artifact.version" value="0.7.2"/> <property name="artifact.version" value="0.7.2"/>
<property name="artifact.path" value="" /> <property name="artifact.path" value="" />
<!--<property name="artifact.snapshot" value="snapshot" />--> <property name="artifact.snapshot" value="snapshot" />
<property name="repo.location" value="${user.home}/.m2/repository"/> <property name="repo.location" value="${user.home}/.m2/repository"/>
<property name="artifact.group.path" value="${artifact.groupId}"/> <property name="artifact.group.path" value="${artifact.groupId}"/>
@ -142,6 +142,8 @@
value="${bintray.file.path}" value="${bintray.file.path}"
override="true"/> override="true"/>
<echo message="${artifact.full.path}/${artifact.id}-${artifact.version}${artifact.suffix}"/>
<http url="https://api.bintray.com/content/${bintray.subject}/${bintray.repo}/${bintray.package}/${bintray.version}/${encoded.bintray.file.path}${artifact.suffix};publish=1" <http url="https://api.bintray.com/content/${bintray.subject}/${bintray.repo}/${bintray.package}/${bintray.version}/${encoded.bintray.file.path}${artifact.suffix};publish=1"
method="PUT" method="PUT"
printrequest="false" printrequest="false"

2
ethereumj-core/src/main/resources/log4j.properties
View File

@ -27,7 +27,7 @@ log4j.logger.wallet = ERROR
log4j.logger.general = DEBUG log4j.logger.general = DEBUG
log4j.logger.net = TRACE log4j.logger.net = TRACE
log4j.logger.db = ERROR log4j.logger.db = ERROR
log4j.logger.peerdiscovery = ERROR log4j.logger.peerdiscovery = TRACE
log4j.logger.java.nio = ERROR log4j.logger.java.nio = ERROR
log4j.logger.io.netty = ERROR log4j.logger.io.netty = ERROR
log4j.logger.wire = ERROR log4j.logger.wire = ERROR

6
ethereumj-core/src/main/resources/system.properties
View File

@ -6,10 +6,10 @@ server.acceptConnections = false
# the search of the online peers # the search of the online peers
# values: [ip:port, ip:port, ip:port ...] # values: [ip:port, ip:port, ip:port ...]
peer.discovery.ip.list = poc-7.ethdev.com:30303,\ peer.discovery.ip.list = poc-7.ethdev.com:30303,\
188.25.236.246:30303 185.43.109.23:30303
# Peer Server Zero (poc-6.ethdev.com) # Peer Server Zero (poc-6.ethdev.com)
peer.active.ip = 188.25.236.246 peer.active.ip = 185.43.109.23
peer.active.port = 30303 peer.active.port = 30303
# ZeroGox # ZeroGox
@ -72,7 +72,7 @@ samples.dir = samples
# the existing database will be # the existing database will be
# destroyed and all the data will be # destroyed and all the data will be
# downloaded from peers again # downloaded from peers again
database.reset = false database.reset = true
# place to save physical storage files # place to save physical storage files
database.dir = database database.dir = database

2
ethereumj-studio/pom.xml
View File

@ -71,7 +71,7 @@
<dependency> <dependency>
<groupId>org.ethereum</groupId> <groupId>org.ethereum</groupId>
<artifactId>ethereumj</artifactId> <artifactId>ethereumj</artifactId>
<version>0.7.2</version> <version>0.7.2.20141024.1409</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>

4
ethereumj-studio/src/main/resources/log4j.properties
View File

@ -7,7 +7,7 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target=System.out log4j.appender.stdout.Target=System.out
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss} [%c{1}] %m%n log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss} [%c{1}] %m%n
log4j.appender.stdout.Threshold=DEBUG log4j.appender.stdout.Threshold=TRACE
# Direct log messages to stdout # Direct log messages to stdout
log4j.appender.DUMP=org.apache.log4j.ConsoleAppender log4j.appender.DUMP=org.apache.log4j.ConsoleAppender
@ -26,7 +26,7 @@ log4j.logger.wallet = ERROR
log4j.logger.net = ERROR log4j.logger.net = ERROR
log4j.logger.wire = ERROR log4j.logger.wire = ERROR
log4j.logger.db = ERROR log4j.logger.db = ERROR
log4j.logger.peerdiscovery = ERROR log4j.logger.peerdiscovery = TRACE
log4j.logger.peermonitor = ERROR log4j.logger.peermonitor = ERROR
log4j.logger.java.nio = ERROR log4j.logger.java.nio = ERROR
log4j.logger.io.netty = ERROR log4j.logger.io.netty = ERROR