libs: organize files

lib/Uno.Collections/Uno.Collections.unoproj

@@ -3,14 +3,14 @@
   "Description": "Collection extras",
   "Publisher": "Fuse Open",
   "Includes": [
-    "Extensions/EmptyEnumerable.uno:Source",
-    "Extensions/EnumerableExtensions.uno:Source",
-    "Extensions/IListExtensions.uno:Source",
-    "Extensions/OfType.uno:Source",
-    "Extensions/OrderBy.uno:Source",
-    "Extensions/Select.uno:Source",
-    "Extensions/Union.uno:Source",
-    "Extensions/Where.uno:Source",
+    "extensions/EmptyEnumerable.uno:Source",
+    "extensions/Enumerableextensions.uno:Source",
+    "extensions/IListextensions.uno:Source",
+    "extensions/OfType.uno:Source",
+    "extensions/OrderBy.uno:Source",
+    "extensions/Select.uno:Source",
+    "extensions/Union.uno:Source",
+    "extensions/Where.uno:Source",
     "ObservableList.uno:Source"
   ]
 }

lib/Uno.Collections/tests/Uno.Collections.Test.unoproj

@@ -0,0 +1,16 @@
+{
+  "Copyright": "Copyright (C) 2014",
+  "Packages": [
+    "Uno.Collections",
+    "Uno.Testing"
+  ],
+  "Includes": [
+    "ObservableList.Test.uno:Source",
+    "extensions/IListExtensions.Test.uno:Source",
+    "extensions/EnumerableExtensions.Test.uno:Source",
+    "extensions/EmptyEnumerable.Test.uno:Source",
+    "extensions/OfType.Test.uno:Source",
+    "extensions/DummyItem.uno:Source",
+    "extensions/Helpers.uno:Source"
+  ]
+}

lib/Uno.Data.Json/Uno.Data.Json.unoproj

@@ -6,11 +6,11 @@
     "../Uno.Collections/Uno.Collections.unoproj"
   ],
   "Includes": [
-    "Source/JsonDataType.uno:Source",
-    "Source/JsonException.uno:Source",
-    "Source/JsonReader.uno:Source",
-    "Source/JsonValue.uno:Source",
-    "Source/JsonWriter.uno:Source",
-    "Source/Parser.uno:Source",
+    "JsonDataType.uno:Source",
+    "JsonException.uno:Source",
+    "JsonReader.uno:Source",
+    "JsonValue.uno:Source",
+    "JsonWriter.uno:Source",
+    "Parser.uno:Source",
   ]
 }

lib/Uno.Data.Json/Tests/JsonTests/Uno.Data.Json.Test.unoproj → lib/Uno.Data.Json/tests/Uno.Data.Json.Test.unoproj

