updating migration

2024-12-21 09:34:08 +03:00 · 2014-09-03 14:36:29 +02:00 · 2014-09-03 14:36:29 +02:00 · f64987a7b1
commit f64987a7b1
parent 2af27b86e8
9 changed files with 194 additions and 7 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,179 @@
+*.pyc
+
+# /client/administration/
+/client/administration/*.suo
+
+# /client/administration/UdsAdmin/
+/client/administration/UdsAdmin/*.user
+
+# /client/administration/UdsAdmin/bin/
+/client/administration/UdsAdmin/bin/Debug
+/client/administration/UdsAdmin/bin/Release
+
+# /client/administration/UdsAdmin/obj/x86/
+/client/administration/UdsAdmin/obj/x86/Debug
+/client/administration/UdsAdmin/obj/x86/Release
+
+# /client/administration/installer/UDSAdminInstaller/
+/client/administration/installer/UDSAdminInstaller/MSChart.exe
+/client/administration/installer/UDSAdminInstaller/UDSAdminSetup.exe
+
+# /guacamole-tunnel/
+/guacamole-tunnel/target
+
+# /linuxActor/
+/linuxActor/udsactor_1.0_all.deb
+/linuxActor/udsactor_1.0_amd64.changes
+/linuxActor/udsactor_1.0.dsc
+/linuxActor/udsactor_1.0.tar.gz
+/linuxActor/udsactor_1.1_all.deb
+/linuxActor/udsactor_1.1_amd64.changes
+/linuxActor/udsactor_1.1.dsc
+/linuxActor/udsactor_1.1.tar.gz
+
+# /linuxActor/src/
+/linuxActor/src/build-stamp
+/linuxActor/src/configure-stamp
+
+# /linuxActor/src/debian/
+/linuxActor/src/debian/udsactor
+/linuxActor/src/debian/udsactor.postinst.debhelper
+/linuxActor/src/debian/udsactor.postrm.debhelper
+/linuxActor/src/debian/udsactor.substvars
+
+# /linuxActorNX/
+/linuxActorNX/*.deb
+/linuxActorNX/*.changes
+/linuxActorNX/*.dsc
+/linuxActorNX/*.gz
+
+# /linuxActorNX/src/
+/linuxActorNX/src/build-stamp
+/linuxActorNX/src/configure-stamp
+
+# /linuxActorNX/src/debian/
+/linuxActorNX/src/debian/udsactor-nx
+/linuxActorNX/src/debian/udsactor-nx.substvars
+
+# /linuxActorXRDP/
+/linuxActorXRDP/udsactor-xrdp_1.1_all.deb
+/linuxActorXRDP/udsactor-xrdp_1.1_amd64.changes
+/linuxActorXRDP/udsactor-xrdp_1.1.dsc
+/linuxActorXRDP/udsactor-xrdp_1.1.tar.gz
+
+# /linuxActorXRDP/src/debian/
+/linuxActorXRDP/src/debian/udsactor-xrdp
+/linuxActorXRDP/src/debian/udsactor-xrdp.substvars
+
+# /nxtransport/jar/
+/nxtransport/jar/*.sh
+/nxtransport/jar/*.jar
+
+# /nxtuntransport/jar/
+/nxtuntransport/jar/*.sh
+/nxtuntransport/jar/*.jar
+
+# /rdptransport/java/jar/
+/rdptransport/java/jar/*.sh
+/rdptransport/java/jar/*.jar
+
+# /server/
+/server/*_enterprise
+/server/openuds.sublime-project
+/server/openuds.sublime-workspace
+
+# /server/src/
+/server/src/taskmanager.pid
+/server/src/testing
+/server/src/*_enterprise*
+
+# /server/src/log/
+/server/src/log/uds.log.*
+/server/src/log/sql.log.*
+/server/src/log/*.log.*
+
+# /server/src/server/
+/server/src/server/settings.py
+/server/src/server/*_enterprise.py
+/server/src/server/enterprise*
+
+# /server/src/static/
+/server/src/static/cache
+
+# /server/src/uds/
+/server/src/uds/*_enterprise.py
+/server/src/uds/fixtures
+/server/src/uds/tests
+
+# /server/src/uds/auths/
+/server/src/uds/auths/*-enterprise
+/server/src/uds/auths/*_enterprise
+
+# /server/src/uds/core/util/
+/server/src/uds/core/util/*enterprise.py
+
+# /server/src/uds/dispatchers/
+/server/src/uds/dispatchers/*_enterprise
+
+# /server/src/uds/locale/
+/server/src/uds/locale/*.sh
+
+# /server/src/uds/management/commands/
+/server/src/uds/management/commands/*_enterprise.py
+
+# /server/src/uds/models/
+/server/src/uds/models/enterprise*
+
+# /server/src/uds/plugins/
+/server/src/uds/plugins/enterprise*
+
+# /server/src/uds/services/
+/server/src/uds/services/*-enterprise
+/server/src/uds/services/*_enterprise
+
+# /server/src/uds/static/adm/css/
+/server/src/uds/static/adm/css/admin.min.css
+
+# /server/src/uds/static/adm/js/
+/server/src/uds/static/adm/js/admin.min.js
+
+# /server/src/uds/templates/uds/admin/
+/server/src/uds/templates/uds/admin/sample.html
+
+# /server/src/uds/transports/
+/server/src/uds/transports/*-enterprise
+
+# /udsService/
+/udsService/*.suo
+
+# /udsService/installer/
+/udsService/installer/UDSActorSetup.exe
+
+# /udsService/rpc/bin/
+/udsService/rpc/bin/Debug
+/udsService/rpc/bin/Release
+/udsService/rpc/bin/x86
+
+# /udsService/rpc/obj/
+/udsService/rpc/obj/Debug
+/udsService/rpc/obj/Release
+/udsService/rpc/obj/x86
+
+# /udsService/udsService/bin/
+/udsService/udsService/bin/Debug
+/udsService/udsService/bin/Release
+/udsService/udsService/bin/x64
+
+# /udsService/udsService/obj/
+/udsService/udsService/obj/x64
+/udsService/udsService/obj/x86
+
+# /udsService/udsgui/bin/
+/udsService/udsgui/bin/Debug
+/udsService/udsgui/bin/Release
+/udsService/udsgui/bin/x86
+
+# /udsService/udsgui/obj/
+/udsService/udsgui/obj/Debug
+/udsService/udsgui/obj/Release
+/udsService/udsgui/obj/x86
--- a/nxtransport/.gitignore
+++ b/nxtransport/.gitignore
@ -0,0 +1 @@
+/bin/
--- a/nxtuntransport/.gitignore
+++ b/nxtuntransport/.gitignore
@ -0,0 +1 @@
+/bin/
--- a/rdptransport/java/.gitignore
+++ b/rdptransport/java/.gitignore
@ -0,0 +1,2 @@
+/bin/
+/jar/
--- a/rdptransport/java/.project
+++ b/rdptransport/java/.project
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>rdp</name>
+	<name>rdptransport</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- a/rdptransport/java/descrdp.jardesc
+++ b/rdptransport/java/descrdp.jardesc
@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <jardesc>
-    <jar path="rdp/jar/rdp.jar"/>
-    <options buildIfNeeded="true" compress="true" descriptionLocation="/rdp/descrdp.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
+    <jar path="rdptransport/jar/rdp.jar"/>
+    <options buildIfNeeded="true" compress="true" descriptionLocation="/rdptransport/descrdp.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
    <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
    <selectedProjects/>
-    <manifest generateManifest="false" manifestLocation="/rdp/src/manifest" manifestVersion="1.0" reuseManifest="true" saveManifest="true" usesManifest="true">
+    <manifest generateManifest="false" manifestLocation="/rdptransport/src/manifest" manifestVersion="1.0" reuseManifest="true" saveManifest="true" usesManifest="true">
        <sealing sealJar="true">
            <packagesToSeal>
                <package handleIdentifier="=rdp/src&lt;com.virtualcable.rdp"/>
@ -14,8 +14,6 @@
        </sealing>
    </manifest>
    <selectedElements exportClassFiles="true" exportJavaFiles="false" exportOutputFolder="false">
-        <javaElement handleIdentifier="=rdp/src&lt;"/>
-        <javaElement handleIdentifier="=rdp/src&lt;es.virtualcable.rdp"/>
-        <javaElement handleIdentifier="=rdp/src&lt;net.sourceforge.jdpapi"/>
+        <javaElement handleIdentifier="=rdptransport/src"/>
    </selectedElements>
 </jardesc>
--- a/server/src/.gitignore
+++ b/server/src/.gitignore
@ -0,0 +1,2 @@
+/log/
+/static/
--- a/server/src/uds/core/util/Config.py
+++ b/server/src/uds/core/util/Config.py
@ -253,6 +253,9 @@ class GlobalConfig(object):
    # If disallow login using /login url, and must go to an authenticator
    DISALLOW_GLOBAL_LOGIN = Config.section(GLOBAL_SECTION).value('disallowGlobalLogin', '0', type=Config.BOOLEAN_FIELD)

+    # Allos preferences access to users
+    PREFERENCES_ALLOWED = Config.section(GLOBAL_SECTION).value('allowPreferencesAccess', '1', type=Config.BOOLEAN_FIELD)
+
    # Allowed "trusted sources" for request
    TRUSTED_SOURCES = Config.section(SECURITY_SECTION).value('Trusted Hosts', '*', type=Config.TEXT_FIELD)

--- a/ssh-tunnel/tunnelLaucher/.gitignore
+++ b/ssh-tunnel/tunnelLaucher/.gitignore
@ -0,0 +1 @@
+/bin/