Project config

diff --git a/server/user.jobengine.log4j/.classpath b/server/user.jobengine.log4j/.classpath
index 4247f09f22780b8e6c8fe60f0c3024391027f6a1..aadd1bb07e8a0ed71057bc33e52783b7ded60927 100644 (file)
--- a/server/user.jobengine.log4j/.classpath
+++ b/server/user.jobengine.log4j/.classpath
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\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.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 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 exported="true" kind="lib" path="lib/log4j-slf4j-impl-2.17.2.jar"/>\r
-       <classpathentry kind="output" path="bin"/>\r
+       <classpathentry kind="output" path="target/classes"/>\r
 </classpath>\r

diff --git a/server/user.jobengine.log4j/pom.xml b/server/user.jobengine.log4j/pom.xml
index a4ed40a934285704b3b2de32c40fc8e20f7d1d6c..10b3ceb72abdf2157995edc3c3e05aa00eab5fcd 100644 (file)
--- 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"?>\r
-<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"\r
+<project\r
+       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
@@ -10,10 +12,8 @@
        <modelVersion>4.0.0</modelVersion>\r
        <artifactId>user.jobengine.log4j</artifactId>\r
        <packaging>eclipse-plugin</packaging>\r
-       <version>1.0.0</version>\r
        <build>\r
                <plugins>\r
-\r
                        <plugin>\r
                                <groupId>org.apache.maven.plugins</groupId>\r
                                <artifactId>maven-resources-plugin</artifactId>\r
@@ -26,12 +26,14 @@
                                                        <goal>copy-resources</goal>\r
                                                </goals>\r
                                                <configuration>\r
-                                                       <outputDirectory>${project.basedir}/../-product/target/deploy</outputDirectory>\r
+                                                       <outputDirectory>\r
+                                                               ${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
+                                                                               <include>\r
+                                                                                       ${project.artifactId}_${project.version}.jar</include>\r
                                                                        </includes>\r
                                                                </resource>\r
                                                        </resources>\r
@@ -42,5 +44,5 @@
                        </plugin>\r
                </plugins>\r
        </build>\r
-       \r
+\r
 </project>
\ No newline at end of file

diff --git a/server/user.mediacube.gui/.classpath b/server/user.mediacube.gui/.classpath
index 619e72b0dd9a99227148eca8408104e7eb805635..0a6e3a46adccf4350c201a9c98c3443d43e16d9e 100644 (file)
--- a/server/user.mediacube.gui/.classpath
+++ b/server/user.mediacube.gui/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry exported="true" kind="lib" path="lib/userdark-1.0.0.jar"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r

diff --git a/server/user.mediacube.gui/META-INF/MANIFEST.MF b/server/user.mediacube.gui/META-INF/MANIFEST.MF
index a5c9ed0089e8a3a25d148f3de818b636201046e4..9d7555f08544acc955d42d0b8b5773eff24fd918 100644 (file)
--- 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 1c7ea1b1d309ec792161d1961413a5477afe90d6..956a232acdcdb22fe77908541300abc358f54aa0 100644 (file)
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