From: Vásáry Dániel <vasary@elgekko.net>
Date: Tue, 12 Mar 2024 14:14:09 +0000 (+0100)
Subject: Project config
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=5e857c7f0ef78f77522aefebf1b1557cac9a3c5e;p=mediacube.git

Project config
---

diff --git a/server/user.jobengine.log4j/.classpath b/server/user.jobengine.log4j/.classpath
index 4247f09f..aadd1bb0 100644
--- a/server/user.jobengine.log4j/.classpath
+++ b/server/user.jobengine.log4j/.classpath
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry exported="true" kind="lib" path="lib/log4j-api-2.17.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/log4j-core-2.17.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/log4j-slf4j-impl-2.17.2.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/server/user.jobengine.log4j/pom.xml b/server/user.jobengine.log4j/pom.xml
index a4ed40a9..10b3ceb7 100644
--- a/server/user.jobengine.log4j/pom.xml
+++ b/server/user.jobengine.log4j/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<parent>
 		<relativePath>../-modules</relativePath>
@@ -10,10 +12,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>user.jobengine.log4j</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.0.0</version>
 	<build>
 		<plugins>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
@@ -26,12 +26,14 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${project.basedir}/../-product/target/deploy</outputDirectory>
+							<outputDirectory>
+								${project.basedir}/../-product/target/deploy</outputDirectory>
 							<resources>
 								<resource>
 									<directory>target</directory>
 									<includes>
-										<include>${project.artifactId}_${project.version}.jar</include>
+										<include>
+											${project.artifactId}_${project.version}.jar</include>
 									</includes>
 								</resource>
 							</resources>
@@ -42,5 +44,5 @@
 			</plugin>
 		</plugins>
 	</build>
-	
+
 </project>
\ No newline at end of file
diff --git a/server/user.mediacube.gui/.classpath b/server/user.mediacube.gui/.classpath
index 619e72b0..0a6e3a46 100644
--- a/server/user.mediacube.gui/.classpath
+++ b/server/user.mediacube.gui/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/userdark-1.0.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
diff --git a/server/user.mediacube.gui/META-INF/MANIFEST.MF b/server/user.mediacube.gui/META-INF/MANIFEST.MF
index a5c9ed00..9d7555f0 100644
--- a/server/user.mediacube.gui/META-INF/MANIFEST.MF
+++ b/server/user.mediacube.gui/META-INF/MANIFEST.MF
@@ -11,12 +11,9 @@ Require-Bundle: user.jobengine.osgi.db;bundle-version="1.0.0",
  user.commons.zk;bundle-version="1.0.0",
  org.apache.servicemix.bundles.quartz;bundle-version="2.3.0",
  user.jobengine.osgi.server
-Export-Package: org.zkoss.theme.___THEME_NAME___,
- org.zkoss.theme.userdark,
- user.jobengine.gui
+Export-Package: user.jobengine.gui
 DynamicImport-Package: *
-Bundle-ClassPath: .,
- lib/userdark-1.0.0.jar
+Bundle-ClassPath: .
 Bundle-ActivationPolicy: lazy
 Web-ContextPath: /
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/server/user.mediacube.gui/lib/userdark-1.0.0.jar b/server/user.mediacube.gui/lib/userdark-1.0.0.jar
index 1c7ea1b1..956a232a 100644
Binary files a/server/user.mediacube.gui/lib/userdark-1.0.0.jar and b/server/user.mediacube.gui/lib/userdark-1.0.0.jar differ