Author: sergeyhalipov Date: 2007-10-30 13:39:47 -0400 (Tue, 30 Oct 2007) New Revision: 3624 Modified: branches/3.1.x/ui/virtualEarth/src/main/config/component/virtualEarth.xml branches/3.1.x/ui/virtualEarth/src/main/templates/virtualEarth.jspx branches/3.1.x/ui/virtualEarth/src/test/java/org/richfaces/component/VirtualEarthComponentTest.java Log: http://jira.jboss.com/jira/browse/RF-1264 Modified: branches/3.1.x/ui/virtualEarth/src/main/config/component/virtualEarth.xml =================================================================== --- branches/3.1.x/ui/virtualEarth/src/main/config/component/virtualEarth.xml 2007-10-30 17:33:21 UTC (rev 3623) +++ branches/3.1.x/ui/virtualEarth/src/main/config/component/virtualEarth.xml 2007-10-30 17:39:47 UTC (rev 3624) @@ -85,5 +85,13 @@ </description> <defaultvalue>"Normal"</defaultvalue> </property> + <property> + <name>version</name> + <classname>java.lang.String</classname> + <description> + Virtual earth version, default - "6" + </description> + <defaultvalue>"6"</defaultvalue> + </property> </component> </components> Modified: branches/3.1.x/ui/virtualEarth/src/main/templates/virtualEarth.jspx =================================================================== --- branches/3.1.x/ui/virtualEarth/src/main/templates/virtualEarth.jspx 2007-10-30 17:33:21 UTC (rev 3623) +++ branches/3.1.x/ui/virtualEarth/src/main/templates/virtualEarth.jspx 2007-10-30 17:39:47 UTC (rev 3624) @@ -25,7 +25,7 @@ <div id="#{clientId}" style="position:relative; width:400px; height:400px;#{style}" class="dr-ve rich-virtualEarth #{component.attributes['styleClass']}" x:passThruWithExclusions="id, styleClass,style,class" -<script type="text/javascript" src="http://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=5" /> +<script type="text/javascript" src="http://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=#{comp... /> <script type="text/javascript"> //<![CDATA[ Modified: branches/3.1.x/ui/virtualEarth/src/test/java/org/richfaces/component/VirtualEarthComponentTest.java =================================================================== --- branches/3.1.x/ui/virtualEarth/src/test/java/org/richfaces/component/VirtualEarthComponentTest.java 2007-10-30 17:33:21 UTC (rev 3623) +++ branches/3.1.x/ui/virtualEarth/src/test/java/org/richfaces/component/VirtualEarthComponentTest.java 2007-10-30 17:39:47 UTC (rev 3624) @@ -51,7 +51,7 @@ javaScripts.add("org.ajax4jsf.javascript.PrototypeScript"); javaScripts.add("org.ajax4jsf.javascript.AjaxScript"); javaScripts.add("script/virtualEarth.js"); - javaScripts.add("http://dev.virtualearth.net/mapcontrol/mapcontrol.a...; + javaScripts.add("http://dev.virtualearth.net/mapcontrol/mapcontrol.a...; } /**