@@ -1,6 +1,5 @@
 {
   "Packages": [
-    "Uno.Data.Json",
     "Uno.Data.Json",
     "Uno.Testing"
   ],

lib/Uno.Data.Xml/Uno.Data.Xml.unoproj

@@ -6,35 +6,35 @@
     "../Uno.Collections/Uno.Collections.unoproj"
   ],
   "Includes": [
-    "Targets/CIL/Uno.Data.Xml.cil.uxl:Extensions",
-    "Targets/CPlusPlus/Uno.Data.Xml.cpp.uxl:Extensions",
-    "Targets/CPlusPlus/Source/pugiconfig.hpp:File",
-    "Targets/CPlusPlus/Source/pugixml.cpp:File",
-    "Targets/CPlusPlus/Source/pugixml.hpp:File",
-    "Source/System.Xml.uno:Source",
-    "Source/XmlException.uno:Source",
-    "Source/XmlNodeImpl.uno:Source",
-    "Source/XmlNodeHandle.uno:Source",
-    "Source/XmlAttributeHandle.uno:Source",
-    "Source/XmlEnums.uno:Source",
-    "Source/Elements/XmlAttribute.uno:Source",
-    "Source/Elements/XmlValue.uno:Source",
-    "Source/Elements/XmlText.uno:Source",
-    "Source/Elements/XmlProcessingInstruction.uno:Source",
-    "Source/Elements/XmlNode.uno:Source",
-    "Source/Elements/XmlLinkedNode.uno:Source",
-    "Source/Elements/XmlElement.uno:Source",
-    "Source/Elements/XmlDocumentElement.uno:Source",
-    "Source/Elements/XmlDocument.uno:Source",
-    "Source/Elements/XmlDeclaration.uno:Source",
-    "Source/Elements/XmlComment.uno:Source",
-    "Source/Elements/XmlCharacterData.uno:Source",
-    "Source/Collections/XmlNodeCollectionBase.uno:Source",
-    "Source/Collections/XmlAttributeCollection.uno:Source",
-    "Source/Collections/XmlLinkedNodeCollection.uno:Source",
-    "Source/Helpers/AttributeHandleConverter.uno:Source",
-    "Source/Helpers/ValidationHelper.uno:Source",
-    "Source/Helpers/XmlEncodingHelper.uno:Source",
-    "Source/Helpers/XmlNodeHandleConverter.uno:Source"
+    "cil/System.Xml.uno:Source",
+    "cil/System.Xml.uxl:Extensions",
+    "cpp/pugixml.uxl:Extensions",
+    "cpp/pugiconfig.hpp:File",
+    "cpp/pugixml.cpp:File",
+    "cpp/pugixml.hpp:File",
+    "XmlException.uno:Source",
+    "XmlNodeImpl.uno:Source",
+    "XmlNodeHandle.uno:Source",
+    "XmlAttributeHandle.uno:Source",
+    "XmlEnums.uno:Source",
+    "elements/XmlAttribute.uno:Source",
+    "elements/XmlValue.uno:Source",
+    "elements/XmlText.uno:Source",
+    "elements/XmlProcessingInstruction.uno:Source",
+    "elements/XmlNode.uno:Source",
+    "elements/XmlLinkedNode.uno:Source",
+    "elements/XmlElement.uno:Source",
+    "elements/XmlDocumentElement.uno:Source",
+    "elements/XmlDocument.uno:Source",
+    "elements/XmlDeclaration.uno:Source",
+    "elements/XmlComment.uno:Source",
+    "elements/XmlCharacterData.uno:Source",
+    "collections/XmlNodeCollectionBase.uno:Source",
+    "collections/XmlAttributeCollection.uno:Source",
+    "collections/XmlLinkedNodeCollection.uno:Source",
+    "helpers/AttributeHandleConverter.uno:Source",
+    "helpers/ValidationHelper.uno:Source",
+    "helpers/XmlEncodingHelper.uno:Source",
+    "helpers/XmlNodeHandleConverter.uno:Source"
   ]
 }

lib/Uno.Data.Xml/Targets/CPlusPlus/Source/pugixml.cpp → lib/Uno.Data.Xml/cpp/pugixml.cpp

@@ -14,7 +14,7 @@
 #ifndef SOURCE_PUGIXML_CPP
 #define SOURCE_PUGIXML_CPP
 
-#include "Source/pugixml.hpp"
+#include "pugixml.hpp"
 
 #include <stdlib.h>
 #include <stdio.h>

lib/Uno.Data.Xml/Targets/CPlusPlus/Uno.Data.Xml.cpp.uxl → lib/Uno.Data.Xml/cpp/pugixml.uxl

@@ -4,11 +4,11 @@
     <Type Name="Uno.Data.Xml.XmlNodeHandle" />
     <Type Name="Uno.Data.Xml.XmlAttributeHandle" />
     <Type Name="Uno.Data.Xml.XmlNodeImpl">
