Updates to use net proxy

Esri · Jan 21, 2015 · 990d8d3 · 990d8d3
1 parent 977b6c2
commit 990d8d3
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 172 deletions.
diff --git a/src/ArcGISSilverlightSDK/DataSources/KmlLayerSimple.xaml b/src/ArcGISSilverlightSDK/DataSources/KmlLayerSimple.xaml
@@ -9,7 +9,7 @@
                 Url="http://services.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer" />
 
             <esri:KmlLayer ID="KmlLayer" Url="http://maritimeboundaries.noaa.gov/downloads/USMaritimeLimitsAndBoundariesKML.kmz"                       
-                           ProxyUrl="http://servicesbeta3.esri.com/SilverlightDemos/ProxyPage/proxy.ashx" />
+                           ProxyUrl="http://serverapps102.esri.com/resourceproxy/net/proxy.ashx" />
         </esri:Map>
     </Grid>
 </UserControl>
diff --git a/src/ArcGISSilverlightSDK/DataSources/WmsLayerSimple.xaml b/src/ArcGISSilverlightSDK/DataSources/WmsLayerSimple.xaml
@@ -9,7 +9,7 @@
                 Url="http://services.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer" />
             <esri:WmsLayer ID="OtherWMSLayer"                      
                            Url="http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi"                     
-                           ProxyUrl="http://servicesbeta3.esri.com/SilverlightDemos/ProxyPage/proxy.ashx"                     
+                           ProxyUrl="http://serverapps102.esri.com/resourceproxy/net/proxy.ashx"                     
                            SkipGetCapabilities="False"                     
                            Layers="nexrad-n0r" 
                            Version="1.1.1" 

diff --git a/src/ArcGISSilverlightSDK/Geoprocessor/ClipFeatures.xaml.cs b/src/ArcGISSilverlightSDK/Geoprocessor/ClipFeatures.xaml.cs
@@ -49,7 +49,7 @@ private void MyDrawObject_DrawComplete(object sender, DrawEventArgs args)
       Geoprocessor geoprocessorTask = new Geoprocessor("http://serverapps10.esri.com/ArcGIS/rest/services/" +
           "SamplesNET/USA_Data_ClipTools/GPServer/ClipCounties");
 
-      //geoprocessorTask.ProxyURL = "http://servicesbeta3.esri.com/SilverlightDemos/ProxyPage/proxy.ashx";
+      //geoprocessorTask.ProxyURL = "http://serverapps102.esri.com/resourceproxy/net/proxy.ashx";
 
       geoprocessorTask.UpdateDelay = 5000;
       geoprocessorTask.JobCompleted += GeoprocessorTask_JobCompleted;

diff --git a/src/ArcGISSilverlightSDK/Map/DynamicAndTile.xaml b/src/ArcGISSilverlightSDK/Map/DynamicAndTile.xaml
@@ -6,10 +6,10 @@
 
         <esri:Map x:Name="MyMap"  WrapAround="True">
             <esri:ArcGISTiledMapServiceLayer ID="StreetMapLayer" 
-                Url="http://services.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer" 
+                Url="http://services.arcgisonline.com/arcgis/rest/services/World_Topo_Map/MapServer" 
                 InitializationFailed="Layer_InitializationFailed" />
             <esri:ArcGISDynamicMapServiceLayer ID="DynamicLayer" 
-                Url="http://sampleserver3.arcgisonline.com/ArcGIS/rest/services/Earthquakes/RecentEarthquakesRendered/MapServer"
+                Url="http://maps1.arcgisonline.com/ArcGIS/rest/services/USGS_Earthquake_Faults/MapServer"
                 InitializationFailed="Layer_InitializationFailed" />
         </esri:Map>
 

diff --git a/src/ArcGISSilverlightSDK/Toolkit/LegendKmlWms.xaml b/src/ArcGISSilverlightSDK/Toolkit/LegendKmlWms.xaml
@@ -8,11 +8,11 @@
             <esri:ArcGISTiledMapServiceLayer ID="TopoLayer"
                     Url="http://services.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer"/>
             <esri:WmsLayer ID="WMS" Url="http://imsref.cr.usgs.gov/wmsconnector/com.esri.wms.Esrimap/USGS_EDC_LandCover_NLCD2006"                     
