incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [24/46] wp7 commit: removed dupes, and point to new loc of existing source files
Date Sat, 14 Jul 2012 00:24:42 GMT
removed dupes, and point to new loc of existing source files


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/commit/d5d335dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/tree/d5d335dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/diff/d5d335dc

Branch: refs/heads/master
Commit: d5d335dcde7d6a90fe41ca75818e45feb49412d3
Parents: d00266b
Author: Jesse <purplecabbage@gmail.com>
Authored: Wed Jul 11 18:04:39 2012 -0700
Committer: Jesse <purplecabbage@gmail.com>
Committed: Wed Jul 11 18:04:39 2012 -0700

----------------------------------------------------------------------
 framework/CordovaView.xaml              |   65 ----
 framework/CordovaView.xaml.cs           |  451 --------------------------
 framework/WP7CordovaClassLib.csproj     |  220 +++++++++-----
 framework/WP7CordovaClassLib.sln        |    6 -
 framework/WP7CordovaClassLibBare.csproj |   35 +--
 5 files changed, 148 insertions(+), 629 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/d5d335dc/framework/CordovaView.xaml
----------------------------------------------------------------------
diff --git a/framework/CordovaView.xaml b/framework/CordovaView.xaml
deleted file mode 100644
index 9ff9da5..0000000
--- a/framework/CordovaView.xaml
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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.  
--->
-<UserControl x:Class="WP7CordovaClassLib.CordovaView"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    FontFamily="{StaticResource PhoneFontFamilyNormal}"
-    FontSize="{StaticResource PhoneFontSizeNormal}"
-    Foreground="{StaticResource PhoneForegroundBrush}"
-    d:DesignHeight="480" d:DesignWidth="480" 
-    xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone">
-    
-    <Grid x:Name="LayoutRoot" Background="Transparent">
-        
-        <phone:WebBrowser x:Name="CordovaBrowser" 
-                          Opacity="0"
-                          HorizontalAlignment="Stretch"  
-                          VerticalAlignment="Stretch" 
-                          IsScriptEnabled="True" 
-                          Foreground="White"
-                          Background="Black"
-                          Navigated="GapBrowser_Navigated" 
-                          Loaded="GapBrowser_Loaded" 
-                          Unloaded="GapBrowser_Unloaded" 
-                          ScriptNotify="GapBrowser_ScriptNotify" 
-                          LoadCompleted="GapBrowser_LoadCompleted" 
-                          Navigating="GapBrowser_Navigating" 
-                          NavigationFailed="GapBrowser_NavigationFailed" 
-                          IsGeolocationEnabled="True">
-            <phone:WebBrowser.Projection>
-                <PlaneProjection x:Name="BrowserProjector" CenterOfRotationX="0" RotationY="-180"/>
-            </phone:WebBrowser.Projection>
-            <phone:WebBrowser.Resources>
-                <Storyboard x:Name="RotateIn" BeginTime="0:0:0.5">
-                    <DoubleAnimation
-                        Storyboard.TargetName="BrowserProjector"
-                        Storyboard.TargetProperty="RotationY"
-                        To="0" Duration="0:0:0.6"/>
-                </Storyboard>
-            </phone:WebBrowser.Resources>
-
-        </phone:WebBrowser>
-        
-    </Grid>
-</UserControl>
-
-    

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/d5d335dc/framework/CordovaView.xaml.cs
----------------------------------------------------------------------
diff --git a/framework/CordovaView.xaml.cs b/framework/CordovaView.xaml.cs
deleted file mode 100644
index 8a14362..0000000
--- a/framework/CordovaView.xaml.cs
+++ /dev/null
@@ -1,451 +0,0 @@
-/*  
-	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.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Shapes;
-using Microsoft.Phone.Controls;
-using System.IO.IsolatedStorage;
-using System.Windows.Resources;
-using System.Windows.Interop;
-using System.Runtime.Serialization.Json;
-using System.IO;
-using System.ComponentModel;
-using System.Xml.Linq;
-using WP7CordovaClassLib.Cordova.Commands;
-using System.Diagnostics;
-using System.Text;
-using WP7CordovaClassLib.Cordova;
-using System.Threading;
-using Microsoft.Phone.Shell;
-
-
-
-namespace WP7CordovaClassLib
-{
-    public partial class CordovaView : UserControl
-    {
-       
-        /// <summary>
-        /// Indicates whether web control has been loaded and no additional initialization
is needed.
-        /// Prevents data clearing during page transitions.
-        /// </summary>
-        private bool IsBrowserInitialized = false;
-        
-        /// <summary>
-        /// Set when the user attaches a back button handler inside the WebBrowser
-        /// </summary>
-        private bool OverrideBackButton = false;
-
-        /// <summary>
-        /// Sentinal to keep track of page changes as a result of the hardware back button
-        /// Set to false when the back-button is pressed, which calls js window.history.back()
-        /// If the page changes as a result of the back button the event is cancelled.
-        /// </summary>
-        private bool PageDidChange = false;
-
-        private static string AppRoot = "/app/";
-
-
-        /// <summary>
-        /// Handles native api calls
-        /// </summary>
-        private NativeExecution nativeExecution;
-
-        protected BrowserMouseHelper bmHelper;
-
-        protected DOMStorageHelper domStorageHelper;
-        protected OrientationHelper orientationHelper;
-
-        public System.Windows.Controls.Grid _LayoutRoot
-        {
-            get
-            {
-                return ((System.Windows.Controls.Grid)(this.FindName("LayoutRoot")));
-            }
-        }
-
-        public WebBrowser Browser
-        {
-            get
-            {
-                return CordovaBrowser;
-            }
-        }
-
-        /*
-         * Setting StartPageUri only has an effect if called before the view is loaded.
-         **/
-        protected Uri _startPageUri = null;
-        public Uri StartPageUri
-        {
-            get
-            {
-                if (_startPageUri == null)
-                {
-                    // default
-                    return new Uri( AppRoot + "www/index.html", UriKind.Relative);      
             
-                }
-                else
-                {
-                    return _startPageUri;
-                }
-            }
-            set
-            {
-                if (!this.IsBrowserInitialized)
-                {
-                    _startPageUri = value;
-                }
-            }
-        }
-
-        public CordovaView()
-        {
-            
-            InitializeComponent();
-
-            if (DesignerProperties.IsInDesignTool)
-            {
-                return;
-            }
-
-
-            StartupMode mode = PhoneApplicationService.Current.StartupMode;
-
-            if (mode == StartupMode.Launch)
-            {
-                PhoneApplicationService service = PhoneApplicationService.Current;
-                service.Activated += new EventHandler<Microsoft.Phone.Shell.ActivatedEventArgs>(AppActivated);
-                service.Launching += new EventHandler<LaunchingEventArgs>(AppLaunching);
-                service.Deactivated += new EventHandler<DeactivatedEventArgs>(AppDeactivated);
-                service.Closing += new EventHandler<ClosingEventArgs>(AppClosing);
-            }
-            else
-            {
-
-            }
-
-            // initializes native execution logic
-            this.nativeExecution = new NativeExecution(ref this.CordovaBrowser);
-            this.bmHelper = new BrowserMouseHelper(ref this.CordovaBrowser);
-        }
-
-        
-
-        void AppClosing(object sender, ClosingEventArgs e)
-        {
-            Debug.WriteLine("AppClosing");
-        }
-
-        void AppDeactivated(object sender, DeactivatedEventArgs e)
-        {
-            Debug.WriteLine("INFO: AppDeactivated");
-
-            try
-            {
-                CordovaBrowser.InvokeScript("CordovaCommandResult", new string[] { "pause"
});
-            }
-            catch (Exception)
-            {
-                Debug.WriteLine("ERROR: Pause event error");
-            } 
-        }
-
-        void AppLaunching(object sender, LaunchingEventArgs e)
-        {
-            Debug.WriteLine("INFO: AppLaunching");
-        }
-
-        void AppActivated(object sender, Microsoft.Phone.Shell.ActivatedEventArgs e)
-        {
-            Debug.WriteLine("INFO: AppActivated");
-            try
-            {
-                CordovaBrowser.InvokeScript("CordovaCommandResult", new string[] { "resume"
});
-            }
-            catch (Exception)
-            {
-                Debug.WriteLine("ERROR: Resume event error");
-            }  
-        }
-
-        void GapBrowser_Loaded(object sender, RoutedEventArgs e)
-        {
-            if (DesignerProperties.IsInDesignTool)
-            {
-                return;
-            }
-
-            // prevents refreshing web control to initial state during pages transitions
-            if (this.IsBrowserInitialized) return;
-
-            
-
-            this.domStorageHelper = new DOMStorageHelper(this.CordovaBrowser);
-
-            try
-            {
-
-                // Before we possibly clean the ISO-Store, we need to grab our generated
UUID, so we can rewrite it after.
-                string deviceUUID = "";
-
-                using (IsolatedStorageFile appStorage = IsolatedStorageFile.GetUserStoreForApplication())
-                {
-                    try
-                    {
-                        IsolatedStorageFileStream fileStream = new IsolatedStorageFileStream("DeviceID.txt",
FileMode.Open, FileAccess.Read, appStorage);
-
-                        using (StreamReader reader = new StreamReader(fileStream))
-                        {
-                            deviceUUID = reader.ReadLine();
-                        }
-                    }
-                    catch (Exception /*ex*/)
-                    {
-                        deviceUUID = Guid.NewGuid().ToString();
-                    }
-
-                    Debug.WriteLine("Updating IsolatedStorage for APP:DeviceID :: " + deviceUUID);
-                    IsolatedStorageFileStream file = new IsolatedStorageFileStream("DeviceID.txt",
FileMode.Create, FileAccess.Write, appStorage);
-                    using (StreamWriter writeFile = new StreamWriter(file))
-                    {
-                        writeFile.WriteLine(deviceUUID);
-                        writeFile.Close();
-                    }
-   
-                }
-
-                StreamResourceInfo streamInfo = Application.GetResourceStream(new Uri("CordovaSourceDictionary.xml",
UriKind.Relative));
-
-                if (streamInfo != null)
-                {
-                    StreamReader sr = new StreamReader(streamInfo.Stream);
-                    //This will Read Keys Collection for the xml file
-
-                    XDocument document = XDocument.Parse(sr.ReadToEnd());
-
-                    var files = from results in document.Descendants("FilePath")
-                                 select new
-                                 {
-                                     path =  (string)results.Attribute("Value")
-                                 };
-                    StreamResourceInfo fileResourceStreamInfo;
-
-                    using (IsolatedStorageFile appStorage = IsolatedStorageFile.GetUserStoreForApplication())
-                    {
-
-                        foreach (var file in files)
-                        {
-                            fileResourceStreamInfo = Application.GetResourceStream(new Uri(file.path,
UriKind.Relative));
-
-                            if (fileResourceStreamInfo != null)
-                            {
-                                using (BinaryReader br = new BinaryReader(fileResourceStreamInfo.Stream))
-                                {
-                                    byte[] data = br.ReadBytes((int)fileResourceStreamInfo.Stream.Length);
-
-                                    string strBaseDir = AppRoot + file.path.Substring(0,
file.path.LastIndexOf(System.IO.Path.DirectorySeparatorChar));
-
-                                    if(!appStorage.DirectoryExists(strBaseDir))
-                                    {
-                                        Debug.WriteLine("INFO: Creating Directory :: " +
strBaseDir);
-                                        appStorage.CreateDirectory(strBaseDir);
-                                    }
-
-                                    // This will truncate/overwrite an existing file, or

-                                    using (IsolatedStorageFileStream outFile = appStorage.OpenFile(AppRoot
+ file.path, FileMode.Create))
-                                    {
-                                        Debug.WriteLine("INFO: Writing data for " + AppRoot
+ file.path + " and length = " + data.Length);
-                                        using (var writer = new BinaryWriter(outFile))
-                                        {
-                                            writer.Write(data);
-                                        }
-                                    }
-                                }
-                            }
-                            else
-                            {
-                                Debug.WriteLine("ERROR: Failed to write file :: " + file.path
+ " did you forget to add it to the project?");
-                            }
-                        }
-                    }
-                }
-
-                CordovaBrowser.Navigate(StartPageUri);
-                IsBrowserInitialized = true;
-                AttachHardwareButtonHandlers();
-            }
-            catch (Exception ex)
-            {
-                Debug.WriteLine("ERROR: Exception in GapBrowser_Loaded :: {0}", ex.Message);
-            }
-        }
-
-        void AttachHardwareButtonHandlers()
-        {
-            PhoneApplicationFrame frame = Application.Current.RootVisual as PhoneApplicationFrame;
-            if (frame != null)
-            {
-                PhoneApplicationPage page = frame.Content as PhoneApplicationPage;
-                 
-                if (page != null)
-                {
-                    page.BackKeyPress += new EventHandler<CancelEventArgs>(page_BackKeyPress);
-
-                    this.orientationHelper = new OrientationHelper(this.CordovaBrowser, page);

-
-                }
-            }
-        }
-
-        void page_BackKeyPress(object sender, CancelEventArgs e)
-        {
-           
-            if (OverrideBackButton)
-            {
-                try
-                {
-                    CordovaBrowser.InvokeScript("CordovaCommandResult", new string[] { "backbutton"
});
-                    e.Cancel = true;
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine("Exception while invoking backbutton into cordova view:
" + ex.Message);
-                }
-            }
-            else
-            {
-                try
-                {
-                    PageDidChange = false;
-
-                    Uri uriBefore = this.Browser.Source;
-                    // calling js history.back with result in a page change if history was
valid.
-                    CordovaBrowser.InvokeScript("eval", new string[] { "(function(){window.history.back();})()"
});
-                    
-                    Uri uriAfter = this.Browser.Source;
-
-                    e.Cancel = PageDidChange || (uriBefore != uriAfter);
-                }
-                catch (Exception)
-                {
-                    e.Cancel = false; // exit the app ... ?
-                }
-            }
-        }
-
-        void GapBrowser_LoadCompleted(object sender, System.Windows.Navigation.NavigationEventArgs
e)
-        {
-            string nativeReady = "(function(){ cordova.require('cordova/channel').onNativeReady.fire()})();";
-
-            try
-            {
-                CordovaBrowser.InvokeScript("execScript", new string[] { nativeReady });
-            }
-            catch (Exception /*ex*/)
-            {
-                Debug.WriteLine("Error calling js to fire nativeReady event. Did you include
cordova-x.x.x.js in your html script tag?");
-            }
-
-            if (this.CordovaBrowser.Opacity < 1)
-            {
-                this.CordovaBrowser.Opacity = 1;
-                RotateIn.Begin();
-            }
-        }
-
-
-        void GapBrowser_Navigating(object sender, NavigatingEventArgs e)
-        {
-            this.PageDidChange = true;
-            // Debug.WriteLine("GapBrowser_Navigating to :: " + e.Uri.ToString());
-            // TODO: tell any running plugins to stop doing what they are doing.
-            // TODO: check whitelist / blacklist
-            // NOTE: Navigation can be cancelled by setting :        e.Cancel = true;
-        }
-
-        /*
-         *  This method does the work of routing commands
-         *  NotifyEventArgs.Value contains a string passed from JS 
-         *  If the command already exists in our map, we will just attempt to call the method(action)
specified, and pass the args along
-         *  Otherwise, we create a new instance of the command, add it to the map, and call
it ...
-         *  This method may also receive JS error messages caught by window.onerror, in any
case where the commandStr does not appear to be a valid command
-         *  it is simply output to the debugger output, and the method returns.
-         * 
-         **/
-        void GapBrowser_ScriptNotify(object sender, NotifyEventArgs e)
-        {
-            string commandStr = e.Value;
-
-            if (commandStr.IndexOf("DOMStorage") == 0)
-            {
-                this.domStorageHelper.HandleStorageCommand(commandStr);
-                return;
-            }
-            else if (commandStr.IndexOf("Orientation") == 0)
-            {
-                this.orientationHelper.HandleCommand(commandStr);
-                return;
-            }
-
-            CordovaCommandCall commandCallParams = CordovaCommandCall.Parse(commandStr);
-            
-            if (commandCallParams == null)
-            {
-                // ERROR
-                Debug.WriteLine("ScriptNotify :: " + commandStr);
-            }
-            else if (commandCallParams.Service == "CoreEvents")
-            {
-                switch (commandCallParams.Action.ToLower())
-                {
-                    case "overridebackbutton":
-                        string args = commandCallParams.Args;
-                        this.OverrideBackButton = (args != null && args.Length >
0 && args.ToLower() == "true");
-                        break;
-                }
-            }
-            else
-            {
-                this.nativeExecution.ProcessCommand(commandCallParams);
-            }
-        }
-
-        private void GapBrowser_Unloaded(object sender, RoutedEventArgs e)
-        {
-
-        }
-
-        private void GapBrowser_NavigationFailed(object sender, System.Windows.Navigation.NavigationFailedEventArgs
e)
-        {
-            Debug.WriteLine("GapBrowser_NavigationFailed :: " + e.Uri.ToString());
-        }
-
-        private void GapBrowser_Navigated(object sender, System.Windows.Navigation.NavigationEventArgs
e)
-        {
-            Debug.WriteLine("GapBrowser_Navigated :: " + e.Uri.ToString());
-        }
-
-       
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/d5d335dc/framework/WP7CordovaClassLib.csproj
----------------------------------------------------------------------
diff --git a/framework/WP7CordovaClassLib.csproj b/framework/WP7CordovaClassLib.csproj
index b02eee4..914e217 100644
--- a/framework/WP7CordovaClassLib.csproj
+++ b/framework/WP7CordovaClassLib.csproj
@@ -77,89 +77,137 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Cordova\BrowserMouseHelper.cs" />
-    <Compile Include="Cordova\Commands\Accelerometer.cs" />
-    <Compile Include="Cordova\Commands\AudioPlayer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Cordova\Commands\Battery.cs" />
-    <Compile Include="Cordova\Commands\Camera.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Cordova\Commands\Capture.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Cordova\Commands\Compass.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Cordova\Commands\Contacts.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Cordova\Commands\GeoLocation.cs" />
-    <Compile Include="Cordova\Commands\ImageExifHelper.cs" />
-    <Compile Include="Cordova\Commands\Media.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Cordova\Commands\MimeTypeMapper.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Cordova\DOMStorageHelper.cs" />
-    <Compile Include="Cordova\JSON\JsonHelper.cs" />
-    <Compile Include="Cordova\OrientationHelper.cs" />
-    <Compile Include="Cordova\CordovaCommandCall.cs" />
-    <Compile Include="Cordova\CommandFactory.cs" />
-    <Compile Include="Cordova\Commands\BaseCommand.cs" />
-    <Compile Include="Cordova\Commands\NetworkStatus.cs" />
-    <Compile Include="Cordova\Commands\DebugConsole.cs" />
-    <Compile Include="Cordova\Commands\Device.cs" />
-    <Compile Include="Cordova\Commands\File.cs" />
-    <Compile Include="Cordova\Commands\FileTransfer.cs" />
-    <Compile Include="Cordova\Commands\Notification.cs" />
-    <Compile Include="Cordova\NativeExecution.cs" />
-    <Compile Include="Cordova\PluginResult.cs" />
-    <Compile Include="Cordova\ScriptCallback.cs" />
-    <Compile Include="Cordova\UI\AudioCaptureTask.cs" />
-    <Compile Include="Cordova\UI\AudioRecorder.xaml.cs">
+    <Compile Include="..\templates\standalone\cordovalib\BrowserMouseHelper.cs">
+      <Link>CordovaLib\BrowserMouseHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\CommandFactory.cs">
+      <Link>CordovaLib\CommandFactory.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\Accelerometer.cs">
+      <Link>CordovaLib\Commands\Accelerometer.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\AudioPlayer.cs">
+      <Link>CordovaLib\Commands\AudioPlayer.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\BaseCommand.cs">
+      <Link>CordovaLib\Commands\BaseCommand.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\Battery.cs">
+      <Link>CordovaLib\Commands\Battery.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\Camera.cs">
+      <Link>CordovaLib\Commands\Camera.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\Capture.cs">
+      <Link>CordovaLib\Commands\Capture.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\Compass.cs">
+      <Link>CordovaLib\Commands\Compass.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\Contacts.cs">
+      <Link>CordovaLib\Commands\Contacts.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\DebugConsole.cs">
+      <Link>CordovaLib\Commands\DebugConsole.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\Device.cs">
+      <Link>CordovaLib\Commands\Device.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\File.cs">
+      <Link>CordovaLib\Commands\File.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\FileTransfer.cs">
+      <Link>CordovaLib\Commands\FileTransfer.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\GeoLocation.cs">
+      <Link>CordovaLib\Commands\GeoLocation.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\ImageExifHelper.cs">
+      <Link>CordovaLib\Commands\ImageExifHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\Media.cs">
+      <Link>CordovaLib\Commands\Media.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\MimeTypeMapper.cs">
+      <Link>CordovaLib\Commands\MimeTypeMapper.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\NetworkStatus.cs">
+      <Link>CordovaLib\Commands\NetworkStatus.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\Commands\Notification.cs">
+      <Link>CordovaLib\Commands\Notification.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\CordovaCommandCall.cs">
+      <Link>CordovaLib\CordovaCommandCall.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\CordovaView.xaml.cs">
+      <Link>CordovaLib\CordovaView.xaml.cs</Link>
+      <DependentUpon>CordovaView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\DOMStorageHelper.cs">
+      <Link>CordovaLib\DOMStorageHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\JSON\JsonHelper.cs">
+      <Link>CordovaLib\JSON\JsonHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\NativeExecution.cs">
+      <Link>CordovaLib\NativeExecution.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\OrientationHelper.cs">
+      <Link>CordovaLib\OrientationHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\PluginResult.cs">
+      <Link>CordovaLib\PluginResult.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\ScriptCallback.cs">
+      <Link>CordovaLib\ScriptCallback.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\UI\AudioCaptureTask.cs">
+      <Link>CordovaLib\UI\AudioCaptureTask.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\UI\AudioRecorder.xaml.cs">
+      <Link>CordovaLib\UI\AudioRecorder.xaml.cs</Link>
       <DependentUpon>AudioRecorder.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Cordova\UI\ImageCapture.xaml.cs">
+    <Compile Include="..\templates\standalone\cordovalib\UI\ImageCapture.xaml.cs">
+      <Link>CordovaLib\UI\ImageCapture.xaml.cs</Link>
       <DependentUpon>ImageCapture.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Cordova\UI\NotificationBox.xaml.cs">
+    <Compile Include="..\templates\standalone\cordovalib\UI\NotificationBox.xaml.cs">
+      <Link>CordovaLib\UI\NotificationBox.xaml.cs</Link>
       <DependentUpon>NotificationBox.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Cordova\UI\VideoCaptureTask.cs" />
-    <Compile Include="Cordova\UI\VideoRecorder.xaml.cs">
+    <Compile Include="..\templates\standalone\cordovalib\UI\VideoCaptureTask.cs">
+      <Link>CordovaLib\UI\VideoCaptureTask.cs</Link>
+    </Compile>
+    <Compile Include="..\templates\standalone\cordovalib\UI\VideoRecorder.xaml.cs">
+      <Link>CordovaLib\UI\VideoRecorder.xaml.cs</Link>
       <DependentUpon>VideoRecorder.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="CordovaView.xaml.cs">
-      <DependentUpon>CordovaView.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="CordovaView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Cordova\UI\AudioRecorder.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Cordova\UI\ImageCapture.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Cordova\UI\NotificationBox.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Cordova\UI\VideoRecorder.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="..\templates\standalone\cordovalib\Images\appbar.back.rest.png">
+      <Link>CordovaLib\Images\appbar.back.rest.png</Link>
+    </Resource>
+    <Resource Include="..\templates\standalone\cordovalib\Images\appbar.close.rest.png">
+      <Link>CordovaLib\Images\appbar.close.rest.png</Link>
+    </Resource>
+    <Resource Include="..\templates\standalone\cordovalib\Images\appbar.feature.video.rest.png">
+      <Link>CordovaLib\Images\appbar.feature.video.rest.png</Link>
+    </Resource>
+    <Resource Include="..\templates\standalone\cordovalib\Images\appbar.next.rest.png">
+      <Link>CordovaLib\Images\appbar.next.rest.png</Link>
+    </Resource>
+    <Resource Include="..\templates\standalone\cordovalib\Images\appbar.save.rest.png">
+      <Link>CordovaLib\Images\appbar.save.rest.png</Link>
+    </Resource>
+    <Resource Include="..\templates\standalone\cordovalib\Images\appbar.stop.rest.png">
+      <Link>CordovaLib\Images\appbar.stop.rest.png</Link>
+    </Resource>
+    <Content Include="..\templates\standalone\cordovalib\resources\notification-beep.wav">
+      <Link>CordovaLib\resources\notification-beep.wav</Link>
+    </Content>
     <Content Include="Images\appbar.back.rest.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -185,7 +233,33 @@
   <ItemGroup>
     <Resource Include="resources\notification-beep.wav" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Page Include="..\templates\standalone\cordovalib\CordovaView.xaml">
+      <Link>CordovaLib\CordovaView.xaml</Link>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="..\templates\standalone\cordovalib\UI\AudioRecorder.xaml">
+      <Link>CordovaLib\UI\AudioRecorder.xaml</Link>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="..\templates\standalone\cordovalib\UI\ImageCapture.xaml">
+      <Link>CordovaLib\UI\ImageCapture.xaml</Link>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="..\templates\standalone\cordovalib\UI\NotificationBox.xaml">
+      <Link>CordovaLib\UI\NotificationBox.xaml</Link>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="..\templates\standalone\cordovalib\UI\VideoRecorder.xaml">
+      <Link>CordovaLib\UI\VideoRecorder.xaml</Link>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets"
/>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets"
/>
   <ProjectExtensions />

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/d5d335dc/framework/WP7CordovaClassLib.sln
----------------------------------------------------------------------
diff --git a/framework/WP7CordovaClassLib.sln b/framework/WP7CordovaClassLib.sln
index 44b3a34..040cb49 100644
--- a/framework/WP7CordovaClassLib.sln
+++ b/framework/WP7CordovaClassLib.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010 Express for Windows Phone
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WP7CordovaClassLib", "WP7CordovaClassLib.csproj",
"{FC6A1A70-892D-46AD-9E4A-9793F72AF780}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WP7CordovaClassLibBare", "WP7CordovaClassLibBare.csproj",
"{BC0F2FBA-FBA4-47F5-93BD-C88C171246F4}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,10 +13,6 @@ Global
 		{FC6A1A70-892D-46AD-9E4A-9793F72AF780}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FC6A1A70-892D-46AD-9E4A-9793F72AF780}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FC6A1A70-892D-46AD-9E4A-9793F72AF780}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BC0F2FBA-FBA4-47F5-93BD-C88C171246F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC0F2FBA-FBA4-47F5-93BD-C88C171246F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BC0F2FBA-FBA4-47F5-93BD-C88C171246F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BC0F2FBA-FBA4-47F5-93BD-C88C171246F4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/d5d335dc/framework/WP7CordovaClassLibBare.csproj
