IDEA-134855 (base update checker URLs use HTTP scheme; -S layer regul…

…ated by setting)
pklos · Dec 29, 2014 · ed37083 · ed37083
1 parent 664a5df
commit ed37083
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 18 deletions.
diff --git a/community-resources/src/idea/IdeaApplicationInfo.xml b/community-resources/src/idea/IdeaApplicationInfo.xml
@@ -13,22 +13,21 @@
                   caption-url="/welcomeCaption_community.png"
                   slogan-url="/developSlogan_community.png"/>
 
-  <third-party url="https://www.jetbrains.org/"/>
-
   <editor background-url="/idea_logo_welcome.png"/>
 
-  <update-urls check="https://www.jetbrains.com/updates/updates.xml"
-               patches="https://download.jetbrains.com/idea/"/>
+  <plugins url="http://plugins.jetbrains.com/"/>
+  <update-urls check="http://www.jetbrains.com/updates/updates.xml"
+               patches="http://download.jetbrains.com/idea/"/>
 
   <help file="ideahelp.jar" root="idea"/>
   <documentation url="https://www.jetbrains.com/idea/documentation"/>
   <support url="https://www.jetbrains.com/support/idea/index.html"/>
   <feedback eap-url="https://youtrack.jetbrains.com/newissue?project=IDEA&amp;clearDraft=true&amp;c=Affected+versions+$BUILD&amp;description=$DESCR"
             release-url="https://www.jetbrains.com/feedback/feedback.jsp?product=IDEA&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"/>
-  <plugins url="https://plugins.jetbrains.com"/>
   <whatsnew url="https://www.jetbrains.com/idea/whatsnew/index.html"/>
   <keymap win="https://www.jetbrains.com/idea/docs/IntelliJIDEA_ReferenceCard.pdf"
           mac="https://www.jetbrains.com/idea/docs/IntelliJIDEA_ReferenceCard_Mac.pdf"/>
+  <third-party url="https://www.jetbrains.org/"/>
 
   <plugins-page category="VCS Integration" title="Select VCS Integration Plugins"/>
   <plugins-page title="Select Other Plugins"/>

diff --git a/platform/platform-resources/src/idea/PlatformApplicationInfo.xml b/platform/platform-resources/src/idea/PlatformApplicationInfo.xml
@@ -11,6 +11,6 @@
                   caption-url="/general/welcomeCaption.png" 
                   slogan-url="/general/developSlogan.png"/>
 
-  <update-urls check="https://www.jetbrains.com/updates/update.xml" download="https://www.jetbrains.com/idea/download/"/>
-  <eap-update-urls check="https://www.jetbrains.com/updates/eap-update.xml" download="http://www.intellij.net/eap/products/idea/download.jsp"/>
+  <update-urls check="http://www.jetbrains.com/updates/update.xml"
+               download="http://www.jetbrains.com/idea/download/"/>
 </component>
diff --git a/platform/platform-resources/src/idea/PlatformLangXmlApplicationInfo.xml b/platform/platform-resources/src/idea/PlatformLangXmlApplicationInfo.xml
@@ -12,13 +12,15 @@
                   caption-url="/welcomeCaption_community.png" 
                   slogan-url="/developSlogan_community.png"/>
 
-  <update-urls check="https://www.jetbrains.com/updates/updates.xml"
+  <plugins url="http://plugins.jetbrains.com/"/>
+  <update-urls check="http://www.jetbrains.com/updates/updates.xml"
                patches="http://download.jetbrains.com/idea/"/>
+
   <help file="ideahelp.jar" root="idea"/>
   <documentation url="https://www.jetbrains.com/idea/documentation"/>
   <support url="https://www.jetbrains.com/support/idea/index.html"/>
-  <feedback eap-url="http://youtrack.jetbrains.com" release-url="https://www.jetbrains.com/feedback/feedback.jsp?product=IDEA&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"/>
-  <plugins url="https://plugins.jetbrains.com/"/>
+  <feedback eap-url="http://youtrack.jetbrains.com"
+            release-url="https://www.jetbrains.com/feedback/feedback.jsp?product=IDEA&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"/>
   <whatsnew url="https://www.jetbrains.com/idea/whatsnew/index.html"/>
   <keymap win="https://www.jetbrains.com/idea/docs/IntelliJIDEA9_ReferenceCard.pdf"
           mac="https://www.jetbrains.com/idea/docs/IntelliJIDEA9_ReferenceCard_Mac.pdf"/>

diff --git a/python/edu/resources/idea/PyCharmEduApplicationInfo.xml b/python/edu/resources/idea/PyCharmEduApplicationInfo.xml
@@ -11,13 +11,12 @@
 
   <welcome-screen logo-url="/PyCharmCoreWelcomeScreen.png" caption-url="PyCharmCoreWelcomeCaption.png" slogan-url="/developSlogan.png"/>
 
-  <third-party url="https://confluence.jetbrains.com/display/PYH/Third-Party+Software+Used+by+PyCharm"/>
-
-  <update-urls logo-url="/Logo_welcomeScreen.png"
-               check="https://www.jetbrains.com/updates/updates.xml"
+  <plugins url="http://plugins.jetbrains.com/"/>
+  <update-urls check="http://www.jetbrains.com/updates/updates.xml"
                patches="http://download.jetbrains.com/python/"/>
 
   <feedback eap-url="https://www.jetbrains.com/feedback/feedback.jsp?product=PyCharm&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"
             release-url="https://www.jetbrains.com/feedback/feedback.jsp?product=PyCharm&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"/>
   <help file="pycharm-eduhelp.jar" root="pycharm-edu"/>
+  <third-party url="https://confluence.jetbrains.com/display/PYH/Third-Party+Software+Used+by+PyCharm"/>
 </component>
diff --git a/python/resources/idea/PyCharmCoreApplicationInfo.xml b/python/resources/idea/PyCharmCoreApplicationInfo.xml
@@ -11,13 +11,12 @@
 
   <welcome-screen logo-url="/PyCharmCoreWelcomeScreen.png" caption-url="PyCharmCoreWelcomeCaption.png" slogan-url="/developSlogan.png"/>
 
-  <third-party url="https://confluence.jetbrains.com/display/PYH/Third-Party+Software+Used+by+PyCharm"/>
-
-  <update-urls logo-url="/Logo_welcomeScreen.png"
-               check="https://www.jetbrains.com/updates/updates.xml"
+  <plugins url="http://plugins.jetbrains.com/"/>
+  <update-urls check="http://www.jetbrains.com/updates/updates.xml"
                patches="http://download.jetbrains.com/python/"/>
 
   <feedback eap-url="https://www.jetbrains.com/feedback/feedback.jsp?product=PyCharm&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"
             release-url="https://www.jetbrains.com/feedback/feedback.jsp?product=PyCharm&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"/>
   <help file="pycharmhelp.jar" root="pycharm"/>
+  <third-party url="https://confluence.jetbrains.com/display/PYH/Third-Party+Software+Used+by+PyCharm"/>
 </component>