-        <CopyFile Type="HeaderFile" Name="Source/pugixml.hpp" />
-        <CopyFile Type="HeaderFile" Name="Source/pugiconfig.hpp" />
-        <CopyFile Type="SourceFile" Name="Source/pugixml.cpp" />
+        <CopyFile Type="HeaderFile" Name="pugixml.hpp" />
+        <CopyFile Type="HeaderFile" Name="pugiconfig.hpp" />
+        <CopyFile Type="SourceFile" Name="pugixml.cpp" />
 
-        <Require Source.Include="Source/pugixml.hpp" />
+        <Require Source.Include="pugixml.hpp" />
 
         <Method Signature="Parse(string):XmlNodeHandle">
             <Require Source.Include="@{Uno.Data.Xml.XmlException:Include}" />

lib/Uno.Graphics.Utils/Uno.Graphics.Utils.unoproj

@@ -4,13 +4,13 @@
   ],
   "Includes": [
     "Bitmap.uno:Source",
-    "Cpp/CppFontFace.uno:Source",
-    "Cpp/CppTexture.uno:Source",
-    "DotNet/DotNetFontFace.uno:Source",
-    "DotNet/DotNetTexture.uno:Source",
-    "DotNet/Uno.Native.stuff:Stuff",
-    "DotNet/Uno.Native.uno:Source",
-    "DotNet/Uno.Native.uxl:Extensions",
+    "cpp/CppFontFace.uno:Source",
+    "cpp/CppTexture.uno:Source",
+    "dotnet/DotNetFontFace.uno:Source",
+    "dotnet/DotNetTexture.uno:Source",
+    "dotnet/Uno.Native.stuff:Stuff",
+    "dotnet/Uno.Native.uno:Source",
+    "dotnet/Uno.Native.uxl:Extensions",
     "FontLoader.uno:Source",
     "Text/BitmapFont.uno:Source",
     "Text/DefaultTextTransform.uno:Source",

lib/Uno.Net.Http/Uno.Net.Http.unoproj

@@ -16,27 +16,27 @@
     "HttpResponseType.uno:Source",
     "HttpStatusReasonPhrase.uno:Source",
     "HttpDefaultDispatcher.uno:Source",
-    "Implementation/Android/AndroidHttpRequest.uno:Source",
-    "Implementation/Android/ExperimentalHttp/Android_com_fuse_ExperimentalHttp_HttpRequest.java:File",
-    "Implementation/Android/ExperimentalHttp/DownloadTask.java:File",
-    "Implementation/Android/ExperimentalHttp/HttpRequest.cpp.uxl:Extensions",
-    "Implementation/Android/ExperimentalHttp/HttpRequest.java:File",
-    "Implementation/Android/ExperimentalHttp/HttpRequest.uno:Source",
-    "Implementation/Android/ExperimentalHttp/PRNGFixes.java:File",
-    "Implementation/Android/ExperimentalHttp/UploadTask.java:File",
-    "Implementation/Cil/CilHttpRequest.cil.uxl:Extensions",
-    "Implementation/Cil/CilHttpRequest.uno:Source",
-    "Implementation/Cil/Uno.Net.Http.Implementation.dll:File",
-    "Implementation/IHttpRequest.uno:Source",
-    "Implementation/iOS/HttpRequest.h:File",
-    "Implementation/iOS/HttpRequest.mm:File",
-    "Implementation/iOS/iOSHttpRequest.cpp.uxl:Extensions",
-    "Implementation/iOS/iOSHttpRequest.uno:Source",
-    "Implementation/iOS/iOSHttpSharedCache.cpp.uxl:Extensions",
-    "Implementation/iOS/iOSHttpSharedCache.uno:Source",
-    "Implementation/Xli/XliHttpEventHandler.h:File",
-    "Implementation/Xli/XliHttpRequest.cpp.uxl:Extensions",
-    "Implementation/Xli/XliHttpRequest.uno:Source",
+    "android/AndroidHttpRequest.uno:Source",
+    "android/ExperimentalHttp/Android_com_fuse_ExperimentalHttp_HttpRequest.java:File",
+    "android/ExperimentalHttp/DownloadTask.java:File",
+    "android/ExperimentalHttp/HttpRequest.cpp.uxl:Extensions",
+    "android/ExperimentalHttp/HttpRequest.java:File",
+    "android/ExperimentalHttp/HttpRequest.uno:Source",
+    "android/ExperimentalHttp/PRNGFixes.java:File",
+    "android/ExperimentalHttp/UploadTask.java:File",
+    "cil/CilHttpRequest.cil.uxl:Extensions",
+    "cil/CilHttpRequest.uno:Source",
+    "cil/Uno.Net.Http.Implementation.dll:File",
+    "IHttpRequest.uno:Source",
+    "ios/HttpRequest.h:File",
+    "ios/HttpRequest.mm:File",
+    "ios/iOSHttpRequest.cpp.uxl:Extensions",
+    "ios/iOSHttpRequest.uno:Source",
+    "ios/iOSHttpSharedCache.cpp.uxl:Extensions",
+    "ios/iOSHttpSharedCache.uno:Source",
+    "cpp/XliHttpEventHandler.h:File",
+    "cpp/XliHttpRequest.cpp.uxl:Extensions",
+    "cpp/XliHttpRequest.uno:Source",
     "Uri.uno:Source",
     "UriFormatException.uno:Source",
     "UriHelper.uno:Source",

lib/Uno.Testing/Uno.Testing.unoproj

@@ -6,10 +6,10 @@
     "Uno.Testing.Test"
   ],
   "Includes": [
-    "Attributes/IgnoreAttribute.uno:Source",
-    "Attributes/TestAttribute.uno:Source",
-    "Exceptions/AssertionFailedException.uno:Source",
-    "Exceptions/IgnoreException.uno:Source",
+    "attributes/IgnoreAttribute.uno:Source",
+    "attributes/TestAttribute.uno:Source",
+    "exceptions/AssertionFailedException.uno:Source",
+    "exceptions/IgnoreException.uno:Source",
     "AbstractRunner.uno:Source",
     "Assert.uno:Source",
     "NamedTestMethod.uno:Source",

lib/Uno.Threading/Implementation/Posix/PthreadHelpers.uno → lib/Uno.Threading/PthreadHelpers.uno

@@ -11,14 +11,14 @@ namespace Uno.Threading
         {
         }
 
-        [Require("Source.Include", "Implementation/Posix/posix_mutex.h")]
+        [Require("Source.Include", "uThread/posix_mutex.h")]
         public static void CreateMutex(ref MutexHandle mutexHandle)
         @{
             if (!uPthreadCreateMutex(mutexHandle) != 0)
                 U_THROW(@{Uno.Exception(string):New(uString::Utf8("uPthreadCreateMutex failed!"))});
         @}
 
-        [Require("Source.Include", "Implementation/Posix/posix_mutex.h")]
+        [Require("Source.Include", "uThread/posix_mutex.h")]
         public static bool WaitOneMutex(ref MutexHandle mutexHandle, int millisecondsTimeout)
         @{
             return uPthreadWaitOneMutex(mutexHandle, millisecondsTimeout);
@@ -35,13 +35,13 @@ namespace Uno.Threading
         @}
 
         [TargetSpecificType]
-        [Set("Include", "Implementation/Posix/posix_semaphore.h")]
+        [Set("Include", "uThread/posix_semaphore.h")]
         [Set("TypeName", "uPosixSemaphore *")]
         public struct SemaphoreHandle
         {
         }
 
-        [Require("Source.Include", "Implementation/Posix/posix_semaphore.h")]
+        [Require("Source.Include", "uThread/posix_semaphore.h")]
         public static SemaphoreHandle CreateSemaphore(int initialCount, int maxCount)
         @{
             uPosixSemaphore* semaphoreHandle = uPosixCreateSemaphore(initialCount, maxCount);
@@ -52,13 +52,13 @@ namespace Uno.Threading
             return semaphoreHandle;
         @}
 
-        [Require("Source.Include", "Implementation/Posix/posix_semaphore.h")]
+        [Require("Source.Include", "uThread/posix_semaphore.h")]
         public static bool WaitOneSemaphore(SemaphoreHandle semaphoreHandle, int timeoutMillis)
         @{
             return uPosixWaitOneSemaphore(semaphoreHandle, timeoutMillis);
         @}
 
-        [Require("Source.Include", "Implementation/Posix/posix_semaphore.h")]
+        [Require("Source.Include", "uThread/posix_semaphore.h")]
         public static int ReleaseSemaphore(SemaphoreHandle semaphoreHandle, int releaseCount)
         @{
             int ret = uPosixReleaseSemaphore(semaphoreHandle, releaseCount);
@@ -73,7 +73,7 @@ namespace Uno.Threading
         @}
 
         [TargetSpecificType]
-        [Set("Include", "Implementation/Posix/posix_reset_event.h")]
+        [Set("Include", "uThread/posix_reset_event.h")]
         [Set("TypeName", "uPosixResetEvent *")]
         public struct ResetEventHandle
         {

lib/Uno.Threading/Uno.Threading.unoproj

@@ -18,13 +18,13 @@
     "SyncDispatcher.uno:Source",
     "ThreadPool.uno:Source",
     "Tasks/Tasks.uno:Source",
-    "Implementation/Posix/posix_mutex.cpp:CSource:UNIX && !PInvoke",
-    "Implementation/Posix/posix_mutex.h:CHeader:UNIX && !PInvoke",
-    "Implementation/Posix/posix_reset_event.cpp:CSource:UNIX && !PInvoke",
-    "Implementation/Posix/posix_reset_event.h:CHeader:UNIX && !PInvoke",
-    "Implementation/Posix/posix_semaphore.cpp:CSource:UNIX && !PInvoke",
-    "Implementation/Posix/posix_semaphore.h:CHeader:UNIX && !PInvoke",
-    "Implementation/Posix/PthreadHelpers.uno:Source",
-    "Implementation/Win32/Win32Helpers.uno:Source",
+    "uThread/posix_mutex.cpp:CSource:UNIX && !PInvoke",
+    "uThread/posix_mutex.h:CHeader:UNIX && !PInvoke",
+    "uThread/posix_reset_event.cpp:CSource:UNIX && !PInvoke",
+    "uThread/posix_reset_event.h:CHeader:UNIX && !PInvoke",
+    "uThread/posix_semaphore.cpp:CSource:UNIX && !PInvoke",
+    "uThread/posix_semaphore.h:CHeader:UNIX && !PInvoke",
+    "PthreadHelpers.uno:Source",
+    "Win32Helpers.uno:Source",
   ]
 }

lib/Uno.Threading/Implementation/Posix/posix_mutex.cpp → lib/Uno.Threading/uThread/posix_mutex.cpp

@@ -1,4 +1,4 @@
-#include <Implementation/Posix/posix_mutex.h>
+#include <uThread/posix_mutex.h>
 #include <pthread.h>
 #include <errno.h>
 #include <uBase/Time.h>

lib/Uno.Threading/Implementation/Posix/posix_reset_event.cpp → lib/Uno.Threading/uThread/posix_reset_event.cpp

@@ -1,4 +1,4 @@
-#include <Implementation/Posix/posix_reset_event.h>
+#include <uThread/posix_reset_event.h>
 #include <errno.h>
 #include <sys/time.h>
 #include <stdint.h>

lib/Uno.Threading/Implementation/Posix/posix_semaphore.cpp → lib/Uno.Threading/uThread/posix_semaphore.cpp

@@ -1,4 +1,4 @@
-#include <Implementation/Posix/posix_semaphore.h>
+#include <uThread/posix_semaphore.h>
 #include <errno.h>
 #include <time.h>
 #include <sys/time.h>