-                           ProxyUrl="http://servicesbeta3.esri.com/SilverlightDemos/ProxyPage/proxy.ashx" />
+                           ProxyUrl="http://serverapps102.esri.com/resourceproxy/net/proxy.ashx" />
             <esri:KmlLayer ID="KML" Url="http://earthquake.usgs.gov/earthquakes/catalogs/eqs7day-depth.kmz"
                            VisibleLayers="Earthquakes,Earthquakes/*" 
                            RefreshInterval="00:01:00"
-                           ProxyUrl="http://servicesbeta3.esri.com/SilverlightDemos/ProxyPage/proxy.ashx" />
+                           ProxyUrl="http://serverapps102.esri.com/resourceproxy/net/proxy.ashx" />
         </esri:Map>
 
         <esri:MapProgressBar x:Name="MyProgressBar" 

diff --git a/src/ArcGISSilverlightSDK/WebMaps/LoadWebMapWithProxy.xaml.cs b/src/ArcGISSilverlightSDK/WebMaps/LoadWebMapWithProxy.xaml.cs
@@ -12,7 +12,7 @@ public LoadWebMapWithProxy()
             InitializeComponent();
 
             Document webMap = new Document();
-            webMap.ProxyUrl = "http://servicesbeta3.esri.com/SilverlightDemos/ProxyPage/proxy.ashx";
+            webMap.ProxyUrl = "http://serverapps102.esri.com/resourceproxy/net/proxy.ashx";
             webMap.GetMapCompleted += webMap_GetMapCompleted;
 
             webMap.GetMapAsync("07cbed6b51474885b420cd5ed4c3e082");

diff --git a/src/ArcGISSilverlightSDK/WebMaps/WebMapKML.xaml.cs b/src/ArcGISSilverlightSDK/WebMaps/WebMapKML.xaml.cs
@@ -16,7 +16,7 @@ public WebMapKML()
 
             Document webMap = new Document();
             webMap.GetMapCompleted += webMap_GetMapCompleted;
-            webMap.ProxyUrl = "http://servicesbeta3.esri.com/SilverlightDemos/ProxyPage/proxy.ashx";
+            webMap.ProxyUrl = "http://serverapps102.esri.com/resourceproxy/net/proxy.ashx";
             webMap.GetMapAsync("d2cb7cac8b1947c7b57ed8edd6b045bb");
         }
 

diff --git a/src/ArcGISSilverlightSDK/WebMaps/WebMapWMS.xaml.cs b/src/ArcGISSilverlightSDK/WebMaps/WebMapWMS.xaml.cs
@@ -11,7 +11,7 @@ public WebMapWMS()
 
             Document webMap = new Document();
             webMap.GetMapCompleted += webMap_GetMapCompleted;
-            webMap.ProxyUrl = "http://servicesbeta3.esri.com/SilverlightDemos/ProxyPage/proxy.ashx";
+            webMap.ProxyUrl = "http://serverapps102.esri.com/resourceproxy/net/proxy.ashx";
             webMap.GetMapAsync("b3e11e1d7aac4d6a98fde6b864d3a2b7");
         }
 

