From: Vásáry Dániel <vasary@elgekko.net>
Date: Wed, 24 Jan 2024 21:20:59 +0000 (+0100)
Subject: Dark theme dependency style modified
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=60e4dbcf43106cefad4f20cfc269925cc34fd49c;p=mediacube.git

Dark theme dependency style modified
---

diff --git a/server/-configuration/run-mediacube-server-hirtv.launch b/server/-configuration/run-mediacube-server-hirtv.launch
index 3d90701c..dc9e0b79 100644
--- a/server/-configuration/run-mediacube-server-hirtv.launch
+++ b/server/-configuration/run-mediacube-server-hirtv.launch
@@ -95,7 +95,6 @@
         <setEntry value="org.omnifaces@default:default"/>
         <setEntry value="slf4j.api@default:default"/>
         <setEntry value="slf4j.simple@default:false"/>
-        <setEntry value="user.theme.userdark@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="user.commons.zk@default:default"/>
diff --git a/server/-dependencies/jobengine-theme.target b/server/-dependencies/jobengine-theme.target
index 16b24aa9..a424cf7d 100644
--- a/server/-dependencies/jobengine-theme.target
+++ b/server/-dependencies/jobengine-theme.target
@@ -3,7 +3,6 @@
 <target name="JobEngine" sequenceNumber="486">
 <locations>
 <location path="${workspace_loc}/-dependencies/target/repository/plugins" type="Directory"/>
-	<location path="${workspace_loc}/hu.user.theme.userdark/target/" type="Directory"/>
 </locations>
 <includeBundles>
 <plugin id="cglib"/>
@@ -88,7 +87,6 @@
 	<plugin id="org.objectweb.asm.commons"/>
 	<plugin id="com.sun.jna.platform"/>
 	<plugin id="org.apache.felix.fileinstall"/>
-	<plugin id="user.theme.userdark"/>
 </includeBundles>
 <environment>
 	<os>win32</os>
diff --git a/server/-modules/pom.xml b/server/-modules/pom.xml
index a979c4de..82dc366c 100644
--- a/server/-modules/pom.xml
+++ b/server/-modules/pom.xml
@@ -43,11 +43,6 @@
 			<layout>p2</layout>
 			<url>file:${project.basedir}/../-dependencies/target/repository/</url>
 		</repository>
-		<repository>
-			<id>theme</id>
-			<layout>p2</layout>
-			<url>file:${project.basedir}/../hu.user.theme.userdark/target/repository/</url>
-		</repository>
 	</repositories>
 
 	<build>
diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product
index ee07e555..7f48d93d 100644
--- a/server/-product/mediacube.product
+++ b/server/-product/mediacube.product
@@ -105,7 +105,6 @@
       <plugin id="user.jobengine.osgi.services"/>
       <plugin id="user.mediacube.gui"/>
       <plugin id="user.mediacube.metadata"/>
-      <plugin id="user.theme.userdark"/>
       <plugin id="user.tsm.client"/>
    </plugins>
 
diff --git a/server/hu.user.theme.userdark/.classpath b/server/hu.user.theme.userdark/.classpath
index 6c7c3b02..05f70db3 100644
--- a/server/hu.user.theme.userdark/.classpath
+++ b/server/hu.user.theme.userdark/.classpath
@@ -6,12 +6,12 @@
 			<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/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/server/hu.user.theme.userdark/pom.xml b/server/hu.user.theme.userdark/pom.xml
index 53733a8a..51be433b 100644
--- a/server/hu.user.theme.userdark/pom.xml
+++ b/server/hu.user.theme.userdark/pom.xml
@@ -67,6 +67,41 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.7</version>
+				<executions>
+					<execution>
+						<id>copy-jar</id>
+						<phase>install</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.basedir}/../user.mediacube.gui/lib</outputDirectory>
+							<resources>
+								<resource>
+									<directory>target</directory>
+									<includes>
+										<include>${project.artifactId}-${project.version}.jar</include>
+									</includes>
+								</resource>
+							</resources>
+							<encoding>UTF-8</encoding>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<!-- 
+		    <plugin>
+		      <groupId>org.apache.maven.plugins</groupId>
+		      <artifactId>maven-jar-plugin</artifactId>
+		      <version>2.3.1</version>
+		      <configuration>
+		        <outputDirectory>${project.parent.basedir}/user.commons.zk/lib</outputDirectory>
+		      </configuration>
+		    </plugin>
 			<plugin>
 				<groupId>org.reficio</groupId>
 				<artifactId>p2-maven-plugin</artifactId>
@@ -85,7 +120,7 @@
 					</execution>
 				</executions>
 			</plugin>
-			
+			-->
 		</plugins>
 	</build>
 </project>
diff --git a/server/user.commons.zk/build-zk-module.launch b/server/user.commons.zk/build-zk-module.launch
index 00e79319..ba66f8d4 100644
--- a/server/user.commons.zk/build-zk-module.launch
+++ b/server/user.commons.zk/build-zk-module.launch
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE xml>
-
 <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+    <intAttribute key="M2_COLORS" value="0"/>
     <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-    <stringAttribute key="M2_GOALS" value="clean install"/>