----------------------------------------------------------------------
diff --git a/framework/WP7CordovaClassLibBare.csproj b/framework/WP7CordovaClassLibBare.csproj
index 919f3e4..033cca9 100644
--- a/framework/WP7CordovaClassLibBare.csproj
+++ b/framework/WP7CordovaClassLibBare.csproj
@@ -77,29 +77,6 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CordovaView.xaml.cs">
-      <DependentUpon>CordovaView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Cordova\BrowserMouseHelper.cs" />
-    <Compile Include="Cordova\CommandFactory.cs" />
-    <Compile Include="Cordova\Commands\BaseCommand.cs" />
-    <Compile Include="Cordova\Commands\DebugConsole.cs" />
-    <Compile Include="Cordova\Commands\Device.cs" />
-    <Compile Include="Cordova\Commands\File.cs" />
-    <Compile Include="Cordova\Commands\FileTransfer.cs" />
-    <Compile Include="Cordova\Commands\MimeTypeMapper.cs" />
-    <Compile Include="Cordova\Commands\NetworkStatus.cs" />
-    <Compile Include="Cordova\Commands\Notification.cs" />
-    <Compile Include="Cordova\CordovaCommandCall.cs" />
-    <Compile Include="Cordova\DOMStorageHelper.cs" />
-    <Compile Include="Cordova\JSON\JsonHelper.cs" />
-    <Compile Include="Cordova\NativeExecution.cs" />
-    <Compile Include="Cordova\OrientationHelper.cs" />
-    <Compile Include="Cordova\PluginResult.cs" />
-    <Compile Include="Cordova\ScriptCallback.cs" />
-    <Compile Include="Cordova\UI\NotificationBox.xaml.cs">
-      <DependentUpon>NotificationBox.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -129,16 +106,6 @@
     <Resource Include="resources\notification-beep.wav" />
   </ItemGroup>
   <ItemGroup />
-  <ItemGroup>
-    <Page Include="CordovaView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Cordova\UI\NotificationBox.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets"
/>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets"
/>
   <ProjectExtensions />
@@ -157,4 +124,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file


Mime
View raw message