Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-30 02:08:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove maven target, cleanup

Browse source
This commit is contained in:
Manfred Karrer 2015-04-27 18:51:00 +02:00
parent 1f362d80a2
commit 2912a02185
3 changed files with 3 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

38
core/pom.xml
View file

@ -14,44 +14,6 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.3</version>
<configuration>
<!-- broken with Java 8 (MSHADE-174), using ProGuard instead. -->
<minimizeJar>false</minimizeJar>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>io.bitsquare.app.BitsquareAppMain</mainClass>
</transformer>
</transformers>
<filters>
<filter>
<!-- exclude signatures, the bundling process breaks them for some reason -->
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>bundled</shadedClassifierName>
<finalName>shaded</finalName>
</configuration>
</execution>
</executions>
</plugin>
<!-- <plugin> <!-- <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

3
core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMessageService.java
View file

@ -97,7 +97,6 @@ public class TomP2PMessageService extends TomP2PService implements MessageServic
else { else {
log.info("sendMessage failed. We will try to send the message to the mailbox. Fault reason: " + log.info("sendMessage failed. We will try to send the message to the mailbox. Fault reason: " +
futureDirect.failedReason()); futureDirect.failedReason());
if (pubKeyRing != null)
sendMailboxMessage(pubKeyRing, (SealedAndSignedMessage) encryptedMessage, listener); sendMailboxMessage(pubKeyRing, (SealedAndSignedMessage) encryptedMessage, listener);
} }
} }
@ -106,7 +105,6 @@ public class TomP2PMessageService extends TomP2PService implements MessageServic
public void exceptionCaught(Throwable t) throws Exception { public void exceptionCaught(Throwable t) throws Exception {
log.info("sendMessage failed with exception. We will try to send the message to the mailbox. Exception: " log.info("sendMessage failed with exception. We will try to send the message to the mailbox. Exception: "
+ t.getMessage()); + t.getMessage());
if (pubKeyRing != null)
sendMailboxMessage(pubKeyRing, (SealedAndSignedMessage) encryptedMessage, listener); sendMailboxMessage(pubKeyRing, (SealedAndSignedMessage) encryptedMessage, listener);
} }
} }
@ -119,7 +117,6 @@ public class TomP2PMessageService extends TomP2PService implements MessageServic
} }
} }
private void sendMailboxMessage(PubKeyRing pubKeyRing, SealedAndSignedMessage message, SendMessageListener listener) { private void sendMailboxMessage(PubKeyRing pubKeyRing, SealedAndSignedMessage message, SendMessageListener listener) {
log.info("sendMailboxMessage called"); log.info("sendMailboxMessage called");
mailboxService.addMessage( mailboxService.addMessage(

2
gui/src/main/java/io/bitsquare/app/BitsquareApp.java
View file

@ -158,7 +158,7 @@ public class BitsquareApp extends Application {
primaryStage.show(); primaryStage.show();
//TODO just temp. //TODO just temp.
showDebugWindow(); //showDebugWindow();
} catch (Throwable throwable) { } catch (Throwable throwable) {
showErrorPopup(throwable, true); showErrorPopup(throwable, true);
} }