From: Vásáry Dániel <vasary@elgekko.net>
Date: Sat, 27 Jan 2024 23:27:51 +0000 (+0100)
Subject: Config changes
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=437f7f99c3fa945cf96e48d5b0e66ac8dcadc2cc;p=mediacube.git

Config changes
---

diff --git a/server/hu.user.mediacube.indexer/.classpath b/server/hu.user.mediacube.indexer/.classpath
index 397d43fd..a98de71f 100644
--- a/server/hu.user.mediacube.indexer/.classpath
+++ b/server/hu.user.mediacube.indexer/.classpath
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE xml>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
@@ -10,13 +12,11 @@
 		<attributes>
 			<attribute name="test" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
diff --git a/server/hu.user.theme.userdark/.classpath b/server/hu.user.theme.userdark/.classpath
index ac341a8c..a7fe5f1f 100644
--- a/server/hu.user.theme.userdark/.classpath
+++ b/server/hu.user.theme.userdark/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
+	<classpathentry including="**/*.java" kind="src" path="src">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -11,7 +11,7 @@
 			<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.7">
+	<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 2268f09b..51be433b 100644
--- a/server/hu.user.theme.userdark/pom.xml
+++ b/server/hu.user.theme.userdark/pom.xml
@@ -1,126 +1,126 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>user.theme</groupId>
-	<artifactId>userdark</artifactId>
-	<packaging>jar</packaging>
-	<version>1.0.0</version>
-	<name>ZK User Dark</name>
-	<description>ZK User Dark Theme</description>
-	<properties>
-		<zk.version>8.0.3</zk.version>
-	</properties>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>zkmaven</id>
-			<name>ZK Maven Plugin Repository</name>
-			<url>https://mavensync.zkoss.org/maven2</url>
-		</pluginRepository>
-		<pluginRepository>
-			<id>maven-bundle-plugin</id>
-			<name>bnd maven plugin</name>
-			<url>https://repo1.maven.org/maven2</url>
-		</pluginRepository>
-	</pluginRepositories>
-	<dependencies>
-		<dependency>
-			<groupId>org.zkoss.zk</groupId>
-			<artifactId>zk</artifactId>
-			<version>${zk.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.zkoss.zk</groupId>
-			<artifactId>zul</artifactId>
-			<version>${zk.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.zkoss.zk</groupId>
-			<artifactId>zkmax</artifactId>
-			<version>${zk.version}</version>
-		</dependency>
-	</dependencies>
-	
-	<build>
-		<sourceDirectory>${project.basedir}/src/</sourceDirectory>
-		<resources>
-			<resource>
-				<directory>${project.basedir}/src/archive</directory>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<groupId>org.zkoss.maven</groupId>
-				<artifactId>zkless-engine-maven-plugin</artifactId>
-				<version>1.0.0</version>
-				<executions>
-					<execution>
-						<id>compile-less</id>
-						<goals>
-							<goal>lessc</goal>
-						</goals>
-						<configuration>
-							<sourceDirectory>${project.basedir}/src/archive</sourceDirectory>
-							<outputDirectory>${project.basedir}/target/classes</outputDirectory>
-						</configuration>
-					</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>
-				<version>1.7.0</version>
-				<executions>
-					<execution>
-						<id>default-cli</id>
-						<configuration>
-							<artifacts>
- 								<artifact>
-									<id>user.theme:userdark:1.0.0</id>
-									<transitive>false</transitive>
-								</artifact>
-							</artifacts>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			-->
-		</plugins>
-	</build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>user.theme</groupId>
+	<artifactId>userdark</artifactId>
+	<packaging>jar</packaging>
+	<version>1.0.0</version>
+	<name>ZK User Dark</name>
+	<description>ZK User Dark Theme</description>
+	<properties>
+		<zk.version>8.0.3</zk.version>
+	</properties>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>zkmaven</id>
+			<name>ZK Maven Plugin Repository</name>
+			<url>http://mavensync.zkoss.org/maven2</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>maven-bundle-plugin</id>
+			<name>bnd maven plugin</name>
+			<url>http://repo1.maven.org/maven2</url>
+		</pluginRepository>
+	</pluginRepositories>
+	<dependencies>
+		<dependency>
+			<groupId>org.zkoss.zk</groupId>
+			<artifactId>zk</artifactId>
+			<version>${zk.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.zkoss.zk</groupId>
+			<artifactId>zul</artifactId>
+			<version>${zk.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.zkoss.zk</groupId>
+			<artifactId>zkmax</artifactId>
+			<version>${zk.version}</version>
+		</dependency>
+	</dependencies>
+	
+	<build>
+		<sourceDirectory>${project.basedir}/src/</sourceDirectory>
+		<resources>
+			<resource>
+				<directory>${project.basedir}/src/archive</directory>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.zkoss.maven</groupId>
+				<artifactId>zkless-engine-maven-plugin</artifactId>
+				<version>1.0.0</version>
+				<executions>
+					<execution>
+						<id>compile-less</id>
+						<goals>
+							<goal>lessc</goal>
+						</goals>
+						<configuration>
+							<sourceDirectory>${project.basedir}/src/archive</sourceDirectory>
+							<outputDirectory>${project.basedir}/target/classes</outputDirectory>
+						</configuration>
+					</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>
+				<version>1.7.0</version>
+				<executions>
+					<execution>
+						<id>default-cli</id>
+						<configuration>
+							<artifacts>
+ 								<artifact>
+									<id>user.theme:userdark:1.0.0</id>
+									<transitive>false</transitive>
+								</artifact>
+							</artifacts>
+						</configuration>
+					</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 6203ff03..ba66f8d4 100644
--- a/server/user.commons.zk/build-zk-module.launch
+++ b/server/user.commons.zk/build-zk-module.launch
@@ -17,8 +17,5 @@
     <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
         <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
     </listAttribute>
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/user.commons.zk}"/>
 </launchConfiguration>