From 88d6aa9ca2b6c84f636009cbe539ccf2bc7eb278 Mon Sep 17 00:00:00 2001 From: Sam Miles Date: Fri, 16 Jun 2017 21:46:51 -0500 Subject: [PATCH 1/2] First attempt at getting https working --- build.gradle | 4 ++++ .../java/oraMessaging/MessageApplication.java | 1 + src/main/java/oraMessaging/models/Chat.java | 1 + src/main/resources/application.properties | 5 +++++ src/main/resources/keystore.p12 | Bin 0 -> 2556 bytes 5 files changed, 11 insertions(+) create mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/keystore.p12 diff --git a/build.gradle b/build.gradle index 3fa0707..18d9e29 100644 --- a/build.gradle +++ b/build.gradle @@ -21,6 +21,10 @@ repositories { mavenCentral() } +bootRun { + addResources = true +} + sourceCompatibility = 1.8 targetCompatibility = 1.8 diff --git a/src/main/java/oraMessaging/MessageApplication.java b/src/main/java/oraMessaging/MessageApplication.java index 91304a1..f14af3d 100644 --- a/src/main/java/oraMessaging/MessageApplication.java +++ b/src/main/java/oraMessaging/MessageApplication.java @@ -7,6 +7,7 @@ public class MessageApplication { public static void main(String[] args) { + System.out.println("---------------ITS BEGUN------------"); SpringApplication.run(MessageApplication.class, args); } } \ No newline at end of file diff --git a/src/main/java/oraMessaging/models/Chat.java b/src/main/java/oraMessaging/models/Chat.java index bb7e002..6916ab4 100644 --- a/src/main/java/oraMessaging/models/Chat.java +++ b/src/main/java/oraMessaging/models/Chat.java @@ -21,6 +21,7 @@ public class Chat { protected Chat() { this.date = new Date(); + System.out.println("New chat message adde!!!!"); } public long getId() { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..3c3fb0d --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,5 @@ +server.port: 8443 +server.ssl.key-store: classpath:keystore.p12 +server.ssl.key-store-password: sammiles +server.ssl.keyStoreType: PKCS12 +server.ssl.keyAlias: tomcat diff --git a/src/main/resources/keystore.p12 b/src/main/resources/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..f5e56aed1fc40b196601e49722b802a3c2f7d3f7 GIT binary patch literal 2556 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 CUaW2a literal 0 HcmV?d00001 From 878d506e7e36b50d4ff4994a4818b35c06c4abca Mon Sep 17 00:00:00 2001 From: Sam Miles Date: Fri, 16 Jun 2017 21:46:51 -0500 Subject: [PATCH 2/2] First attempt at getting https working --- build.gradle | 4 ++++ .../java/oraMessaging/MessageApplication.java | 1 + src/main/java/oramessaging/models/Message.java | 1 + src/main/resources/application.properties | 5 +++++ src/main/resources/keystore.p12 | Bin 0 -> 2556 bytes 5 files changed, 11 insertions(+) create mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/keystore.p12 diff --git a/build.gradle b/build.gradle index ffb6c32..097017e 100644 --- a/build.gradle +++ b/build.gradle @@ -21,6 +21,10 @@ repositories { mavenCentral() } +bootRun { + addResources = true +} + sourceCompatibility = 1.8 targetCompatibility = 1.8 diff --git a/src/main/java/oraMessaging/MessageApplication.java b/src/main/java/oraMessaging/MessageApplication.java index 91304a1..f14af3d 100644 --- a/src/main/java/oraMessaging/MessageApplication.java +++ b/src/main/java/oraMessaging/MessageApplication.java @@ -7,6 +7,7 @@ public class MessageApplication { public static void main(String[] args) { + System.out.println("---------------ITS BEGUN------------"); SpringApplication.run(MessageApplication.class, args); } } \ No newline at end of file diff --git a/src/main/java/oramessaging/models/Message.java b/src/main/java/oramessaging/models/Message.java index f84fb2c..395b322 100644 --- a/src/main/java/oramessaging/models/Message.java +++ b/src/main/java/oramessaging/models/Message.java @@ -24,6 +24,7 @@ public class Message { protected Message() { this.date = new Date(); + System.out.println("New chat message adde!!!!"); } public long getId() { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..3c3fb0d --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,5 @@ +server.port: 8443 +server.ssl.key-store: classpath:keystore.p12 +server.ssl.key-store-password: sammiles +server.ssl.keyStoreType: PKCS12 +server.ssl.keyAlias: tomcat diff --git a/src/main/resources/keystore.p12 b/src/main/resources/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..f5e56aed1fc40b196601e49722b802a3c2f7d3f7 GIT binary patch literal 2556 zcmY+EcQ_k}8^?nr#I9ANs6%a%v_`4DqAj&*l~jz1HpUrA?Fvm%MXi*YMOu563TKr@ zj5bxOYCEO&x>Dl8x##))?wnNZ~1d4#k7e|A|1(Ks@N?DYiKsOEAa(t~lA5n2Yd0IusAwhsuN5|Bp|fivk5) zDmx0bQ`+m>mV?m>5(Mw8d&05I%s>DT52V88Oz%G<8~)z*RW^)`12oGYePPVHchYe% z;{9q9f&c28fUIesuE`&|6dE`fsW;+y!gU61U0v~q4$8rl%#Ndv7RgMF*VU&l$*tw^nPhm*Jo% ziO*d1VXj%{FNl6x_MAxqw{Vr1d*QdGc`Dyiz!5%4y_oT!rMfGdB~bT!E=H+$&dJ3NptYuqpf86d=J z47{DLK==K9KsWU=+#(4ByrH;I(tIdI?8>yqM z_*Mo8QNAu}^Wu!L{e2;mRVG~pj5~2s=;T0pbcU9VPc7T*@&HHqG$@=1g80(zjP#@^ z_JIZMwX+P0Bj0Cd-Pe0ZX?Gn0Xd{+)3q~gc3W8caS`Ko@id;R#{v4__51}ZMKpgzj zuD2oqj`|QW{Z-4ZdL{4uXfMAG9?KRB)ywCi!UAqY7!0zJk5^?+_)tdAF-0s2lBnL~ zBo9yn#5M(G7c4V24**_}|J)pO7s->C|HZs2nrsuSkXZezrcM8tB?Ib#q{2V9a~f9} zw4sdqIn;C8XN8?Q^X=l%7ZU4_rx&rVAM^Bd;Qh8p^~7t(+IDK?wO)ydMqg$2tkv9! z+u!GjWrx{tkEZ$B(_(fAcW3ak(&Q0!?$HuEla+d_(&+Ec2bY=701j_tp z8J(8pIPA|?e023V%@sQsUh>XU0*`VU2?6c{J2B?9W@MG3qJKa4IP76YiCeb8rSo4= z8$T*L_+57#`@u>al=;NnaDbTk+iXSblM}5%DO}0kuGZZ;pZAGCWp=r?XGiio!KPKD z2(J|nISdO#PYT!~X!1C#G9%2k_2HGlOe(fRA#tGRLtTv-)qc(0o7=qF*T@1J%6Ub2 zLgEUpoSVTH>JVh;f8T9lK3}KB>|tyaXz8%@o?#$efLCYGhZ9ug-0n;P4b1$ zm9Q8=m1x@0YpG|d!^RpaDh|z-BldJ61&wM`4~;}5UlZxIw_?cXrv|{kU#WPvDAD>X zy31GX5SKSt8^8aj+Z2viByeqQHNS4+-0_R&QBD>2dSs;^tw_(wHVRu{5+XGuEt|oV z@>c56y1=gV0p45iqO~I`d!L87yLUq*kLA(jPwQq2?+wt@$=Uh53An7`hu+S^sL4yw z2>o!b7}@YzVW;UIutIPOSOq6inrUmOhZMPIM2Hi>M8y-zO=5R|sg4XtJ7%1w+pOkp zHFWGzP+mNijw@k|PZZFNAzx^{djrFw* z*1uCJibG+Y%*qn~rgH)OXv1G81+jJVeC-~>YXCdqTP=aBbTi=^uX< zbX!Ei9Es?uwPZ(s)e&_r=zyT@wQ*_y;umwS%CItL+GBBjjSzXm0%V2Fkzakg7RkVa zHmNspGYsOdSlO4d(G6a8L1s+ z02TYkln?ZfDowEzo8&Z0LW+W>*swQcImRFhK43o19};D@zkA4 z|CCt4r#d}%iiDY&0H^EBzX{WS1PlIKu$FxZWtrwOCev{m3*KG{m<-yg$lro}fM*%s zI0>S*R+RL6erd#@Cd|~Uh1Jo)0Ssl^5H}g0TAcVMB))6$#P%AOX1CbJ;7)Ofu3i|8 z-AGZ_(Jt9L_)_y{!MigF(5PdQ6}#h60IAy#m;qWm+GZii!{@ikL1NoS+?$T?SH=>igUlHcnTUp;Dhb2e>z?L2p}_GVJ@jq~|@)m{{} zBzk@6xEw8Vj|`u|NZQ!r+i#8W{D_|uXgF#7HNtMMqIkFH6^bQCEV9jf{-q%BQygyU zZiE~|T+Kh`?3%K}=EYQADAF-5nAN^@wX)4}Z8^mB!OyHXm4nv2?P>B4AoSKl!Sb?c zd~~I9mnosa3eLbR{q%v^cyZ5ruXlbQ8@}|48G&^u(dBUO;}BstElQL`R6r^E_tlIY zi`q0k604bwJ{-xf#I29$7c6S8ieikL17{ni;RbK-zZU-EW5#bTIQX3NOtn*w&yg@A zQHS?KsNw7{bJG{MJDSHz&qjAR2w#Pa6rgt z6RwM`DEb8`6uhzKi~A^iM3NlF)1{j}fugmH)riDGgP_uI)j6Y(ri~}`l|ox* z0Zv}`QP$}MBBTT0+MkLkt|#H`*Xp66r5r zKlrf_B}TC{5W(4rlXi2I<>V{YG_neY(<9`1xzfv`QIRit@E^Sv;Cp@!jLmmk*Eu7G zKBL{juk(U~1PO1ZR9COAPfOwibA)_O05$_iC-|>ytT0F-THrXlW7{3L%HPSq{3<Isc>t$2sMP1ERn<-SE_W%IM9+wIELy%rJxWnNQs+; zSrh~S3M4bx_Yra5sOX)@5|?K?@=tHNR|5q=eTbjQ+Opx6zKb~v4PyFzk@abRtKl#F CUaW2a literal 0 HcmV?d00001