diff --git a/src/ArcGISSilverlightSDKWeb/Assets/SDKConfig.xml b/src/ArcGISSilverlightSDKWeb/Assets/SDKConfig.xml
@@ -1,111 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ArcGISSilverlightSDK>
-  <Category>
-    <name>What's New</name>
-    <icon>Assets/images/globe-16x16.png</icon>
-    <items>
-      <item>
-        <id>Query with a Buffer - Task Async</id>
-        <xaml>ArcGISSilverlightSDK.BufferQueryTaskAsync</xaml>
-        <source>Assets/Source/BufferQueryTaskAsync.xaml</source>
-        <code>Assets/Source/BufferQueryTaskAsync.xaml.cs.txt</code>
-        <codevb>Assets/Source/BufferQueryTaskAsync.xaml.vb.txt</codevb>
-        <desc>Assets/Description/BufferQueryTaskAsync.txt</desc>
-        <icon>Assets/images/small_bullet.png</icon>
-        <keywords>Buffer,Query,Task,Async</keywords>
-      </item>
-      <item>
-        <id>Driving Directions - Task Async</id>
-        <xaml>ArcGISSilverlightSDK.RoutingDirectionsTaskAsync</xaml>
-        <source>Assets/Source/RoutingDirectionsTaskAsync.xaml</source>
-        <code>Assets/Source/RoutingDirectionsTaskAsync.xaml.cs.txt</code>
-        <codevb>Assets/Source/RoutingDirectionsTaskAsync.xaml.vb.txt</codevb>
-        <desc>Assets/Description/RoutingDirectionsTaskAsync.txt</desc>
-        <icon>Assets/images/small_bullet.png</icon>
-        <keywords>Route,Locator,Geocode,Task,Async</keywords>
-      </item>
-      <item>
-        <id>Intersect - Task Async</id>
-        <xaml>ArcGISSilverlightSDK.IntersectTaskAsync</xaml>
-        <source>Assets/Source/IntersectTaskAsync.xaml</source>
-        <code>Assets/Source/IntersectTaskAsync.xaml.cs.txt</code>
-        <codevb>Assets/Source/IntersectTaskAsync.xaml.vb.txt</codevb>
-        <desc>Assets/Description/IntersectTaskAsync.txt</desc>
-        <icon>Assets/images/small_bullet.png</icon>
-        <keywords>Intersect,Simplify,Query,Task,Async</keywords>
-      </item>
-      <item>
-        <id>WebMapViewModel - MVVM</id>
-        <xaml>ArcGISSilverlightSDK.WebMapViewModelToMapMVVM</xaml>
-        <source>Assets/Source/WebMapViewModelToMapMVVM.xaml</source>
-        <code>Assets/Source/WebMapViewModelToMapMVVM.xaml.cs.txt</code>
-        <codevb>Assets/Source/WebMapViewModelToMapMVVM.xaml.vb.txt</codevb>
-        <desc>Assets/Description/WebMapViewModelToMapMVVM.txt</desc>
-        <icon>Assets/images/small_bullet.png</icon>
-        <keywords>WebMap,MVVM</keywords>
-      </item>
-      <item>
-        <id>WebTiledLayer</id>
-        <xaml>ArcGISSilverlightSDK.WebTiledLayers</xaml>
-        <source>Assets/Source/WebTiledLayers.xaml</source>
-        <code>Assets/Source/WebTiledLayers.xaml.cs.txt</code>
-        <codevb>Assets/Source/WebTiledLayers.xaml.vb.txt</codevb>
-        <desc>Assets/Description/WebTiledLayers.txt</desc>
-        <icon>Assets/images/small_bullet.png</icon>
-        <keywords>WebTiledLayer</keywords>
-      </item>
-      <item>
-        <id>Dynamic Layer Labeling</id>
-        <xaml>ArcGISSilverlightSDK.DynamicLayerLabeling</xaml>
-        <source>Assets/Source/DynamicLayerLabeling.xaml</source>
-        <code>Assets/Source/DynamicLayerLabeling.xaml.cs.txt</code>
-        <codevb>Assets/Source/DynamicLayerLabeling.xaml.vb.txt</codevb>
-        <desc>Assets/Description/DynamicLayerLabeling.txt</desc>
-        <icon>Assets/images/small_bullet.png</icon>
-        <keywords>Dynamic,Layer,Label</keywords>
-      </item>
-      <item>
-        <id>Renderer Rotation</id>
-        <xaml>ArcGISSilverlightSDK.RendererRotation</xaml>
-        <source>Assets/Source/RendererRotation.xaml</source>
-        <code>Assets/Source/RendererRotation.xaml.cs.txt</code>
-        <codevb>Assets/Source/RendererRotation.xaml.vb.txt</codevb>
-        <desc>Assets/Description/RendererRotation.txt</desc>
-        <icon>Assets/images/small_bullet.png</icon>
-        <keywords>Renderer,Rotation,Angle</keywords>
-      </item>
-      <item>
-        <id>Marker Symbol Angle</id>
-        <xaml>ArcGISSilverlightSDK.MarkerSymbolAngle</xaml>
-        <source>Assets/Source/MarkerSymbolAngle.xaml</source>
-        <code>Assets/Source/MarkerSymbolAngle.xaml.cs.txt</code>
-        <codevb>Assets/Source/MarkerSymbolAngle.xaml.vb.txt</codevb>
-        <desc>Assets/Description/MarkerSymbolAngle.txt</desc>
-        <icon>Assets/images/small_bullet.png</icon>
-        <keywords>MarkerSymbol,Angle</keywords>
-      </item>      
-      <item>
-        <id>Elevation Profile</id>
-        <xaml>ArcGISSilverlightSDK.ElevationProfile</xaml>
-        <source>Assets/Source/ElevationProfile.xaml</source>
-        <code>Assets/Source/ElevationProfile.xaml.cs.txt</code>
-        <codevb>Assets/Source/ElevationProfile.xaml.vb.txt</codevb>
-        <desc>Assets/Description/ElevationProfile.txt</desc>
-        <icon>Assets/images/small_bullet.png</icon>
-        <keywords>GP,Elevation,Task,Async,Chart</keywords>
-      </item>
-      <item>
-        <id>Web Request Filtering</id>
-        <xaml>ArcGISSilverlightSDK.WebRequestFiltering</xaml>
-        <source>Assets/Source/WebRequestFiltering.xaml</source>
-        <code>Assets/Source/WebRequestFiltering.xaml.cs.txt</code>
-        <codevb>Assets/Source/WebRequestFiltering.xaml.vb.txt</codevb>
-        <desc>Assets/Description/WebRequestFiltering.txt</desc>
-        <icon>Assets/images/small_bullet.png</icon>
-        <keywords>WebRequest,RegisterPrefix</keywords>
-      </item>
-    </items>
-  </Category>
   <Category>
     <name>Mapping</name>
     <icon>Assets/images/globe-16x16.png</icon>

