Merge branch '6.0' of https://github.com/lucee/Lucee into 6.0

lucee · Oct 2, 2023 · 0e75f22 · 0e75f22
2 parents 8e70347 + 3d11020
commit 0e75f22
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 461 deletions.
diff --git a/core/src/main/java/META-INF/MANIFEST.MF b/core/src/main/java/META-INF/MANIFEST.MF
@@ -171,7 +171,6 @@ Export-Package: coldfusion,
  lucee.runtime.functions.string,
  lucee.runtime.functions.struct,
  lucee.runtime.functions.system,
- lucee.runtime.functions.video,
  lucee.runtime.functions.xml,
  lucee.runtime.gateway,
  lucee.runtime.gateway.proxy,
@@ -279,7 +278,6 @@ Export-Package: coldfusion,
  lucee.runtime.user,
  lucee.runtime.util,
  lucee.runtime.util.pool,
- lucee.runtime.video,
  lucee.runtime.vm,
  lucee.runtime.writer,
  lucee.servlet,

diff --git a/core/src/main/java/lucee/runtime/config/ConfigAdmin.java b/core/src/main/java/lucee/runtime/config/ConfigAdmin.java
@@ -151,8 +151,6 @@
 import lucee.runtime.type.util.KeyConstants;
 import lucee.runtime.type.util.ListUtil;
 import lucee.runtime.type.util.StructUtil;
-import lucee.runtime.video.VideoExecuter;
-import lucee.runtime.video.VideoExecuterNotSupported;
 import lucee.transformer.library.ClassDefinitionImpl;
 import lucee.transformer.library.function.FunctionLibException;
 import lucee.transformer.library.tag.TagLibException;
@@ -4291,7 +4289,6 @@ private void setExtensionAttrs(Struct el, Extension extension) {
 		el.setEL("author", extension.getAuthor());
 		el.setEL("type", extension.getType());
 		el.setEL("codename", extension.getCodename());
-		el.setEL("video", extension.getVideo());
 		el.setEL("support", extension.getSupport());
 		el.setEL("documentation", extension.getDocumentation());
 		el.setEL("forum", extension.getForum());
@@ -5464,15 +5461,7 @@ public void updateRemoteClientUsage(String code, String displayname) {
 		extensions.setEL("usage", toStringURLStyle(usage));
 
 	}
-
-	public void updateVideoExecuterClass(ClassDefinition cd) throws PageException {
-
-		if (cd.getClassName() == null) cd = new ClassDefinitionImpl(VideoExecuterNotSupported.class.getName());
-
-		Struct app = _getRootElement("video");
-		setClass(app, VideoExecuter.class, "videoExecuter", cd);
-	}
-
+
 	public void updateAdminSyncClass(ClassDefinition cd) throws PageException {
 
 		if (cd.getClassName() == null) cd = new ClassDefinitionImpl(AdminSyncNotSupported.class.getName());

diff --git a/core/src/main/java/lucee/runtime/functions/video/IsVideoFile.java b/core/src/main/java/lucee/runtime/functions/video/IsVideoFile.java
diff --git a/core/src/main/java/lucee/runtime/tag/Admin.java b/core/src/main/java/lucee/runtime/tag/Admin.java
@@ -863,8 +863,6 @@ else if (check("getLoggedDebugData", ACCESS_FREE)) // no password necessary for
 		else if (check("getAdminSyncClass", ACCESS_FREE) && check2(ACCESS_READ)) doGetAdminSyncClass();
 		else if (check("updateAdminSyncClass", ACCESS_FREE) && check2(ACCESS_WRITE)) doUpdateAdminSyncClass();
 
-		else if (check("getVideoExecuterClass", ACCESS_FREE) && check2(ACCESS_READ)) doGetVideoExecuterClass();
-		else if (check("updateVideoExecuterClass", ACCESS_FREE) && check2(ACCESS_WRITE)) doUpdateVideoExecuterClass();
 		else if (check("terminateRunningThread", ACCESS_FREE) && check2(ACCESS_WRITE)) doTerminateRunningThread();
 
 		else if (check("updateLabel", ACCESS_NOT_WHEN_WEB) && check2(ACCESS_WRITE)) doUpdateLabel();
@@ -2236,17 +2234,6 @@ private void doGetAdminSyncClass() throws PageException {
 		pageContext.setVariable(getString("admin", action, "returnVariable"), config.getAdminSyncClass().getName());
 	}
 
-	private void doUpdateVideoExecuterClass() throws PageException {
-		ClassDefinition cd = new ClassDefinitionImpl(getString("admin", action, "class"), getString("bundleName", null), getString("bundleVersion", null),
-				config.getIdentification());
-		admin.updateVideoExecuterClass(cd);
-		store();
-	}
-
-	private void doGetVideoExecuterClass() throws PageException {
-		pageContext.setVariable(getString("admin", action, "returnVariable"), config.getVideoExecuterClass().getName());
-	}
-
 	/**
 	 * @throws PageException
 	 * 

diff --git a/core/src/main/java/lucee/runtime/video/ProfileCollection.java b/core/src/main/java/lucee/runtime/video/ProfileCollection.java