diff --git a/SIS/.classpath b/SIS/.classpath index ff1777e..5ff8a17 100644 --- a/SIS/.classpath +++ b/SIS/.classpath @@ -37,7 +37,6 @@ - @@ -46,13 +45,7 @@ - - - - - - @@ -61,5 +54,11 @@ + + + + + + diff --git a/SIS/.factorypath b/SIS/.factorypath index f0a961d..6d40837 100644 --- a/SIS/.factorypath +++ b/SIS/.factorypath @@ -1,6 +1,7 @@ - - - + + + + diff --git a/SIS/.settings/com.google.appengine.eclipse.core.prefs b/SIS/.settings/com.google.appengine.eclipse.core.prefs index f0ceee6..4829222 100644 --- a/SIS/.settings/com.google.appengine.eclipse.core.prefs +++ b/SIS/.settings/com.google.appengine.eclipse.core.prefs @@ -2,7 +2,7 @@ <<<<<<<=HEAD >>>>>>>=cahier-de-texte eclipse.preferences.version=1 -filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.9.25.jar|appengine-api-labs.jar|appengine-endpoints-deps.jar|appengine-endpoints.jar|appengine-jsr107cache-1.9.25.jar|jsr107cache-1.1.jar +filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.9.30.jar|appengine-api-labs.jar|appengine-endpoints-deps.jar|appengine-endpoints.jar|appengine-jsr107cache-1.9.30.jar|jsr107cache-1.1.jar gaeDatanucleusEnabled=false gaeDatanucleusVersion=v2 gaeDeployDialogSettings= diff --git a/SIS/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs b/SIS/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs new file mode 100644 index 0000000..7c8126d --- /dev/null +++ b/SIS/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs @@ -0,0 +1,5 @@ +XDOCLETBUILDERACTIVE=true +XDOCLETHOME= +XDOCLETUSEGLOBAL=true +XDOCLETVERSION=1.2.1 +eclipse.preferences.version=1 diff --git a/SIS/.settings/org.eclipse.wst.xsl.core.prefs b/SIS/.settings/org.eclipse.wst.xsl.core.prefs new file mode 100644 index 0000000..e28962c --- /dev/null +++ b/SIS/.settings/org.eclipse.wst.xsl.core.prefs @@ -0,0 +1,11 @@ +CHECK_CALL_TEMPLATES=2 +CHECK_XPATHS=2 +CIRCULAR_REF=2 +DUPLICATE_PARAMETER=2 +EMPTY_PARAM=1 +MISSING_INCLUDE=2 +MISSING_PARAM=1 +NAME_ATTRIBUTE_EMPTY=2 +NAME_ATTRIBUTE_MISSING=2 +TEMPLATE_CONFLICT=2 +eclipse.preferences.version=1 diff --git a/SIS/src/com/lemania/sis/client/gin/ClientModule.java b/SIS/src/com/lemania/sis/client/gin/ClientModule.java index ca517e9..d7cbe78 100644 --- a/SIS/src/com/lemania/sis/client/gin/ClientModule.java +++ b/SIS/src/com/lemania/sis/client/gin/ClientModule.java @@ -42,7 +42,6 @@ import com.lemania.sis.client.presenter.EcoleAddPresenter; import com.lemania.sis.client.presenter.ContactPresenter; import com.lemania.sis.client.presenter.SettingsPresenter; -import com.lemania.sis.client.place.SISPlaceManager; import com.lemania.sis.client.presenter.CoursAddPresenter; import com.lemania.sis.client.presenter.CoursPresenter; import com.lemania.sis.client.presenter.FrmClasseListPresenter; @@ -100,12 +99,20 @@ protected void configure() { install(new StudyLogManagementModule()); install(new StudyLogStudentModule()); - // Singletons - install(new DefaultModule(SISPlaceManager.class)); - // Set DefaultPlace to homepage - bindConstant().annotatedWith(DefaultPlace.class).to( - NameTokens.homepage); +// 20151221 - Upgrade to GWTP 1.5.1 +// // Singletons +// install(new DefaultModule(SISPlaceManager.class)); +// // Set DefaultPlace to homepage +// bindConstant().annotatedWith(DefaultPlace.class).to( +// NameTokens.homepage); + + install(new DefaultModule.Builder() + .defaultPlace(NameTokens.homepage) + .errorPlace(NameTokens.homepage) + .unauthorizedPlace(NameTokens.homepage) + .build()); + bindPresenter(MainPagePresenter.class, MainPagePresenter.MyView.class, MainPageView.class, MainPagePresenter.MyProxy.class); diff --git a/SIS/src/com/lemania/sis/server/guice/DispatchServletModule.java b/SIS/src/com/lemania/sis/server/guice/DispatchServletModule.java index 214cc67..86fd624 100644 --- a/SIS/src/com/lemania/sis/server/guice/DispatchServletModule.java +++ b/SIS/src/com/lemania/sis/server/guice/DispatchServletModule.java @@ -3,16 +3,16 @@ import com.google.inject.Singleton; import com.google.inject.servlet.ServletModule; import com.googlecode.objectify.ObjectifyFilter; -import com.gwtplatform.dispatch.shared.ActionImpl; -import com.gwtplatform.dispatch.server.guice.DispatchServiceImpl; public class DispatchServletModule extends ServletModule { @Override public void configureServlets() { // - serve("/" + ActionImpl.DEFAULT_SERVICE_NAME) - .with(DispatchServiceImpl.class); + +// 20151221 - Upgrade to GWTP 1.5.1 +// serve("/" + ActionImpl.DEFAULT_SERVICE_NAME) +// .with(DispatchServiceImpl.class); filter("/*").through(ObjectifyFilter.class); diff --git a/SIS/src/com/lemania/sis/server/guice/ServerModule.java b/SIS/src/com/lemania/sis/server/guice/ServerModule.java index 81928b3..8ba15ec 100644 --- a/SIS/src/com/lemania/sis/server/guice/ServerModule.java +++ b/SIS/src/com/lemania/sis/server/guice/ServerModule.java @@ -1,6 +1,6 @@ package com.lemania.sis.server.guice; -import com.gwtplatform.dispatch.server.guice.HandlerModule; +import com.gwtplatform.dispatch.rpc.server.guice.HandlerModule; public class ServerModule extends HandlerModule { diff --git a/SIS/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml b/SIS/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml index 1b05696..81f7757 100644 --- a/SIS/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml +++ b/SIS/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml @@ -1,4 +1,12 @@ - + - + + + + + + + + + diff --git a/SIS/war/WEB-INF/appengine-generated/local_db.bin b/SIS/war/WEB-INF/appengine-generated/local_db.bin index 73b5d53..681c2eb 100644 Binary files a/SIS/war/WEB-INF/appengine-generated/local_db.bin and b/SIS/war/WEB-INF/appengine-generated/local_db.bin differ diff --git a/SIS/war/WEB-INF/appengine-web.xml b/SIS/war/WEB-INF/appengine-web.xml index 1f4698a..b943a32 100644 --- a/SIS/war/WEB-INF/appengine-web.xml +++ b/SIS/war/WEB-INF/appengine-web.xml @@ -4,7 +4,7 @@ lemania-eprofil - 5-20151005-1 + 5-20151221-1 true diff --git a/SIS/war/WEB-INF/classes/.gitignore b/SIS/war/WEB-INF/classes/.gitignore deleted file mode 100644 index c2d9872..0000000 --- a/SIS/war/WEB-INF/classes/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/com/ diff --git a/SIS/war/WEB-INF/classes/com/lemania/sis/client/gin/ClientModule.class b/SIS/war/WEB-INF/classes/com/lemania/sis/client/gin/ClientModule.class index dfd1d9a..71274f1 100644 Binary files a/SIS/war/WEB-INF/classes/com/lemania/sis/client/gin/ClientModule.class and b/SIS/war/WEB-INF/classes/com/lemania/sis/client/gin/ClientModule.class differ diff --git a/SIS/war/WEB-INF/classes/com/lemania/sis/server/guice/DispatchServletModule.class b/SIS/war/WEB-INF/classes/com/lemania/sis/server/guice/DispatchServletModule.class index 6f4b03b..e93fa30 100644 Binary files a/SIS/war/WEB-INF/classes/com/lemania/sis/server/guice/DispatchServletModule.class and b/SIS/war/WEB-INF/classes/com/lemania/sis/server/guice/DispatchServletModule.class differ diff --git a/SIS/war/WEB-INF/classes/com/lemania/sis/server/guice/ServerModule.class b/SIS/war/WEB-INF/classes/com/lemania/sis/server/guice/ServerModule.class index 1d74e37..bea8c9d 100644 Binary files a/SIS/war/WEB-INF/classes/com/lemania/sis/server/guice/ServerModule.class and b/SIS/war/WEB-INF/classes/com/lemania/sis/server/guice/ServerModule.class differ diff --git a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/parent/ParentRequestFactoryDeobfuscatorBuilder.class b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/parent/ParentRequestFactoryDeobfuscatorBuilder.class index 80388b3..7f6ba12 100644 Binary files a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/parent/ParentRequestFactoryDeobfuscatorBuilder.class and b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/parent/ParentRequestFactoryDeobfuscatorBuilder.class differ diff --git a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/BrancheRequestFactoryDeobfuscatorBuilder.class b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/BrancheRequestFactoryDeobfuscatorBuilder.class index a308cbe..b15c025 100644 Binary files a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/BrancheRequestFactoryDeobfuscatorBuilder.class and b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/BrancheRequestFactoryDeobfuscatorBuilder.class differ diff --git a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/ClasseRequestFactoryDeobfuscatorBuilder.class b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/ClasseRequestFactoryDeobfuscatorBuilder.class index d959a1c..ce98891 100644 Binary files a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/ClasseRequestFactoryDeobfuscatorBuilder.class and b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/ClasseRequestFactoryDeobfuscatorBuilder.class differ diff --git a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/ContactRequestFactoryDeobfuscatorBuilder.class b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/ContactRequestFactoryDeobfuscatorBuilder.class index a288c86..210b808 100644 Binary files a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/ContactRequestFactoryDeobfuscatorBuilder.class and b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/ContactRequestFactoryDeobfuscatorBuilder.class differ diff --git a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/CoursRequestFactoryDeobfuscatorBuilder.class b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/CoursRequestFactoryDeobfuscatorBuilder.class index 30e946e..577778a 100644 Binary files a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/CoursRequestFactoryDeobfuscatorBuilder.class and b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/CoursRequestFactoryDeobfuscatorBuilder.class differ diff --git a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/EcoleRequestFactoryDeobfuscatorBuilder.class b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/EcoleRequestFactoryDeobfuscatorBuilder.class index 27c8372..e6a97d0 100644 Binary files a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/EcoleRequestFactoryDeobfuscatorBuilder.class and b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/EcoleRequestFactoryDeobfuscatorBuilder.class differ diff --git a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/EvaluationHeaderRequestFactoryDeobfuscatorBuilder.class b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/EvaluationHeaderRequestFactoryDeobfuscatorBuilder.class index 9152d18..1f4e673 100644 Binary files a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/EvaluationHeaderRequestFactoryDeobfuscatorBuilder.class and b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/EvaluationHeaderRequestFactoryDeobfuscatorBuilder.class differ diff --git a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/EvaluationStudentReportRequestFactoryDeobfuscatorBuilder.class b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/EvaluationStudentReportRequestFactoryDeobfuscatorBuilder.class index 8070ede..47718c3 100644 Binary files a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/EvaluationStudentReportRequestFactoryDeobfuscatorBuilder.class and b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/EvaluationStudentReportRequestFactoryDeobfuscatorBuilder.class differ diff --git a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/EvaluationSubjectRequestFactoryDeobfuscatorBuilder.class b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/EvaluationSubjectRequestFactoryDeobfuscatorBuilder.class index 1ac1a8d..2edadd2 100644 Binary files a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/EvaluationSubjectRequestFactoryDeobfuscatorBuilder.class and b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/EvaluationSubjectRequestFactoryDeobfuscatorBuilder.class differ diff --git a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/ProfessorRequestFactoryDeobfuscatorBuilder.class b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/ProfessorRequestFactoryDeobfuscatorBuilder.class index 84cc00b..8521711 100644 Binary files a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/ProfessorRequestFactoryDeobfuscatorBuilder.class and b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/ProfessorRequestFactoryDeobfuscatorBuilder.class differ diff --git a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/ProfileBrancheRequestFactoryDeobfuscatorBuilder.class b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/ProfileBrancheRequestFactoryDeobfuscatorBuilder.class index 152dd90..bf24fd6 100644 Binary files a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/ProfileBrancheRequestFactoryDeobfuscatorBuilder.class and b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/ProfileBrancheRequestFactoryDeobfuscatorBuilder.class differ diff --git a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/ProfileRequestFactoryDeobfuscatorBuilder.class b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/ProfileRequestFactoryDeobfuscatorBuilder.class index fc628f0..6b62e3c 100644 Binary files a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/ProfileRequestFactoryDeobfuscatorBuilder.class and b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/ProfileRequestFactoryDeobfuscatorBuilder.class differ diff --git a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/SettingOptionRequestFactoryDeobfuscatorBuilder.class b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/SettingOptionRequestFactoryDeobfuscatorBuilder.class index 9a16265..40e25a3 100644 Binary files a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/SettingOptionRequestFactoryDeobfuscatorBuilder.class and b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/SettingOptionRequestFactoryDeobfuscatorBuilder.class differ diff --git a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/SubjectRequestFactoryDeobfuscatorBuilder.class b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/SubjectRequestFactoryDeobfuscatorBuilder.class index 229c6f2..cac93c6 100644 Binary files a/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/SubjectRequestFactoryDeobfuscatorBuilder.class and b/SIS/war/WEB-INF/classes/com/lemania/sis/shared/service/SubjectRequestFactoryDeobfuscatorBuilder.class differ diff --git a/SIS/war/WEB-INF/lib/appengine-api-1.0-sdk-1.9.25.jar b/SIS/war/WEB-INF/lib/appengine-api-1.0-sdk-1.9.30.jar similarity index 69% rename from SIS/war/WEB-INF/lib/appengine-api-1.0-sdk-1.9.25.jar rename to SIS/war/WEB-INF/lib/appengine-api-1.0-sdk-1.9.30.jar index 721460a..e53b59f 100644 Binary files a/SIS/war/WEB-INF/lib/appengine-api-1.0-sdk-1.9.25.jar and b/SIS/war/WEB-INF/lib/appengine-api-1.0-sdk-1.9.30.jar differ diff --git a/SIS/war/WEB-INF/lib/appengine-api-labs.jar b/SIS/war/WEB-INF/lib/appengine-api-labs.jar index 48066fe..71825c6 100644 Binary files a/SIS/war/WEB-INF/lib/appengine-api-labs.jar and b/SIS/war/WEB-INF/lib/appengine-api-labs.jar differ diff --git a/SIS/war/WEB-INF/lib/appengine-endpoints-deps.jar b/SIS/war/WEB-INF/lib/appengine-endpoints-deps.jar index 2612c0f..89b28b3 100644 Binary files a/SIS/war/WEB-INF/lib/appengine-endpoints-deps.jar and b/SIS/war/WEB-INF/lib/appengine-endpoints-deps.jar differ diff --git a/SIS/war/WEB-INF/lib/appengine-endpoints.jar b/SIS/war/WEB-INF/lib/appengine-endpoints.jar index 423d2c7..9da52cc 100644 Binary files a/SIS/war/WEB-INF/lib/appengine-endpoints.jar and b/SIS/war/WEB-INF/lib/appengine-endpoints.jar differ diff --git a/SIS/war/WEB-INF/lib/appengine-jsr107cache-1.9.25.jar b/SIS/war/WEB-INF/lib/appengine-jsr107cache-1.9.25.jar deleted file mode 100644 index a184d26..0000000 Binary files a/SIS/war/WEB-INF/lib/appengine-jsr107cache-1.9.25.jar and /dev/null differ diff --git a/SIS/war/WEB-INF/lib/appengine-jsr107cache-1.9.30.jar b/SIS/war/WEB-INF/lib/appengine-jsr107cache-1.9.30.jar new file mode 100644 index 0000000..ba36ba4 Binary files /dev/null and b/SIS/war/WEB-INF/lib/appengine-jsr107cache-1.9.30.jar differ diff --git a/SIS/war/sis/sis.nocache.js b/SIS/war/sis/sis.nocache.js index 51a652f..6b97ee2 100644 --- a/SIS/war/sis/sis.nocache.js +++ b/SIS/war/sis/sis.nocache.js @@ -1,27 +1,67 @@ -function sis(){var Q='bootstrap',R='begin',S='gwt.codesvr.sis=',T='gwt.codesvr=',U='sis',V='startup',W='DUMMY',X=0,Y=1,Z='iframe',$='javascript:""',_='position:absolute; width:0; height:0; border:none; left: -1000px;',ab=' top: -1000px;',bb='CSS1Compat',cb='',db='',eb='<\/head><\/body><\/html>',fb='undefined',gb='DOMContentLoaded',hb=50,ib='Chrome',jb='eval("',kb='");',lb='script',mb='javascript',nb='moduleStartup',ob='moduleRequested',pb='Failed to load ',qb='head',rb='meta',sb='name',tb='sis::',ub='::',vb='gwt:property',wb='content',xb='=',yb='gwt:onPropertyErrorFn',zb='Bad handler "',Ab='" for "gwt:onPropertyErrorFn"',Bb='gwt:onLoadErrorFn',Cb='" for "gwt:onLoadErrorFn"',Db='#',Eb='?',Fb='/',Gb='img',Hb='clear.cache.gif',Ib='baseUrl',Jb='sis.nocache.js',Kb='base',Lb='//',Mb='gxt.user.agent',Nb='chrome',Ob='opera',Pb='msie',Qb=10,Rb='ie10',Sb=9,Tb='ie9',Ub=8,Vb='ie8',Wb='msie 7',Xb='ie7',Yb='msie 6',Zb='ie6',$b='safari',_b='version/3',ac='safari3',bc='version/4',cc='safari4',dc='safari5',ec='gecko',fc='rv:1.8',gc='gecko1_8',hc='gecko1_9',ic='adobeair',jc='air',kc=2,lc=3,mc=4,nc=5,oc=6,pc=7,qc='locale',rc='default',sc='locale=',tc='&',uc='__gwt_Locale',vc='_',wc='Unexpected exception in locale detection, using default: ',xc='user.agent',yc='webkit',zc=11,Ac='user.agent.os',Bc='macintosh',Cc='mac os x',Dc='mac',Ec='linux',Fc='windows',Gc='win32',Hc='unknown',Ic='selectingPermutation',Jc='sis.devmode.js',Kc='fr',Lc='2AD1A758EE2BC826C2D0EB11B9112615',Mc=':1',Nc=':2',Oc=':3',Pc='34D8F7C7949752ACEFE37A9317194BF9',Qc='55524A42D801A7EBD0CA2983710430DB',Rc='6841B9DFE5AF0610BEC68EA23DB1EDD1',Sc='B1DDA4037DD41EE0A8131BA906B9830D',Tc='C97F88E0024B9FFCFAE5FE2CAD0ED762',Uc='D906365172BEE0B13E29BE52604C18AE',Vc=':4',Wc=':5',Xc=':6',Yc=':7',Zc='ECF11156DECCE1B6AC375D0B407D4E03',$c=':',_c='.cache.js',ad='link',bd='rel',cd='stylesheet',dd='href',ed='loadExternalRefs',fd='reset.css',gd='gwt/chrome/chrome.css',hd='end',jd='http:',kd='file:',ld='_gwt_dummy_',md='__gwtDevModeHook:sis',nd='Ignoring non-whitelisted Dev Mode URL: ',od=':moduleBase';var q=window;var r=document;t(Q,R);function s(){var a=q.location.search;return a.indexOf(S)!=-1||a.indexOf(T)!=-1} -function t(a,b){if(q.__gwtStatsEvent){q.__gwtStatsEvent({moduleName:U,sessionId:q.__gwtStatsSessionId,subSystem:V,evtGroup:a,millis:(new Date).getTime(),type:b})}} -sis.__sendStats=t;sis.__moduleName=U;sis.__errFn=null;sis.__moduleBase=W;sis.__softPermutationId=X;sis.__computePropValue=null;sis.__getPropMap=null;sis.__installRunAsyncCode=function(){};sis.__gwtStartLoadingFragment=function(){return null};sis.__gwt_isKnownPropertyValue=function(){return false};sis.__gwt_getMetaProperty=function(){return null};var u=null;var v=q.__gwt_activeModules=q.__gwt_activeModules||{};v[U]={moduleName:U};sis.__moduleStartupDone=function(e){var f=v[U].bindings;v[U].bindings=function(){var a=f?f():{};var b=e[sis.__softPermutationId];for(var c=X;c-1&&window.JSON){var h=e.createDocumentFragment();h.appendChild(e.createTextNode(jb));for(var i=X;i=X){continue}if(j==vb){k=i.getAttribute(wb);if(k){var l,m=k.indexOf(xb);if(m>=X){j=k.substring(X,m);l=k.substring(m+Y)}else{j=k;l=db}c[j]=l}}else if(j==yb){k=i.getAttribute(wb);if(k){try{d=eval(k)}catch(a){alert(zb+k+Ab)}}}else if(j==Bb){k=i.getAttribute(wb);if(k){try{e=eval(k)}catch(a){alert(zb+k+Cb)}}}}}__gwt_getMetaProperty=function(a){var b=c[a];return b==null?null:b};u=d;sis.__errFn=e} -function F(){function e(a){var b=a.lastIndexOf(Db);if(b==-1){b=a.length}var c=a.indexOf(Eb);if(c==-1){c=a.length}var d=a.lastIndexOf(Fb,Math.min(c,b));return d>=X?a.substring(X,d+Y):db} -function f(a){if(a.match(/^\w+:\/\//)){}else{var b=r.createElement(Gb);b.src=a+Hb;a=e(b.src)}return a} -function g(){var a=__gwt_getMetaProperty(Ib);if(a!=null){return a}return db} -function h(){var a=r.getElementsByTagName(lb);for(var b=X;bX){return a[a.length-Y].href}return db} -function j(){var a=r.location;return a.href==a.protocol+Lb+a.host+a.pathname+a.search+a.hash} -var k=g();if(k==db){k=h()}if(k==db){k=i()}if(k==db&&j()){k=e(r.location.href)}k=f(k);return k} -function G(a){if(a.match(/^\//)){return a}if(a.match(/^[a-zA-Z]+:\/\//)){return a}return sis.__moduleBase+a} -function H(){var i=[];var j=X;function k(a,b){var c=i;for(var d=X,e=a.length-Y;d=Qb)return Rb;if(r.documentMode>=Sb)return Tb;if(r.documentMode>=Ub)return Vb;if(a.indexOf(Wb)!=-1)return Xb;if(a.indexOf(Yb)!=-1)return Zb;return Rb}if(a.indexOf($b)!=-1){if(a.indexOf(_b)!=-1)return ac;if(a.indexOf(bc)!=-1)return cc;return dc}if(a.indexOf(ec)!=-1){if(a.indexOf(fc)!=-1)return gc;return hc}if(a.indexOf(ic)!=-1)return jc;return null};l[Mb]={air:X,chrome:Y,gecko1_8:kc,gecko1_9:lc,ie10:mc,ie8:nc,ie9:oc,safari3:pc,safari4:Ub,safari5:Sb};m[qc]=function(){var b=null;var c=rc;try{if(!b){var d=location.search;var e=d.indexOf(sc);if(e>=X){var f=d.substring(e+pc);var g=d.indexOf(tc,e);if(g=Qb&&b=Sb&&b=Ub&&b=zc}())return gc;return db};l[xc]={gecko1_8:X,ie10:Y,ie8:kc,ie9:lc,safari:mc};m[Ac]=function(){var a=q.navigator.userAgent.toLowerCase();if(a.indexOf(Bc)!=-1||a.indexOf(Cc)!=-1){return Dc}if(a.indexOf(Ec)!=-1){return Ec}if(a.indexOf(Fc)!=-1||a.indexOf(Gc)!=-1){return Fc}return Hc};l[Ac]={linux:X,mac:Y,unknown:kc,windows:lc};__gwt_isKnownPropertyValue=function(a,b){return b in l[a]};sis.__getPropMap=function(){var a={};for(var b in l){if(l.hasOwnProperty(b)){a[b]=n(b)}}return a};sis.__computePropValue=n;q.__gwt_activeModules[U].bindings=sis.__getPropMap;t(Q,Ic);if(s()){return G(Jc)}var o;try{k([hc,Kc,gc,Ec],Lc);k([hc,Kc,gc,Dc],Lc+Mc);k([hc,Kc,gc,Hc],Lc+Nc);k([hc,Kc,gc,Fc],Lc+Oc);k([Rb,Kc,Rb,Ec],Pc);k([Rb,Kc,Rb,Dc],Pc+Mc);k([Rb,Kc,Rb,Hc],Pc+Nc);k([Rb,Kc,Rb,Fc],Pc+Oc);k([Tb,Kc,Tb,Ec],Qc);k([Tb,Kc,Tb,Dc],Qc+Mc);k([Tb,Kc,Tb,Hc],Qc+Nc);k([Tb,Kc,Tb,Fc],Qc+Oc);k([Tb,rc,Tb,Ec],Rc);k([Tb,rc,Tb,Dc],Rc+Mc);k([Tb,rc,Tb,Hc],Rc+Nc);k([Tb,rc,Tb,Fc],Rc+Oc);k([Rb,rc,Rb,Ec],Sc);k([Rb,rc,Rb,Dc],Sc+Mc);k([Rb,rc,Rb,Hc],Sc+Nc);k([Rb,rc,Rb,Fc],Sc+Oc);k([hc,rc,gc,Ec],Tc);k([hc,rc,gc,Dc],Tc+Mc);k([hc,rc,gc,Hc],Tc+Nc);k([hc,rc,gc,Fc],Tc+Oc);k([Nb,Kc,$b,Ec],Uc);k([Nb,Kc,$b,Dc],Uc+Mc);k([Nb,Kc,$b,Hc],Uc+Nc);k([Nb,Kc,$b,Fc],Uc+Oc);k([dc,Kc,$b,Ec],Uc+Vc);k([dc,Kc,$b,Dc],Uc+Wc);k([dc,Kc,$b,Hc],Uc+Xc);k([dc,Kc,$b,Fc],Uc+Yc);k([Nb,rc,$b,Ec],Zc);k([Nb,rc,$b,Dc],Zc+Mc);k([Nb,rc,$b,Hc],Zc+Nc);k([Nb,rc,$b,Fc],Zc+Oc);k([dc,rc,$b,Ec],Zc+Vc);k([dc,rc,$b,Dc],Zc+Wc);k([dc,rc,$b,Hc],Zc+Xc);k([dc,rc,$b,Fc],Zc+Yc);o=i[n(Mb)][n(qc)][n(xc)][n(Ac)];var p=o.indexOf($c);if(p!=-1){j=parseInt(o.substring(p+Y),Qb);o=o.substring(X,p)}}catch(a){}sis.__softPermutationId=j;return G(o+_c)} -function I(){if(!q.__gwt_stylesLoaded){q.__gwt_stylesLoaded={}}function c(a){if(!__gwt_stylesLoaded[a]){var b=r.createElement(ad);b.setAttribute(bd,cd);b.setAttribute(dd,G(a));r.getElementsByTagName(qb)[X].appendChild(b);__gwt_stylesLoaded[a]=true}} -t(ed,R);c(fd);c(gd);t(ed,hd)} -D();sis.__moduleBase=F();v[U].moduleBase=sis.__moduleBase;var J=H();if(q){var K=!!(q.location.protocol==jd||q.location.protocol==kd);q.__gwt_activeModules[U].canRedirect=K;function L(){var b=ld;try{q.sessionStorage.setItem(b,b);q.sessionStorage.removeItem(b);return true}catch(a){return false}} -if(K&&L()){var M=md;var N=q.sessionStorage[M];if(!/^http:\/\/(localhost|127\.0\.0\.1)(:\d+)?\/.*$/.test(N)){if(N&&(window.console&&console.log)){console.log(nd+N)}N=db}if(N&&!q[M]){q[M]=true;q[M+od]=F();var O=r.createElement(lb);O.src=N;var P=r.getElementsByTagName(qb)[X];P.insertBefore(O,P.firstElementChild||P.children[X]);return false}}}I();t(Q,hd);C(J);return true} -sis.succeeded=sis(); \ No newline at end of file +/* + * Copyright 2014 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +/** + * This startup script is used when we run superdevmode from an app server. + */ +(function($wnd, $doc){ + // document.head does not exist in IE8 + var $head = $doc.head || $doc.getElementsByTagName('head')[0]; + // Compute some codeserver urls so as the user does not need bookmarklets + var hostName = $wnd.location.hostname; + var serverUrl = 'http://' + hostName + ':9876'; + var module = 'sis'; + var nocacheUrl = serverUrl + '/recompile-requester/' + module; + + // Insert the superdevmode nocache script in the first position of the head + var devModeScript = $doc.createElement('script'); + devModeScript.src = nocacheUrl; + + // Everybody except IE8 does fire an error event + // This means that we do not detect a non running SDM with IE8. + if (devModeScript.addEventListener) { + var callback = function() { + // Don't show the confirmation dialogue twice (multimodule) + if (!$wnd.__gwt__sdm__confirmed && + (!$wnd.__gwt_sdm__recompiler || !$wnd.__gwt_sdm__recompiler.loaded)) { + $wnd.__gwt__sdm__confirmed = true; + if ($wnd.confirm( + "Couldn't load " + module + " from Super Dev Mode\n" + + "server at " + serverUrl + ".\n" + + "Please make sure this server is ready.\n" + + "Do you want to try again?")) { + $wnd.location.reload(); + } + } + }; + devModeScript.addEventListener("error", callback, true); + } + + var injectScriptTag = function(){ + $head.insertBefore(devModeScript, $head.firstElementChild || $head.children[0]); + }; + + if (/loaded|complete/.test($doc.readyState)) { + injectScriptTag(); + } else { + //defer app script insertion until the body is ready + if($wnd.addEventListener){ + $wnd.addEventListener('load', injectScriptTag, false); + } else{ + $wnd.attachEvent('onload', injectScriptTag); + } + } +})(window, document);