diff --git a/src/ArcGISSilverlightSDKWeb/Assets/SDKConfig_VS2010.xml b/src/ArcGISSilverlightSDKWeb/Assets/SDKConfig_VS2010.xml
@@ -1,61 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ArcGISSilverlightSDK>
-  <Category>
-    <name>What's New</name>
-    <icon>Assets/images/globe-16x16.png</icon>
-    <items>
-      <item>
-        <id>WebTiledLayer</id>
-        <xaml>ArcGISSilverlightSDK.WebTiledLayers</xaml>
-        <source>Assets/Source/WebTiledLayers.xaml</source>
-        <code>Assets/Source/WebTiledLayers.xaml.cs.txt</code>
-        <codevb>Assets/Source/WebTiledLayers.xaml.vb.txt</codevb>
-        <desc>Assets/Description/WebTiledLayers.txt</desc>
-        <icon>Assets/images/small_bullet.png</icon>
-        <keywords>WebTiledLayer</keywords>
-      </item>
-      <item>
-        <id>Dynamic Layer Labeling</id>
-        <xaml>ArcGISSilverlightSDK.DynamicLayerLabeling</xaml>
-        <source>Assets/Source/DynamicLayerLabeling.xaml</source>
-        <code>Assets/Source/DynamicLayerLabeling.xaml.cs.txt</code>
-        <codevb>Assets/Source/DynamicLayerLabeling.xaml.vb.txt</codevb>
-        <desc>Assets/Description/DynamicLayerLabeling.txt</desc>
-        <icon>Assets/images/small_bullet.png</icon>
-        <keywords>Dynamic,Layer,Label</keywords>
-      </item>
-      <item>
-        <id>Renderer Rotation</id>
-        <xaml>ArcGISSilverlightSDK.RendererRotation</xaml>
-        <source>Assets/Source/RendererRotation.xaml</source>
-        <code>Assets/Source/RendererRotation.xaml.cs.txt</code>
-        <codevb>Assets/Source/RendererRotation.xaml.vb.txt</codevb>
-        <desc>Assets/Description/RendererRotation.txt</desc>
-        <icon>Assets/images/small_bullet.png</icon>
-        <keywords>Renderer,Rotation,Angle</keywords>
-      </item>
-      <item>
-        <id>Marker Symbol Angle</id>
-        <xaml>ArcGISSilverlightSDK.MarkerSymbolAngle</xaml>
-        <source>Assets/Source/MarkerSymbolAngle.xaml</source>
-        <code>Assets/Source/MarkerSymbolAngle.xaml.cs.txt</code>
-        <codevb>Assets/Source/MarkerSymbolAngle.xaml.vb.txt</codevb>
-        <desc>Assets/Description/MarkerSymbolAngle.txt</desc>
-        <icon>Assets/images/small_bullet.png</icon>
-        <keywords>MarkerSymbol,Angle</keywords>
-      </item>
-      <item>
-        <id>Web Request Filtering</id>
-        <xaml>ArcGISSilverlightSDK.WebRequestFiltering</xaml>
-        <source>Assets/Source/WebRequestFiltering.xaml</source>
-        <code>Assets/Source/WebRequestFiltering.xaml.cs.txt</code>
-        <codevb>Assets/Source/WebRequestFiltering.xaml.vb.txt</codevb>
-        <desc>Assets/Description/WebRequestFiltering.txt</desc>
-        <icon>Assets/images/small_bullet.png</icon>
-        <keywords>WebRequest,RegisterPrefix</keywords>
-      </item>
-    </items>
-  </Category>
   <Category>
     <name>Mapping</name>
     <icon>Assets/images/globe-16x16.png</icon>