From: vasary.daniel <TFS\vasary.daniel>
Date: Sun, 6 Mar 2022 14:14:47 +0000 (+0000)
Subject: log4j update plugin buld
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=5ea65406f767260ae9b2d26cf1b834c70fe19e63;p=mediacube.git

log4j update plugin buld

git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33018
---

diff --git a/server/-modules/pom.xml b/server/-modules/pom.xml
index 38d973be..82dc366c 100644
--- a/server/-modules/pom.xml
+++ b/server/-modules/pom.xml
@@ -15,7 +15,7 @@
 		<module>../user.jobengine.osgi.db</module>
 		<module>../user.jobengine.osgi.server</module>
 		<module>../user.jobengine.osgi.services</module>
-		<module>../user.commons.log4j2</module>
+		<module>../user.jobengine.log4j</module>
 		<module>../user.commons.zk</module>
 		<module>../user.tsm.client</module>
 		<module>../-product</module>
diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product
index 14d38d58..3eac0241 100644
--- a/server/-product/mediacube.product
+++ b/server/-product/mediacube.product
@@ -61,9 +61,6 @@
       <plugin id="org.apache.felix.gogo.shell" version="0.12.0"/>
       <plugin id="org.apache.httpcomponents.httpclient"/>
       <plugin id="org.apache.httpcomponents.httpcore"/>
-      <plugin id="org.apache.logging.log4j.api"/>
-      <plugin id="org.apache.logging.log4j.core"/>
-      <plugin id="org.apache.logging.log4j.slf4j-impl"/>
       <plugin id="org.apache.servicemix.bundles.quartz"/>
       <plugin id="org.eclipse.equinox.common"/>
       <plugin id="org.eclipse.equinox.console"/>
@@ -114,7 +111,6 @@
    </plugins>
 
    <configurations>
-      <plugin id="org.apache.logging.log4j.api" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.jetty.osgi.boot" autoStart="true" startLevel="0" />
diff --git a/server/user.jobengine.log4j/.classpath b/server/user.jobengine.log4j/.classpath
index 4d79cc51..62db7d5f 100644
--- a/server/user.jobengine.log4j/.classpath
+++ b/server/user.jobengine.log4j/.classpath
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/log4j-slf4j-impl-2.17.2.jar"/>
+	<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.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 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 kind="output" path="bin"/>
+	<classpathentry exported="true" kind="lib" path="lib/log4j-slf4j-impl-2.17.2.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/server/user.jobengine.log4j/.project b/server/user.jobengine.log4j/.project
index d074e0e4..6d2e5058 100644
--- a/server/user.jobengine.log4j/.project
+++ b/server/user.jobengine.log4j/.project
@@ -20,8 +20,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/server/user.jobengine.log4j/.settings/org.eclipse.core.resources.prefs b/server/user.jobengine.log4j/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000..4824b802
--- /dev/null
+++ b/server/user.jobengine.log4j/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/server/user.jobengine.log4j/.settings/org.eclipse.jdt.core.prefs b/server/user.jobengine.log4j/.settings/org.eclipse.jdt.core.prefs
index e2860e99..ddd07851 100644
--- a/server/user.jobengine.log4j/.settings/org.eclipse.jdt.core.prefs
+++ b/server/user.jobengine.log4j/.settings/org.eclipse.jdt.core.prefs
@@ -3,6 +3,9 @@ org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/server/user.jobengine.log4j/.settings/org.eclipse.m2e.core.prefs b/server/user.jobengine.log4j/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000..14b697b7
--- /dev/null
+++ b/server/user.jobengine.log4j/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/server/user.jobengine.log4j/META-INF/MANIFEST.MF b/server/user.jobengine.log4j/META-INF/MANIFEST.MF
index e9bb79b9..e9ad3ec8 100644
--- a/server/user.jobengine.log4j/META-INF/MANIFEST.MF
+++ b/server/user.jobengine.log4j/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Log4j
-Bundle-SymbolicName: user.jobengine.log4j
-Bundle-Version: 1.0.0.qualifier
+Bundle-SymbolicName: user.jobengine.log4j;singleton:=true
+Bundle-Version: 1.0.0
 Automatic-Module-Name: user.jobengine.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .,
@@ -76,3 +76,4 @@ Import-Package: javax.mail;version="1.5.0",
  javax.mail.internet;version="1.5.0",
  javax.mail.util;version="1.5.0"
 Require-Bundle: org.eclipse.osgi;bundle-version="3.11.2"
+Bundle-ActivationPolicy: lazy
diff --git a/server/user.jobengine.log4j/pom.xml b/server/user.jobengine.log4j/pom.xml
new file mode 100644
index 00000000..ec86a31c
--- /dev/null
+++ b/server/user.jobengine.log4j/pom.xml
@@ -0,0 +1,48 @@
+<?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" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<parent>
+		<relativePath>../-modules</relativePath>
+		<groupId>user.jobengine</groupId>
+		<artifactId>MediaCube</artifactId>
+		<version>1.0.0</version>
+	</parent>
+	<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>
+				<version>2.7</version>
+				<executions>
+					<execution>
+						<id>copy-jar</id>
+						<phase>install</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.basedir}/../-product/target/deploy</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>
+		</plugins>
+	</build>
+	
+</project>
\ No newline at end of file