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 38d973be7ccf7e19999fb20e7f835a4760a47c7a..82dc366c434552c526ee5ac5e5828fb31b4ea6cb 100644 (file)
--- a/server/-modules/pom.xml
+++ b/server/-modules/pom.xml
@@ -15,7 +15,7 @@
                <module>../user.jobengine.osgi.db</module>\r
                <module>../user.jobengine.osgi.server</module>\r
                <module>../user.jobengine.osgi.services</module>\r
-               <module>../user.commons.log4j2</module>\r
+               <module>../user.jobengine.log4j</module>\r
                <module>../user.commons.zk</module>\r
                <module>../user.tsm.client</module>\r
                <module>../-product</module>\r

diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product
index 14d38d5841e30a23753aca1c48e5d026ee85077c..3eac024124325b99aa032f5e4ef31d9fa159babd 100644 (file)
--- 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"/>\r
       <plugin id="org.apache.httpcomponents.httpclient"/>\r
       <plugin id="org.apache.httpcomponents.httpcore"/>\r
-      <plugin id="org.apache.logging.log4j.api"/>\r
-      <plugin id="org.apache.logging.log4j.core"/>\r
-      <plugin id="org.apache.logging.log4j.slf4j-impl"/>\r
       <plugin id="org.apache.servicemix.bundles.quartz"/>\r
       <plugin id="org.eclipse.equinox.common"/>\r
       <plugin id="org.eclipse.equinox.console"/>\r
@@ -114,7 +111,6 @@
    </plugins>\r
 \r
    <configurations>\r
-      <plugin id="org.apache.logging.log4j.api" autoStart="true" startLevel="1" />\r
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />\r
       <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="1" />\r
       <plugin id="org.eclipse.jetty.osgi.boot" autoStart="true" startLevel="0" />\r

diff --git a/server/user.jobengine.log4j/.classpath b/server/user.jobengine.log4j/.classpath
index 4d79cc518349bff05a33cdaa78e57a22827a6ed7..62db7d5f03fb3a48f875195c33941dd5c952517c 100644 (file)
--- a/server/user.jobengine.log4j/.classpath
+++ b/server/user.jobengine.log4j/.classpath
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry exported="true" kind="lib" path="lib/log4j-slf4j-impl-2.17.2.jar"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">\r
+               <attributes>\r
+                       <attribute name="maven.pomderived" value="true"/>\r
+               </attributes>\r
+       </classpathentry>\r
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry kind="src" path="src/"/>\r
        <classpathentry exported="true" kind="lib" path="lib/log4j-api-2.17.2.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/log4j-core-2.17.2.jar"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src"/>\r
-       <classpathentry kind="output" path="bin"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/log4j-slf4j-impl-2.17.2.jar"/>\r
+       <classpathentry kind="output" path="target/classes"/>\r
 </classpath>\r

diff --git a/server/user.jobengine.log4j/.project b/server/user.jobengine.log4j/.project
index d074e0e49826332886ad4db75f567ebf874c57f2..6d2e5058e066cda86265bf37980d3ed100695c83 100644 (file)
--- a/server/user.jobengine.log4j/.project
+++ b/server/user.jobengine.log4j/.project
@@ -20,8 +20,14 @@
                        <arguments>\r
                        </arguments>\r
                </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.eclipse.m2e.core.maven2Builder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
        </buildSpec>\r
        <natures>\r
+               <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
                <nature>org.eclipse.pde.PluginNature</nature>\r
                <nature>org.eclipse.jdt.core.javanature</nature>\r
        </natures>\r

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 (file)
index 0000000..4824b80
--- /dev/null
+++ b/server/user.jobengine.log4j/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1\r
+encoding/<project>=UTF-8\r

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 e2860e997d22c44a21f286da9dc8382484932d11..ddd07851b673bc7c38220901645ed10f24d7fe04 100644 (file)
--- 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\r
 org.eclipse.jdt.core.compiler.compliance=1.8\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning\r
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore\r
 org.eclipse.jdt.core.compiler.release=disabled\r
 org.eclipse.jdt.core.compiler.source=1.8\r

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 (file)
index 0000000..14b697b
--- /dev/null
+++ b/server/user.jobengine.log4j/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=\r
+eclipse.preferences.version=1\r
+resolveWorkspaceProjects=true\r
+version=1\r

diff --git a/server/user.jobengine.log4j/META-INF/MANIFEST.MF b/server/user.jobengine.log4j/META-INF/MANIFEST.MF
index e9bb79b9999720af10544dc3caef43d06cae2c3d..e9ad3ec806b7ac48dd029dda2ca9d3ec6373dfb4 100644 (file)
--- 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 (file)
index 0000000..ec86a31
--- /dev/null
+++ b/server/user.jobengine.log4j/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"\r
+       xmlns="http://maven.apache.org/POM/4.0.0" \r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
+       <parent>\r
+               <relativePath>../-modules</relativePath>\r
+               <groupId>user.jobengine</groupId>\r
+               <artifactId>MediaCube</artifactId>\r
+               <version>1.0.0</version>\r
+       </parent>\r
+       <modelVersion>4.0.0</modelVersion>\r
+       <artifactId>user.jobengine.log4j</artifactId>\r
+       <packaging>eclipse-plugin</packaging>\r
+       <version>1.0.0</version>\r
+       \r
+       <build>\r
+               <plugins>\r
+\r
+                       <plugin>\r
+                               <groupId>org.apache.maven.plugins</groupId>\r
+                               <artifactId>maven-resources-plugin</artifactId>\r
+                               <version>2.7</version>\r
+                               <executions>\r
+                                       <execution>\r
+                                               <id>copy-jar</id>\r
+                                               <phase>install</phase>\r
+                                               <goals>\r
+                                                       <goal>copy-resources</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <outputDirectory>${project.basedir}/../-product/target/deploy</outputDirectory>\r
+                                                       <resources>\r
+                                                               <resource>\r
+                                                                       <directory>target</directory>\r
+                                                                       <includes>\r
+                                                                               <include>${project.artifactId}_${project.version}.jar</include>\r
+                                                                       </includes>\r
+                                                               </resource>\r
+                                                       </resources>\r
+                                                       <encoding>UTF-8</encoding>\r
+                                               </configuration>\r
+                                       </execution>\r
+                               </executions>\r
+                       </plugin>\r
+               </plugins>\r
+       </build>\r
+       \r
+</project>
\ No newline at end of file