Author: kono
Date: 2012-10-09 11:29:17 -0700 (Tue, 09 Oct 2012)
New Revision: 30635
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/net/WebQuerier.java
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallFromStorePanel.java
Log:
Default app store is set to the production site.
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
2012-10-09 17:28:09 UTC (rev 30634)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
2012-10-09 18:29:17 UTC (rev 30635)
@@ -384,7 +384,7 @@
// also able to install an app when told by the app store
final AppGetResponder appGetResponder = new
AppGetResponder(appManager);
final CyHttpd httpd = (new CyHttpdFactoryImpl()).createHttpd(new
LocalhostServerSocketFactory(2607));
- httpd.addBeforeResponse(new
ScreenOriginsBeforeResponse("http://apps.cytoscape.org";,
"http://apps3.nrnb.org";));
+ httpd.addBeforeResponse(new
ScreenOriginsBeforeResponse(WebQuerier.DEFAULT_APP_STORE_URL));
httpd.addBeforeResponse(new
OriginOptionsBeforeResponse("x-csrftoken"));
httpd.addAfterResponse(new
AddAccessControlAllowOriginHeaderAfterResponse());
httpd.addResponder(appGetResponder.new StatusResponder());
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/net/WebQuerier.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/net/WebQuerier.java
2012-10-09 17:28:09 UTC (rev 30634)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/net/WebQuerier.java
2012-10-09 18:29:17 UTC (rev 30635)
@@ -18,10 +18,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TreeSet;
-import javax.swing.ImageIcon;
-
import org.apache.commons.io.IOUtils;
import org.cytoscape.app.internal.exception.AppDownloadException;
import org.cytoscape.app.internal.manager.App;
@@ -29,7 +26,6 @@
import org.cytoscape.app.internal.manager.AppParser;
import org.cytoscape.app.internal.manager.AppParser.ChecksumException;
import org.cytoscape.app.internal.net.WebApp.Release;
-import org.cytoscape.app.internal.net.WebQuerier.AppTag;
import org.cytoscape.app.internal.ui.downloadsites.DownloadSite;
import org.cytoscape.app.internal.util.DebugHelper;
import org.cytoscape.io.util.StreamUtil;
@@ -47,23 +43,18 @@
public static final List<DownloadSite> DEFAULT_DOWNLOAD_SITES = new
LinkedList<DownloadSite>();
+ public static final String DEFAULT_APP_STORE_URL =
"http://apps.cytoscape.org/";;
+
+ private static final String REQUEST_JSON_HEADER_KEY =
"X-Requested-With";
+ private static final String REQUEST_JSON_HEADER_VALUE =
"XMLHttpRequest";
+
static {
DownloadSite site = new DownloadSite();
- site.setSiteName("Cytoscape App Store Beta");
- site.setSiteUrl("http://apps3.nrnb.org/";);
- DEFAULT_DOWNLOAD_SITES.add(site);
-
- site = new DownloadSite();
site.setSiteName("Cytoscape App Store");
- site.setSiteUrl("http://apps.cytoscape.org/";);
+ site.setSiteUrl(DEFAULT_APP_STORE_URL);
DEFAULT_DOWNLOAD_SITES.add(site);
}
- private static final String DEFAULT_APP_STORE_URL =
"http://apps3.nrnb.org/";;
-
- private static final String REQUEST_JSON_HEADER_KEY =
"X-Requested-With";
- private static final String REQUEST_JSON_HEADER_VALUE =
"XMLHttpRequest";
-
/**
* A regular expression for version lists that are compatible with the
current version of Cytoscape.
*/
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallFromStorePanel.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallFromStorePanel.java
2012-10-09 17:28:09 UTC (rev 30634)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallFromStorePanel.java
2012-10-09 18:29:17 UTC (rev 30635)
@@ -303,7 +303,7 @@
downloadSiteLabel.setText("Download Site:");
- downloadSiteComboBox.setModel(new javax.swing.DefaultComboBoxModel(new
String[] { "http://apps3.nrnb.org/";, "http://apps.cytoscape.org/"; }));
+ downloadSiteComboBox.setModel(new javax.swing.DefaultComboBoxModel(new
String[] { WebQuerier.DEFAULT_APP_STORE_URL }));
downloadSiteComboBox.addItemListener(new java.awt.event.ItemListener()
{
public void itemStateChanged(java.awt.event.ItemEvent evt) {
downloadSiteComboBoxItemStateChanged(evt);
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