+    <stringAttribute key="M2_GOALS" value="clean package install"/>
     <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
     <booleanAttribute key="M2_OFFLINE" value="false"/>
     <stringAttribute key="M2_PROFILES" value=""/>
@@ -14,6 +13,7 @@
     <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
     <stringAttribute key="M2_USER_SETTINGS" value=""/>
     <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
     <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
         <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
     </listAttribute>
diff --git a/server/user.commons.zk/pom.xml b/server/user.commons.zk/pom.xml
index 42bffbdc..c96e5bef 100644
--- a/server/user.commons.zk/pom.xml
+++ b/server/user.commons.zk/pom.xml
@@ -28,7 +28,7 @@
 							<file>lib/zk.jar</file>
 							<groupId>org.zkoss.zk</groupId>
 							<artifactId>zk</artifactId>
-							<version>${version}</version>
+							<version>${project.version}</version>
 							<packaging>jar</packaging>
 						</configuration>
 					</execution>
@@ -42,7 +42,7 @@
 							<file>lib/zul.jar</file>
 							<groupId>org.zkoss.zk</groupId>
 							<artifactId>zul</artifactId>
-							<version>${version}</version>
+							<version>${project.version}</version>
 							<packaging>jar</packaging>
 						</configuration>
 					</execution>
@@ -56,7 +56,7 @@
 							<file>lib/zkmax.jar</file>
 							<groupId>org.zkoss.zk</groupId>
 							<artifactId>zkmax</artifactId>
-							<version>${version}</version>
+							<version>${project.version}</version>
 							<packaging>jar</packaging>
 						</configuration>
 					</execution>
diff --git a/server/user.jobengine.osgi.services/build-services-module.launch b/server/user.jobengine.osgi.services/build-services-module.launch
index b7d4e22d..08606353 100644
--- a/server/user.jobengine.osgi.services/build-services-module.launch
+++ b/server/user.jobengine.osgi.services/build-services-module.launch
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+    <intAttribute key="M2_COLORS" value="0"/>
     <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
     <stringAttribute key="M2_GOALS" value="clean install"/>
     <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
@@ -12,5 +13,6 @@
     <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
     <stringAttribute key="M2_USER_SETTINGS" value=""/>
     <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/user.jobengine.osgi.services}"/>
 </launchConfiguration>
diff --git a/server/user.mediacube.gui/.classpath b/server/user.mediacube.gui/.classpath
index 190fd9b0..2dfbbd1b 100644
--- a/server/user.mediacube.gui/.classpath
+++ b/server/user.mediacube.gui/.classpath
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xml>
-
 <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 77da9444..a5c9ed00 100644
--- a/server/user.mediacube.gui/META-INF/MANIFEST.MF
+++ b/server/user.mediacube.gui/META-INF/MANIFEST.MF
@@ -10,11 +10,13 @@ Require-Bundle: user.jobengine.osgi.db;bundle-version="1.0.0",
  org.apache.commons.lang;bundle-version="2.4.0";visibility:=reexport,
  user.commons.zk;bundle-version="1.0.0",
  org.apache.servicemix.bundles.quartz;bundle-version="2.3.0",
- user.jobengine.osgi.server,
- user.theme.userdark;bundle-version="1.0.0"
-Export-Package: user.jobengine.gui
+ user.jobengine.osgi.server
+Export-Package: org.zkoss.theme.___THEME_NAME___,
+ org.zkoss.theme.userdark,
+ user.jobengine.gui
 DynamicImport-Package: *
-Bundle-ClassPath: .
+Bundle-ClassPath: .,
+ lib/userdark-1.0.0.jar
 Bundle-ActivationPolicy: lazy
 Web-ContextPath: /
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/server/user.mediacube.gui/build.properties b/server/user.mediacube.gui/build.properties
index 209d9de1..d63ad93d 100644
--- a/server/user.mediacube.gui/build.properties
+++ b/server/user.mediacube.gui/build.properties
@@ -1,5 +1,15 @@
 source.. = src/,\
            test/
 output.. = bin/
-bin.includes = .,META-INF/,OSGI-INF/,WEB-INF/,index.zul,pages/,css/,img/,js/,resources/
+bin.includes = .,\
+               META-INF/,\
+               OSGI-INF/,\
+               WEB-INF/,\
+               index.zul,\
+               pages/,\
+               css/,\
+               img/,\
+               js/,\
+               resources/,\
+               lib/
 src.includes = .,WEB-INF/,index.zul,pages/,css/,img/,js/,resources/
diff --git a/server/user.mediacube.gui/lib/userdark-1.0.0.jar b/server/user.mediacube.gui/lib/userdark-1.0.0.jar
new file mode 100644
index 00000000..5344a95c
Binary files /dev/null and b/server/user.mediacube.gui/lib/userdark-1.0.0.jar differ