From 996bb15be5985c04436c0d2556d0f612bd4d6e45 Mon Sep 17 00:00:00 2001 From: Rob Chadwick Date: Thu, 23 Feb 2012 16:54:16 -0500 Subject: [PATCH] Lots of little fixes relating to install settings --- 3d.service.host/Web.config.installer.template | 1 + 3d.service.implementation/_3DRAPI_Imp.cs | 2 +- .../OrbitOne.OpenId.MembershipProvider.dll | Bin 21504 -> 21504 bytes .../OrbitOne.OpenId.MembershipProvider.pdb | Bin 50688 -> 50688 bytes FederatedAPI/bin/3d.service.host.dll | Bin 27648 -> 27648 bytes FederatedAPI/bin/3d.service.host.pdb | Bin 30208 -> 28160 bytes .../bin/3d.service.implementation.dll | Bin 35328 -> 35840 bytes .../bin/3d.service.implementation.pdb | Bin 65024 -> 65024 bytes FederatedAPI/bin/Simple.Providers.MySQL.dll | Bin 56832 -> 56832 bytes FederatedAPI/bin/Simple.Providers.MySQL.pdb | Bin 97792 -> 97792 bytes FederatedAPI/bin/vwarDAL.dll | Bin 193024 -> 193024 bytes FederatedAPI/bin/vwarDAL.pdb | Bin 392704 -> 392704 bytes Installer/IISConfigure.exe | Bin 6656 -> 6656 bytes Installer/IISConfigure.pdb | Bin 15872 -> 15872 bytes .../IISConfigure/IISConfigure.suo | Bin 14336 -> 14336 bytes .../IISConfigure/IISConfigure.csproj.user | 2 +- .../IISConfigure/IISConfigure/Program.cs | 8 ++++---- .../IISConfigure/obj/Release/IISConfigure.exe | Bin 6656 -> 6656 bytes .../IISConfigure/obj/Release/IISConfigure.pdb | Bin 15872 -> 15872 bytes Installer/setup.nsi | 9 ++++++--- VwarWeb/Administrators/APIControl.aspx.cs | 2 +- VwarWeb/Bin/3d.service.implementation.dll | Bin 35328 -> 35840 bytes .../OrbitOne.OpenId.MembershipProvider.dll | Bin 21504 -> 21504 bytes 23 files changed, 14 insertions(+), 10 deletions(-) diff --git a/3d.service.host/Web.config.installer.template b/3d.service.host/Web.config.installer.template index 01aa5318..872c8f0f 100644 --- a/3d.service.host/Web.config.installer.template +++ b/3d.service.host/Web.config.installer.template @@ -94,6 +94,7 @@ limitations under the License. + diff --git a/3d.service.implementation/_3DRAPI_Imp.cs b/3d.service.implementation/_3DRAPI_Imp.cs index ce77b8f9..a4c666dc 100644 --- a/3d.service.implementation/_3DRAPI_Imp.cs +++ b/3d.service.implementation/_3DRAPI_Imp.cs @@ -1098,7 +1098,7 @@ private static Stream ConvertFileToO3D(Stream data) } f.Close(); //Get the path to the o3d tool - var application = ConfigurationManager.AppSettings["LibraryLocation"] + "/o3dConverter.exe";//Path.Combine(Path.Combine(request.PhysicalApplicationPath, "bin"), "o3dConverter.exe"); + var application = ConfigurationManager.AppSettings["ProcessLocation"] + "/o3dConverter.exe";//Path.Combine(Path.Combine(request.PhysicalApplicationPath, "bin"), "o3dConverter.exe"); //Set the params and run System.Diagnostics.ProcessStartInfo processInfo = new System.Diagnostics.ProcessStartInfo(application); diff --git a/3d.service.implementation/bin/Debug/OrbitOne.OpenId.MembershipProvider.dll b/3d.service.implementation/bin/Debug/OrbitOne.OpenId.MembershipProvider.dll index c9c668b31b2e4baff25c47a0e711f6d8b3551a99..bd07108df91cc0ed806694bc500283a22c0465ab 100644 GIT binary patch delta 86 zcmZoz!Pu~ZaY6^vzLguhZn+Bh7T;!ko$l&1*YSpE+4`G%7MHlO>g-$T=Fb2GOh7yv mht@;37- z@zpRkY?hf9A;hAwZK~6xjoOpvZxooEFT*i;_XbCn8!Z~llQtHxOlUp~l?!F*0E;2i zDeU2#?6S#$#RD$Rwt43!UDo>2qyu~m4D3KBKtM@8jK#{P4I%#{ENOF#`_WY9-)zg3I@P)-Rhmy?IE zD>*+1C?^S*tBgU&rQ~M=<+j4*ki+EFF$Dnz24k4qy0?;*2wV8;LW^B zd^MB*PvqRJGA}@gWrEayjY%7|C(qv~Fgag_WAg3|jw~0zVg)Q2bI-6sG;5b8gO zVq;+AXJBBTd~v(zWT~Ap>nY>rvnj^x08DoxfdBvi delta 88 zcmZp;!PszvaY6@^Ud_g?I7fjOm*ax8)`>f}on+EUcKubk`G?~QC0)H5H-82oU;^S& oAl}gg#3>96LBTG;`yK~-SajWY+<*H|?$HCHbGbI3O)+K%0KJnTK>z>% diff --git a/FederatedAPI/bin/3d.service.host.pdb b/FederatedAPI/bin/3d.service.host.pdb index 192aa038802a11035bed43358dcce3890eb8d82a..f30674d64d955b961ca88e1d7654555c76a0a9f7 100644 GIT binary patch delta 1035 zcmZ`&T}V@57=GTf?g6C^d^H5)EQj;zYL9g$6+$D1ss? z_gzGEm3J0I^K?-cMR#5#5lGO5P(B43>Hxlkfy$+~6I} zulFe0A?4y+?)xH<845Rd&-A_#(IL&$j{2%*dROKL8x_qcb2Vt~-}tu6G<&k@elO{k zHl=ltHQWna_aQ&&7y3xLR)gBQHhxnrUw~<3{LX%HVWe|_oDSt@5GBjoXfy-QMYdRx%RPoA>9cI0fzO>>xJ^NLi`k`c~hl|2y(gk1zx zIz#_MOF4c3A5t?z$2b>V`jLx|a%qKiVs9PVuo#AG5Fgh9AM0)g=_&T8$^N~`@L$rgJw@kkQ<9DQQ delta 1327 zcmb_cO-xfk5Z*0)?Q1E}%4;b<0yR{NKL{v43M4i$YC=$;2TRmMDOIR3nkYpMN~2yx zMB2Scym;`SiLtE*Jt)LzJjjI@VvHslJ$O)q(StyY^_#xeY9iiz$@lh~+1c6Inc0oJ z=8;c)qRPe@V=X`#5q!-_m*E+gJ$e!>Ka*Uyz>O1&DSY1`Eb^E^FVVBa17HHofFurtCb=={{Rr!o|FV=}sn1x>U$^L@owAUvl?^l4ZapRs z!av300VnqvM;pOw0ot0j%s3jcuYevNNvR9Mm5CO@vk~+?5`naZV)AXOUb%Qtv*=OJe zAs*NC!nuU1m6BELrV;!LRR^q`TPjtcV6223C*ox2rS^ zdV#3KmOzEgs)%ihUYrOt8Q3JkOD{39VmP~z?jFOp8rmaRg2TT_3%KSi#9eg7pRq!Z(SW1L;ycPX~V(OO`dIR$jR3J$J|yA<^(bxE(u$x$n9xl?9c9{^<+sG zCEK;4BXq^~SEt6kg*=;fXI}|&Gk`GftMyrh2fs{-%uujEzUV zg~D_AR=GW$P0A>8y8LA{>z!l!cI=^6dHCM9t9kT|ck0!TV^5~-*F;(WJuw}sw9^%) zBxSBKr4KL4cL_bjT7?vX+nqMzLjqN3{dcZfk}~@k%NJu1t`D<5&SoCWjN!8$&8HZtQ-p&7-S|Z zGU-f?WK`#3X#y%x0OFR(U5wg{ZIib#sxx*?zQ?G<_+T<4lQ64<2Ll7+K$eC!kj2YcEW*gZ zCCnnoQgj(8$i|j03{vnK$S(TI0#q*wlrH)_xzead09|misPPU)#^0OInM5)Q{RZj~ zX4e*A($EEYtca0gvZdJpVP6iQ8G1l7)L;_7C-ayWGyb0303tVkF?V2=%mIdna%eEa z1v>@?0ibu4-9tTHfb@gSzSf+&Dz0WmM#e_2Cb|Y@rk1)UE~c)!j&3F{x+ab$t`=@? zmPY1IMw_cLG6m%10~m@J@)?pDQW=VY&zStMJW?|NS^ zzy6=KH#wBgi&MG+Iw)=nT+0mg$$GXq0VuuJfZd}Gm+7Ek~6?;q^Q7kpSZS)#du q_Xbb_47{5>w^x%^p3^J1y znRF&cGOBYuX#^@z0OF>}U5wg{Et9t~sxx*>zQ?Gx9MlGYpi2n;L3kDxmr(Qv$%melQlOhLqUE5P_U?D0N2(xPo zFlp$5JXG|MeX^z50byMZpc#5VGt^)bw@cV#J-ho{)`L^3@`GHMN?Wl{nx*Lup?jaVcljKE*%bmNl_=t#V$Xa zR5;f~J}TAX#zx0AjGI|RSU6a@(^OaHP3D!UXSp3C`)Bh6nHMR7JS+?i_ko7-0_g`p zntyX=V<;1+90M-{9}pXFe%@>nz}T=^=1PPBi$U6djmdYOC`_L5#DT?Q+CLB{gGB)% ZDm6LjsT+$x;#Q~4Yo12nbLEF8yZ~CkPNe_< delta 207 zcmZqp!`$$Pc>@cV1V@dVKO+MJ!|ocx<3&rKyX=!*HsLzs)0>-RxO6xKZt7ZGTE>>_ z=(f#^OXNme|3=3(jGI|RSU6bi+j_EsC-chGvm_Va|GIgC%!?F3ZWe}y$3Vk)fb?r1 z&AYj?F_ekZoI#L5j)9kfZ}anJlYq(pk8^HTxe_42;vsz4Y4V*X3X^9%abT%{a57jL ef*CY{qEeHSp1QH@Si_*XdCk)ZeD3`4gcksT;!d&v diff --git a/FederatedAPI/bin/Simple.Providers.MySQL.dll b/FederatedAPI/bin/Simple.Providers.MySQL.dll index c7916a2da8022ceffd456034433334f17e55c396..c67e7902b73e8544a7ea69dde49c8a5c0f0becf0 100644 GIT binary patch delta 66 zcmV-I0KNZ!yaRx|1CWRUy{WN^n#>T8VQJW6W9&t)kPDhy@(xt9G|dPJ0==n|KGqr# YTK@}gQYf)Yu-sEppM#PnvuM_s2L(kQOaK4? delta 66 zcmV-I0KNZ!yaRx|1CWRU1AMWHn#>T1Bx;ssaqmN?HYwFJ77$L>XaemG8^NEZK)2Ameda|52`%h!~g+xZh>8y#2!OR*EN!95M ziHtrh3CBNxB}-TWpe)ttxk-%S%n~qVZ;}|>n3y%Umn1WuV`2KEG2JDD@g9g)$z+V< z_@hy&!N5?(IQ?EGquBNZnT$@1Ah{=5jCnwMdq_5;9V7c6jsF%53?HToW;2RTUzfue v!ojRL&yInCg>iaZE>N37E~616P|U}VfuRX1R*=Uyg&C*!x62eUKH&xcdZ=cL delta 301 zcmZqp!`kqNbps2R1apm>KO+MJ!;NU8xr}AM{F}54HN6fUnYvkq>y0>T`}Vo%!Ogr% z+j*53`BbL=H)rJBuHwcRAjM*EaE8Xw<(9A{Kv}BObCVduSt_8~RHna4Vr*mjqp`gtneiM86VPmz490s*|NN$_ zWHQEa{PU~SU|^_XoPIBpQEdByOhzY0kld3j#yqC~e%nK`8SNO^|NH&7U|{$#T`-$b zbo#m+#t@GGe)H@Y7+4sm$K?XGDdaL5F>?IT@bP0{Xo89rjJz6>G&t@ delta 117 zcmV-*0E+*BjJz6;1eoU diff --git a/FederatedAPI/bin/vwarDAL.pdb b/FederatedAPI/bin/vwarDAL.pdb index a9f541164606a43b35f77783dbc3b1e77c6c391d..61fea5507c1fa24dcc00b7b44c357cc2adaa1bb8 100644 GIT binary patch delta 9952 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 K{9o+rr2hx`@?p6E delta 10841 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 diff --git a/Installer/IISConfigure.exe b/Installer/IISConfigure.exe index 638f3ae3b1b59020d9219e541d607533bab4a4d5..d1da9e66a76533ce46a697f58d067fa980c03f38 100644 GIT binary patch delta 1389 zcmZuxU1%It7(MsS?CkFB>~v?hX_Tz(#;n=xW|M4a5k>sL*xDb(Xjn_hLyUFUF0q+3 zNinftR;4Jx2GgrjLKU@zHa@5j!64|1+8X~*d?>~E2ll}SDL%HocxHCDf^pz}_xsLw z=G=4l-r3sr+V+=UlxuSfbDPB*3rqX#fnH!Q_}l}W3oW##tj7S0^{E~pt=eT#?H4(5 zMm;NLGc}U^XBUS=2)}m#D<&XVa~NvGDTUffA+)KoEc9L^Y*N zZ(m=}yP54&w5!vJdh}?ciVQfAjy z$Mm-PsqW}rfyu<7=1RqQoytZR8zcsD-%`$`oayD%H7z?En22>{omgNZ6>>se))(@B zjbI1G2%#dOPI3Z`AE*(dMr^$$i%M4AlHnNtwG<)L9Vl51C6iJXr7YSxt2gY#DH5;S z2|MBScETRdop$2?+KE#mzTS>aCA)4X;zZWliFmv%RI(dNv$SJV%5F++VY>kF1Wyge zkU9yiEx1NGoc|M!pGy?QwqfC4N8Yz-aqGLy{8!QE$Oc}JeM8Osxa|9+nO~HB5iQ_s zmiZFYYAAQ7r2!q!0Mnem)0q!WO;pD!ll}_3BEV;yJIaHwqCmpW?=SDZk8_&!Db;P{ z99~6wsSnFB0~InA7FytrO$Z!GRi{8a#UfWLcyx1x=1-`xYatVg-fDZ8}+`IyLw zN8}5lo*ufD3*j1vhA2MC0M9#sV9jC3v))iNHKZdV%UXZm2W%Tb5^!oAz&=eoKJ{wX zc;K@UGlTZ9-yQbX$al0`#2WdzcF63~fS&I<Q*?`;pkQFeJLsgd3;1}P!o;6^y+{p4p@*|FP>fD7708cz z(VHV#Y~__xY}v`7Rg6|K#<|dnNGqOc@e5kTK^`{FXB~VK*{vB!>Cg>4p_hm= z`Uo7%>tX*4xvZG|;-Z{4FV|i4>CoTmOY{Y_j_xQN#k57EY>j9fqrSBO4-Bc>E)aGgA_`opk9;Wlhh3lAzRp-&Vr zffDg4>>(b&6mbSM@ir#$G#WT1JM4RxcG+J?Vi___B} zPuipN3s)<%n?E~oV%22bSe@J}l4UE6)ye(B2kZT;^)!=lpA*rvU`eJmmDQ%88uooq z<{iG>OeDvWWj@u`XqqUj{vY=Q+%b7=)q8{H+Bo;>_S8l zSi%W0dWeYVp`!A>hzR9NX895Y5mKljMftBtss~5kGtR~ipY!{k-?`kKduI(;149K= zdR90~9pUw_wj!-k7M8rutCIRRU3o@bai>rHIcDB}ur}>_d3~+)%2bx!nziQeHJ%x5 z8?Spiac!}&rmeU3i{0vdN@c@AQXj)se1E81_Wk%q`>z?A!<5{M&YSa7J@!y;AC>zH zrfWNpds2DJ!RVqrAW6{hG>hG&hSu6E?#` znwxsrQLTYavb$QPD;qbmLfB_b*G^(85f|A^97+uHGKr9KXfj1N*fHG~=t9C*`Y0jz zqBE>GSx^tL9^Ea?QP!{PyiuM(<4!b`u*cYHA|bd-o(!^iaj}?4KA<;!F*jS*TeN2J z`zZ4CQ60eEIO{ZwL>*?igjgqF9=r_m;V@iTOLXhIJ8AR z0r>@A!v^I172x$pQ7^#5$k$;b+z`17FGdk>^kdS51sxuN9+;4JEf26K`PueZG@kt*AiM&k delta 1026 zcmXxjZAep590u@ncBk&nv~41?PA3 z-*S7QUHfghZL^&6Y#ECA^YdcJ98QhdU5BHCp5(LV9epEDj=f%*(_%F{zbmepr)uypHD})8s-m!kmtwhHb6nkj=4ztl#{_qh+tXve(0O9WN_b9jwa8w# zz5Cq+R~P#J$A8MLM0T&DRxfTRuU3#^M^dO(JI)<+UklPbO{1@xgI>WUx`Tef5X{y! z+5#i+s2<@D=(1j(T7n1hahlc*3K=f7*v6Qs+Q@DAsnu|K+tI8=GsYRiAIo8RZaW2x zAaxoJo5x0{4MPm76LPSNZego@>}%wJ$WvJ?MT z0b_B~hYK;N|1Zqta1{p1;A&VS`xq2+O)!MMP38kKcfc_EIK%;%eX>6f#l9;Lr)*xA z`35Xwab`Zk#X8&&hb;!jWqt|E(SL#!Fe&>vDCSad_EqRTP~>cx18_Zh@v&}z6|%2| zVs0CZqTeNQ97Pi@HljEP>tL6-f&Qe-CagzKFa|Hmeh7-WVYnInh|HrhkHf9#r(gs8 zDElN7`{rS=5jSl3hU|bDtcGQbWzkqTn=95-xQKJ7r4|QmR2T`-&Qce( SJ0rwPymZ@_ZaplGrT+u$KKc>> diff --git a/Installer/IISConfigure/IISConfigure/IISConfigure.suo b/Installer/IISConfigure/IISConfigure/IISConfigure.suo index 2f617c7fd0a0f4e9d3caaf1cf26f0f9ffc5f25d1..8d5a5ba425e6ded82364a16fd71b3c3a2c7d8819 100644 GIT binary patch delta 528 zcma)&ze~eF6vyAC*R(c?O&Y5$MXWytCuwaOUDZiiNmfy}{sBcYI4JaQ=&kDH<|4hx zQHmgfh`I=FB902>K&xPVX%)`Rg9pdwd))iH*Qht@Csj&xHc2N`fBm9c>#%KltB(Re z9IJMzBRS(Y|pEo)@ tK6PqZB`81{&0SdN`vdz(&9zExqL49m;7+pw)wytv2({}^6~6D*$Ty>#rx5@E delta 527 zcma)&u}i~16vp2r*HF_-lQgZi6tT4yT*TJ4(ZxYKT4@p79Rw$#NCpLk{0Y)q9CTC= z7ilKvZh{o;;#U6xT>|Q2d>0Vo=7V<}-}k+{AJ6T&-P;x=8ZXirWv6_4z5T)u=o6y= zpkfDD{E^P}CMZ9QwO9r?0az|_P0bA`Shh+X)zL$_B2uczV42fFVRK<^B6r${n-AEHqMoOw;o6)+Jek8dRVGb+BO>&l3y*STOn*5Fix)G)Dym zkQ>2^IGn~7cn>%A)Z5o"C:\Program Files (x86)\3D Repository" - /stop + /i \ No newline at end of file diff --git a/Installer/IISConfigure/IISConfigure/IISConfigure/Program.cs b/Installer/IISConfigure/IISConfigure/IISConfigure/Program.cs index 9a961e7d..d4ccd642 100644 --- a/Installer/IISConfigure/IISConfigure/IISConfigure/Program.cs +++ b/Installer/IISConfigure/IISConfigure/IISConfigure/Program.cs @@ -14,9 +14,9 @@ static void Main(string[] args) { try { - Site mySite = serverManager.Sites.Add("3DR", args[args.Length], 80); - mySite.Applications.Add("/3DR", args[0] + "\\VwarWeb\\"); - mySite.Applications.Add("/API", args[0] + "\\3d.service.host\\"); + Site mySite = serverManager.Sites.Add("3DR", args[args.Length-1], 80); + mySite.Applications.Add("/3DR", args[args.Length - 1] + "\\VwarWeb\\"); + mySite.Applications.Add("/API", args[args.Length - 1] + "\\3d.service.host\\"); try { @@ -31,7 +31,7 @@ static void Main(string[] args) } catch (Exception e) { - + Console.WriteLine(e.Message); } } else if(args[0] == "/uninstall" || args[0] == "/u") diff --git a/Installer/IISConfigure/IISConfigure/IISConfigure/obj/Release/IISConfigure.exe b/Installer/IISConfigure/IISConfigure/IISConfigure/obj/Release/IISConfigure.exe index 638f3ae3b1b59020d9219e541d607533bab4a4d5..d1da9e66a76533ce46a697f58d067fa980c03f38 100644 GIT binary patch delta 1389 zcmZuxU1%It7(MsS?CkFB>~v?hX_Tz(#;n=xW|M4a5k>sL*xDb(Xjn_hLyUFUF0q+3 zNinftR;4Jx2GgrjLKU@zHa@5j!64|1+8X~*d?>~E2ll}SDL%HocxHCDf^pz}_xsLw z=G=4l-r3sr+V+=UlxuSfbDPB*3rqX#fnH!Q_}l}W3oW##tj7S0^{E~pt=eT#?H4(5 zMm;NLGc}U^XBUS=2)}m#D<&XVa~NvGDTUffA+)KoEc9L^Y*N zZ(m=}yP54&w5!vJdh}?ciVQfAjy z$Mm-PsqW}rfyu<7=1RqQoytZR8zcsD-%`$`oayD%H7z?En22>{omgNZ6>>se))(@B zjbI1G2%#dOPI3Z`AE*(dMr^$$i%M4AlHnNtwG<)L9Vl51C6iJXr7YSxt2gY#DH5;S z2|MBScETRdop$2?+KE#mzTS>aCA)4X;zZWliFmv%RI(dNv$SJV%5F++VY>kF1Wyge zkU9yiEx1NGoc|M!pGy?QwqfC4N8Yz-aqGLy{8!QE$Oc}JeM8Osxa|9+nO~HB5iQ_s zmiZFYYAAQ7r2!q!0Mnem)0q!WO;pD!ll}_3BEV;yJIaHwqCmpW?=SDZk8_&!Db;P{ z99~6wsSnFB0~InA7FytrO$Z!GRi{8a#UfWLcyx1x=1-`xYatVg-fDZ8}+`IyLw zN8}5lo*ufD3*j1vhA2MC0M9#sV9jC3v))iNHKZdV%UXZm2W%Tb5^!oAz&=eoKJ{wX zc;K@UGlTZ9-yQbX$al0`#2WdzcF63~fS&I<Q*?`;pkQFeJLsgd3;1}P!o;6^y+{p4p@*|FP>fD7708cz z(VHV#Y~__xY}v`7Rg6|K#<|dnNGqOc@e5kTK^`{FXB~VK*{vB!>Cg>4p_hm= z`Uo7%>tX*4xvZG|;-Z{4FV|i4>CoTmOY{Y_j_xQN#k57EY>j9fqrSBO4-Bc>E)aGgA_`opk9;Wlhh3lAzRp-&Vr zffDg4>>(b&6mbSM@ir#$G#WT1JM4RxcG+J?Vi___B} zPuipN3s)<%n?E~oV%22bSe@J}l4UE6)ye(B2kZT;^)!=lpA*rvU`eJmmDQ%88uooq z<{iG>OeDvWWj@u`XqqUj{vY=Q+%b7=)q8{H+Bo;>_S8l zSi%W0dWeYVp`!A>hzR9NX895Y5mKljMftBtss~5kGtR~ipY!{k-?`kKduI(;149K= zdR90~9pUw_wj!-k7M8rutCIRRU3o@bai>rHIcDB}ur}>_d3~+)%2bx!nziQeHJ%x5 z8?Spiac!}&rmeU3i{0vdN@c@AQXj)se1E81_Wk%q`>z?A!<5{M&YSa7J@!y;AC>zH zrfWNpds2DJ!RVqrAW6{hG>hG&hSu6E?#` znwxsrQLTYavb$QPD;qbmLfB_b*G^(85f|A^97+uHGKr9KXfj1N*fHG~=t9C*`Y0jz zqBE>GSx^tL9^Ea?QP!{PyiuM(<4!b`u*cYHA|bd-o(!^iaj}?4KA<;!F*jS*TeN2J z`zZ4CQ60eEIO{ZwL>*?igjgqF9=r_m;V@iTOLXhIJ8AR z0r>@A!v^I172x$pQ7^#5$k$;b+z`17FGdk>^kdS51sxuN9+;4JEf26K`PueZG@kt*AiM&k delta 1026 zcmXxjZAep590u@ncBk&nv~41?PA3 z-*S7QUHfghZL^&6Y#ECA^YdcJ98QhdU5BHCp5(LV9epEDj=f%*(_%F{zbmepr)uypHD})8s-m!kmtwhHb6nkj=4ztl#{_qh+tXve(0O9WN_b9jwa8w# zz5Cq+R~P#J$A8MLM0T&DRxfTRuU3#^M^dO(JI)<+UklPbO{1@xgI>WUx`Tef5X{y! z+5#i+s2<@D=(1j(T7n1hahlc*3K=f7*v6Qs+Q@DAsnu|K+tI8=GsYRiAIo8RZaW2x zAaxoJo5x0{4MPm76LPSNZego@>}%wJ$WvJ?MT z0b_B~hYK;N|1Zqta1{p1;A&VS`xq2+O)!MMP38kKcfc_EIK%;%eX>6f#l9;Lr)*xA z`35Xwab`Zk#X8&&hb;!jWqt|E(SL#!Fe&>vDCSad_EqRTP~>cx18_Zh@v&}z6|%2| zVs0CZqTeNQ97Pi@HljEP>tL6-f&Qe-CagzKFa|Hmeh7-WVYnInh|HrhkHf9#r(gs8 zDElN7`{rS=5jSl3hU|bDtcGQbWzkqTn=95-xQKJ7r4|QmR2T`-&Qce( SJ0rwPymZ@_ZaplGrT+u$KKc>> diff --git a/Installer/setup.nsi b/Installer/setup.nsi index 42520e5b..5e99627e 100644 --- a/Installer/setup.nsi +++ b/Installer/setup.nsi @@ -105,7 +105,7 @@ Section -Main SEC0000 SectionIn 1 SetOutPath $INSTDIR SetOverwrite on - File /a /r /x *.git* /x *.svn* /x 3dr_setup* /x IISConfigure /x vwardal /x 3d.service.implementation /x assemblies /x away3D_viewer /x build_tools /x config /x ConverterWrapper /x DMG_Forums_3-2 /x FederatedAPI /x FederatedAPI.implementation /x OrbitOne.OpenId.Controls /x OrbitOne.OpenId.MembershipProvider /x _UpgradeReport_Files /x *vwarsolution.* /x SimpleMySqlProvider /x testing /x vwar.uploader ..\* + File /a /r /x *.git* /x *.config /x *.svn* /x 3dr_setup* /x IISConfigure /x vwardal /x 3d.service.implementation /x assemblies /x away3D_viewer /x build_tools /x config /x ConverterWrapper /x DMG_Forums_3-2 /x FederatedAPI /x FederatedAPI.implementation /x OrbitOne.OpenId.Controls /x OrbitOne.OpenId.MembershipProvider /x _UpgradeReport_Files /x *vwarsolution.* /x SimpleMySqlProvider /x testing /x vwar.uploader ..\* File /a /oname=$INSTDIR\Vwarweb\web.config ..\VwarWeb\web.config.installer.template File /a /oname=$INSTDIR\3d.service.host\web.config ..\3d.service.host\web.config.installer.template SetOutPath $INSTDIR\Vwarweb\Bin @@ -130,7 +130,7 @@ Section -Upgrade UPGRADESEC SetOverwrite on strcpy $INSTDIR $UpgradePath SetOutPath $INSTDIR - File /a /r /x *.git* /x *.svn* /x 3dr_setup* /x IISConfigure /x vwardal /x 3d.service.implementation /x assemblies /x away3D_viewer /x build_tools /x config /x ConverterWrapper /x DMG_Forums_3-2 /x FederatedAPI /x FederatedAPI.implementation /x OrbitOne.OpenId.Controls /x OrbitOne.OpenId.MembershipProvider /x _UpgradeReport_Files /x *vwarsolution.* /x SimpleMySqlProvider /x testing /x vwar.uploader ..\* + File /a /r /x *.git* /x *.svn* /x 3dr_setup* /x IISConfigure /x vwardal /x 3d.service.implementation /x assemblies /x away3D_viewer /x build_tools /x config /x ConverterWrapper /x DMG_Forums_3-2 /x FederatedAPI /x FederatedAPI.implementation /x OrbitOne.OpenId.Controls /x OrbitOne.OpenId.MembershipProvider /x _UpgradeReport_Files /x *vwarsolution.* /x SimpleMySqlProvider /x 3DTools /x testing /x vwar.uploader ..\* File /a /oname=$INSTDIR\Vwarweb\web.config ..\VwarWeb\web.config.installer.template File /a /oname=$INSTDIR\3d.service.host\web.config ..\3d.service.host\web.config.installer.template SetOutPath $INSTDIR\Vwarweb\Bin @@ -830,8 +830,11 @@ Function WriteConfigFile !insertmacro _ReplaceInFile "$INSTDIR\Vwarweb\web.config" "[[SMTPServer]]" $SMTPServer !insertmacro _ReplaceInFile "$INSTDIR\Vwarweb\web.config" "[[3DToolsDir]]" "$Instdir\Vwarweb\Bin" - !insertmacro _ReplaceInFile "$INSTDIR\Vwarweb\web.config" "[[APILocation]]" "http://localhost/API/_3DRAPI.svc/" + !insertmacro _ReplaceInFile "$INSTDIR\Vwarweb\web.config" "[[APIPATH]]" "$instdir/3d.service.host/" + !insertmacro _ReplaceInFile "$INSTDIR\Vwarweb\web.config" "[[LR_APIBaseURL]]" "http://localhost/API/_3DRAPI.svc/" + + !insertmacro _ReplaceInFile "$INSTDIR\3d.service.host\web.config" "[[ProcessLocation]]" "$instdir/Vwarweb/processes" !insertmacro _ReplaceInFile "$INSTDIR\3d.service.host\web.config" "[[FedoraUsername]]" $FedoraUsername !insertmacro _ReplaceInFile "$INSTDIR\3d.service.host\web.config" "[[FedoraPassword]]" $FedoraPassword !insertmacro _ReplaceInFile "$INSTDIR\3d.service.host\web.config" "[[FedoraUrl]]" $FedoraURL diff --git a/VwarWeb/Administrators/APIControl.aspx.cs b/VwarWeb/Administrators/APIControl.aspx.cs index 1e5d2432..bec9f415 100644 --- a/VwarWeb/Administrators/APIControl.aspx.cs +++ b/VwarWeb/Administrators/APIControl.aspx.cs @@ -432,7 +432,7 @@ protected void SaveFedoraSettings_Click(object sender, EventArgs e) doc.Save(APIPath.Text + "web.config"); BlankStatus(); - testMySQLStatus.Text = "Saved"; + TestFedoraStatus.Text = "Saved"; ResetDefaultText(FedoraURL); ResetDefaultText(FedoraUserName); ResetDefaultText(FedoraPassword1); diff --git a/VwarWeb/Bin/3d.service.implementation.dll b/VwarWeb/Bin/3d.service.implementation.dll index ff5b7fb5e35a98499eca1ea6d9ceadd528e9b623..cd5a5e56f9180489566abb48224adfd17322b455 100644 GIT binary patch delta 521 zcmZpe!qhN>X+nqMzLjqN3{dcZfk}~@k%NJu1t`D<5&SoCWjN!8$&8HZtQ-p&7-S|Z zGU-f?WK`#3X#y%x0OFR(U5wg{ZIib#sxx*?zQ?G<_+T<4lQ64<2Ll7+K$eC!kj2YcEW*gZ zCCnnoQgj(8$i|j03{vnK$S(TI0#q*wlrH)_xzead09|misPPU)#^0OInM5)Q{RZj~ zX4e*A($EEYtca0gvZdJpVP6iQ8G1l7)L;_7C-ayWGyb0303tVkF?V2=%mIdna%eEa z1v>@?0ibu4-9tTHfb@gSzSf+&Dz0WmM#e_2Cb|Y@rk1)UE~c)!j&3F{x+ab$t`=@? zmPY1IMw_cLG6m%10~m@J@)?pDQW=VY&zStMJW?|NS^ zzy6=KH#wBgi&MG+Iw)=nT+0mg$$GXq0VuuJfZd}Gm+7Ek~6?;q^Q7kpSZS)#du q_Xbb_47{5>w^x%^p3^J1y znRF&cGOBYuX#^@z0OF>}U5wg{Et9t~sxx*>zQ?Gx9MlGYpi2n;L3kDxmr(Qv$%melQlOhLqUE5P_U?D0N2(xPo zFlp$5JXG|MeX^z50byMZpc#5VGt^)bwg-$T=Fb2GOh7yv mh