Namespace refactoring (remove experimental)

roberttuttle · Feb 28, 2015 · 3ced309 · 3ced309
1 parent 3ee62bf
commit 3ced309
Show file tree

Hide file tree

Showing 26 changed files with 43 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -5,14 +5,15 @@ Copyright (c) 2015 frog design inc. / Robert Tuttle <[email protected]
 
 A remote touch injection client for Windows 8 using standard TUIO+OSC protocols, variable input calibration, and integrated hosted Wi-Fi networking for devices.
 
-https://github.com/frog-opensource/touchproxy (frog-opensource)
+https://github.com/frog/touchproxy
 
 Features
 --------------------
 
 - Works with any standard TUIO tracker app or service as a remote multitouch input panel.
 http://www.tuio.org/ 
-Apps are currently available for: 
+
+- Apps are currently available for: 
   - iOS (https://itunes.apple.com/us/app/tuiopad/id412446962)
   - Android (https://play.google.com/store/apps/details?id=tuioDroid.impl)
   - Many other platforms and environments (http://www.tuio.org/?software)
@@ -29,7 +30,7 @@ Apps are currently available for:
 Overview
 --------------------
 
-![](https://github.com/frog-opensource/touchproxy/wiki/images/touchproxy-wiki-1.png)
+![](https://github.com/frog/touchproxy/wiki/images/touchproxy-wiki-1.png)
 
 1. Toggle TouchProxy service on/off (TUIO client / OSC receiver UDP socket listener) 
 2. Set TUIO client / OSC receiver UDP socket listener port value (3333 is standard TUIO port) 

diff --git a/frog.eXPeriMeNTaL.Windows.TouchProxy.sln → frog.Windows.TouchProxy.sln b/frog.eXPeriMeNTaL.Windows.TouchProxy.sln → frog.Windows.TouchProxy.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "frog.eXPeriMeNTaL.Windows.TouchProxy", "frog.eXPeriMeNTaL.Windows.TouchProxy\frog.eXPeriMeNTaL.Windows.TouchProxy.csproj", "{6DDDA249-6384-4DBF-A644-67D5C5DBCD23}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "frog.Windows.TouchProxy", "frog.Windows.TouchProxy\frog.Windows.TouchProxy.csproj", "{6DDDA249-6384-4DBF-A644-67D5C5DBCD23}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OSC.Windows", "OSC.Windows\OSC.Windows.csproj", "{57F27823-B3A0-4D0F-8113-795D982EF63A}"
 EndProject

diff --git a/...XPeriMeNTaL.Windows.TouchProxy/App.config → frog.Windows.TouchProxy/App.config b/...XPeriMeNTaL.Windows.TouchProxy/App.config → frog.Windows.TouchProxy/App.config
diff --git a/....eXPeriMeNTaL.Windows.TouchProxy/App.xaml → frog.Windows.TouchProxy/App.xaml b/....eXPeriMeNTaL.Windows.TouchProxy/App.xaml → frog.Windows.TouchProxy/App.xaml
@@ -1,5 +1,5 @@
 <Application 
-    x:Class="frog.eXPeriMeNTaL.Windows.TouchProxy.App"
+    x:Class="frog.Windows.TouchProxy.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     StartupUri="MainWindow.xaml">

diff --git a/...PeriMeNTaL.Windows.TouchProxy/App.xaml.cs → frog.Windows.TouchProxy/App.xaml.cs b/...PeriMeNTaL.Windows.TouchProxy/App.xaml.cs → frog.Windows.TouchProxy/App.xaml.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Windows;
 
-namespace frog.eXPeriMeNTaL.Windows.TouchProxy
+namespace frog.Windows.TouchProxy
 {
     public partial class App : Application
     {

diff --git a/...y/Behaviors/PasswordBoxBindingBehavior.cs → ...y/Behaviors/PasswordBoxBindingBehavior.cs b/...y/Behaviors/PasswordBoxBindingBehavior.cs → ...y/Behaviors/PasswordBoxBindingBehavior.cs
@@ -2,7 +2,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace frog.eXPeriMeNTaL.Windows.TouchProxy.Behaviors
+namespace frog.Windows.TouchProxy.Behaviors
 {
 	public static class PasswordBoxBindingBehavior
 	{

diff --git a/...xy/Behaviors/TextBoxAutoScrollBehavior.cs → ...xy/Behaviors/TextBoxAutoScrollBehavior.cs b/...xy/Behaviors/TextBoxAutoScrollBehavior.cs → ...xy/Behaviors/TextBoxAutoScrollBehavior.cs
@@ -3,7 +3,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace frog.eXPeriMeNTaL.Windows.TouchProxy.Behaviors
+namespace frog.Windows.TouchProxy.Behaviors
 {
 	public static class TextBoxAutoScrollBehavior
 	{

diff --git a/...Windows.TouchProxy/Common/BindableBase.cs → ...Windows.TouchProxy/Common/BindableBase.cs b/...Windows.TouchProxy/Common/BindableBase.cs → ...Windows.TouchProxy/Common/BindableBase.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 
-namespace frog.eXPeriMeNTaL.Windows.TouchProxy.Common
+namespace frog.Windows.TouchProxy.Common
 {
     public abstract class BindableBase : INotifyPropertyChanged
     {

diff --git a/...aL.Windows.TouchProxy/Common/Delegates.cs → frog.Windows.TouchProxy/Common/Delegates.cs b/...aL.Windows.TouchProxy/Common/Delegates.cs → frog.Windows.TouchProxy/Common/Delegates.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace frog.eXPeriMeNTaL.Windows.TouchProxy.Common
+namespace frog.Windows.TouchProxy.Common
 {
 	public delegate bool TextConstraintPredicateDelegate(string input);
 }
diff --git a/...MeNTaL.Windows.TouchProxy/Common/Enums.cs → frog.Windows.TouchProxy/Common/Enums.cs b/...MeNTaL.Windows.TouchProxy/Common/Enums.cs → frog.Windows.TouchProxy/Common/Enums.cs
@@ -3,7 +3,7 @@
 using System.ComponentModel;
 using System.Linq;
 
-namespace frog.eXPeriMeNTaL.Windows.TouchProxy.Common
+namespace frog.Windows.TouchProxy.Common
 {
 	public enum ScreenTarget 
 	{

diff --git a/...L.Windows.TouchProxy/Common/Extensions.cs → frog.Windows.TouchProxy/Common/Extensions.cs b/...L.Windows.TouchProxy/Common/Extensions.cs → frog.Windows.TouchProxy/Common/Extensions.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel;
 
-namespace frog.eXPeriMeNTaL.Windows.TouchProxy.Common
+namespace frog.Windows.TouchProxy.Common
 {
 	public static class CommonExtensions
 	{

diff --git a/...NTaL.Windows.TouchProxy/Common/Helpers.cs → frog.Windows.TouchProxy/Common/Helpers.cs b/...NTaL.Windows.TouchProxy/Common/Helpers.cs → frog.Windows.TouchProxy/Common/Helpers.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace frog.eXPeriMeNTaL.Windows.TouchProxy.Common
+namespace frog.Windows.TouchProxy.Common
 {
 	public static class EnumHelper
 	{

diff --git a/...TouchProxy/Controls/ConstrainedTextBox.cs → ...TouchProxy/Controls/ConstrainedTextBox.cs b/...TouchProxy/Controls/ConstrainedTextBox.cs → ...TouchProxy/Controls/ConstrainedTextBox.cs
@@ -3,9 +3,9 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 
-using frog.eXPeriMeNTaL.Windows.TouchProxy.Common;
+using frog.Windows.TouchProxy.Common;
 
-namespace frog.eXPeriMeNTaL.Windows.TouchProxy.Controls
+namespace frog.Windows.TouchProxy.Controls
 {
 	public class ConstrainedTextBox : TextBox
 	{

diff --git a/...ibrationBufferMarkerTransformConverter.cs → ...ibrationBufferMarkerTransformConverter.cs b/...ibrationBufferMarkerTransformConverter.cs → ...ibrationBufferMarkerTransformConverter.cs
@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace frog.eXPeriMeNTaL.Windows.TouchProxy.Converters
+namespace frog.Windows.TouchProxy.Converters
 {
 	public class CalibrationBufferMarkerTransformConverter : IMultiValueConverter
 	{

diff --git a/...Proxy/Diagnostics/TextBoxTraceListener.cs → ...Proxy/Diagnostics/TextBoxTraceListener.cs b/...Proxy/Diagnostics/TextBoxTraceListener.cs → ...Proxy/Diagnostics/TextBoxTraceListener.cs
@@ -3,7 +3,7 @@
 using System.Windows.Controls;
 using System.Windows.Threading;
 
-namespace frog.eXPeriMeNTaL.Windows.TouchProxy.Diagnostics
+namespace frog.Windows.TouchProxy.Diagnostics
 {
 	public class TextBoxTraceListener : TraceListener
 	{

diff --git a/...MeNTaL.Windows.TouchProxy/MainWindow.xaml → frog.Windows.TouchProxy/MainWindow.xaml b/...MeNTaL.Windows.TouchProxy/MainWindow.xaml → frog.Windows.TouchProxy/MainWindow.xaml
@@ -1,14 +1,14 @@
 <Window 
-	x:Class="frog.eXPeriMeNTaL.Windows.TouchProxy.MainWindow"
+	x:Class="frog.Windows.TouchProxy.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
 	xmlns:ei="http://schemas.microsoft.com/expression/2010/interactions"
-	xmlns:local="clr-namespace:frog.eXPeriMeNTaL.Windows.TouchProxy"
-	xmlns:behaviors="clr-namespace:frog.eXPeriMeNTaL.Windows.TouchProxy.Behaviors" 
-	xmlns:controls="clr-namespace:frog.eXPeriMeNTaL.Windows.TouchProxy.Controls"
-	xmlns:converters="clr-namespace:frog.eXPeriMeNTaL.Windows.TouchProxy.Converters"
-	xmlns:services="clr-namespace:frog.eXPeriMeNTaL.Windows.TouchProxy.Services" 
+	xmlns:local="clr-namespace:frog.Windows.TouchProxy"
+	xmlns:behaviors="clr-namespace:frog.Windows.TouchProxy.Behaviors" 
+	xmlns:controls="clr-namespace:frog.Windows.TouchProxy.Controls"
+	xmlns:converters="clr-namespace:frog.Windows.TouchProxy.Converters"
+	xmlns:services="clr-namespace:frog.Windows.TouchProxy.Services" 
 	Title="TouchProxy"
     Width="1080"
     Height="760" 

diff --git a/...TaL.Windows.TouchProxy/MainWindow.xaml.cs → frog.Windows.TouchProxy/MainWindow.xaml.cs b/...TaL.Windows.TouchProxy/MainWindow.xaml.cs → frog.Windows.TouchProxy/MainWindow.xaml.cs
@@ -2,7 +2,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace frog.eXPeriMeNTaL.Windows.TouchProxy
+namespace frog.Windows.TouchProxy
 {
 	public partial class MainWindow : Window
     {

diff --git a/...Windows.TouchProxy/MainWindowViewModel.cs → ...Windows.TouchProxy/MainWindowViewModel.cs b/...Windows.TouchProxy/MainWindowViewModel.cs → ...Windows.TouchProxy/MainWindowViewModel.cs
@@ -10,11 +10,11 @@
 
 using Microsoft.Win32;
 
-using frog.eXPeriMeNTaL.Windows.TouchProxy.Common;
-using frog.eXPeriMeNTaL.Windows.TouchProxy.Diagnostics;
-using frog.eXPeriMeNTaL.Windows.TouchProxy.Services;
+using frog.Windows.TouchProxy.Common;
+using frog.Windows.TouchProxy.Diagnostics;
+using frog.Windows.TouchProxy.Services;
 
-namespace frog.eXPeriMeNTaL.Windows.TouchProxy
+namespace frog.Windows.TouchProxy
 {
 	public class MainWindowViewModel : BindableBase
 	{

diff --git a/...ows.TouchProxy/Properties/AssemblyInfo.cs → ...ows.TouchProxy/Properties/AssemblyInfo.cs b/...ows.TouchProxy/Properties/AssemblyInfo.cs → ...ows.TouchProxy/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("frog")]
-[assembly: AssemblyProduct("frog.eXPeriMeNTaL.Windows.TouchProxy")]
+[assembly: AssemblyProduct("frog.Windows.TouchProxy")]
 [assembly: AssemblyCopyright("Copyright © 2013 frog design inc.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

diff --git a/...s.TouchProxy/Resources/Styles/Common.xaml → ...s.TouchProxy/Resources/Styles/Common.xaml b/...s.TouchProxy/Resources/Styles/Common.xaml → ...s.TouchProxy/Resources/Styles/Common.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary 
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
-	xmlns:behaviors="clr-namespace:frog.eXPeriMeNTaL.Windows.TouchProxy.Behaviors">
+	xmlns:behaviors="clr-namespace:frog.Windows.TouchProxy.Behaviors">
 
 	<Style TargetType="{x:Type GroupBox}">
 		<Setter Property="Padding" Value="10,3,10,10" />

diff --git a/...uchProxy/Services/HostedNetworkService.cs → ...uchProxy/Services/HostedNetworkService.cs b/...uchProxy/Services/HostedNetworkService.cs → ...uchProxy/Services/HostedNetworkService.cs
@@ -4,9 +4,9 @@
 using System.Threading.Tasks;
 using System.Windows;
 
-using frog.eXPeriMeNTaL.Windows.TouchProxy.Common;
+using frog.Windows.TouchProxy.Common;
 
-namespace frog.eXPeriMeNTaL.Windows.TouchProxy.Services
+namespace frog.Windows.TouchProxy.Services
 {
 	public class HostedNetworkService : BindableBase, IDisposable
 	{

diff --git a/...ows.TouchProxy/Services/NetworkService.cs → ...ows.TouchProxy/Services/NetworkService.cs b/...ows.TouchProxy/Services/NetworkService.cs → ...ows.TouchProxy/Services/NetworkService.cs
@@ -6,9 +6,9 @@
 using System.Net.Sockets;
 using System.Threading.Tasks;
 
-using frog.eXPeriMeNTaL.Windows.TouchProxy.Common;
+using frog.Windows.TouchProxy.Common;
 
-namespace frog.eXPeriMeNTaL.Windows.TouchProxy.Services
+namespace frog.Windows.TouchProxy.Services
 {
 	public class NetworkService : BindableBase
 	{

diff --git a/...chProxy/Services/TouchInjectionService.cs → ...chProxy/Services/TouchInjectionService.cs b/...chProxy/Services/TouchInjectionService.cs → ...chProxy/Services/TouchInjectionService.cs
@@ -9,9 +9,9 @@
 
 using TUIO;
 
-using frog.eXPeriMeNTaL.Windows.TouchProxy.Common;
+using frog.Windows.TouchProxy.Common;
 
-namespace frog.eXPeriMeNTaL.Windows.TouchProxy.Services
+namespace frog.Windows.TouchProxy.Services
 {
 	public class TouchInjectionService : BindableBase, ITuioListener, IDisposable
 	{

diff --git a/...og.eXPeriMeNTaL.Windows.TouchProxy.csproj → ...TouchProxy/frog.Windows.TouchProxy.csproj b/...og.eXPeriMeNTaL.Windows.TouchProxy.csproj → ...TouchProxy/frog.Windows.TouchProxy.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{6DDDA249-6384-4DBF-A644-67D5C5DBCD23}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>frog.eXPeriMeNTaL.Windows.TouchProxy</RootNamespace>
+    <RootNamespace>frog.Windows.TouchProxy</RootNamespace>
     <AssemblyName>TouchProxy</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -54,22 +54,22 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>frog.eXPeriMeNTaL.Windows.TouchProxy.App</StartupObject>
+    <StartupObject>frog.Windows.TouchProxy.App</StartupObject>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestCertificateThumbprint>FB7DDEC86F29D4F62BA041A7F58FB184482F4DDA</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>frog.eXPeriMeNTaL.Windows.TouchProxy_TemporaryKey.pfx</ManifestKeyFile>
+    <ManifestKeyFile>frog.Windows.TouchProxy_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
     <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <SignManifests>true</SignManifests>
+    <SignManifests>false</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>frog.eXPeriMeNTaL.Windows.TouchProxy.ico</ApplicationIcon>
+    <ApplicationIcon>frog.Windows.TouchProxy.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Expression.Interactions, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -140,7 +140,6 @@
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
-    <None Include="frog.eXPeriMeNTaL.Windows.TouchProxy_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\System.Net.NetworkInformation\System.Net.NetworkInformation.csproj">
@@ -169,7 +168,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="frog.eXPeriMeNTaL.Windows.TouchProxy.ico" />
+    <Resource Include="frog.Windows.TouchProxy.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/.../frog.eXPeriMeNTaL.Windows.TouchProxy.ico → ...ws.TouchProxy/frog.Windows.TouchProxy.ico b/.../frog.eXPeriMeNTaL.Windows.TouchProxy.ico → ...ws.TouchProxy/frog.Windows.TouchProxy.ico
diff --git a/frog.eXPeriMeNTaL.Windows.TouchProxy/frog.eXPeriMeNTaL.Windows.TouchProxy_TemporaryKey.pfx b/frog.eXPeriMeNTaL.Windows.TouchProxy/frog.eXPeriMeNTaL.Windows.TouchProxy_TemporaryKey.pfx