Dark theme dependency style modified

diff --git a/server/-configuration/run-mediacube-server-hirtv.launch b/server/-configuration/run-mediacube-server-hirtv.launch
index 3d90701c48f6d7a8db91c2bb508051bb76914257..dc9e0b79c682c95c5e7d5006b843b9e3df9c594e 100644 (file)
--- 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"/>\r
         <setEntry value="slf4j.api@default:default"/>\r
         <setEntry value="slf4j.simple@default:false"/>\r
-        <setEntry value="user.theme.userdark@default:default"/>\r
     </setAttribute>\r
     <setAttribute key="selected_workspace_bundles">\r
         <setEntry value="user.commons.zk@default:default"/>\r

diff --git a/server/-dependencies/jobengine-theme.target b/server/-dependencies/jobengine-theme.target
index 16b24aa9390479220ca9e87d32c87768d9230984..a424cf7d797b88a3cbf7e6567927690bab39f9a5 100644 (file)
--- 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 a979c4decda0602c22607d7f12f657d6e5022363..82dc366c434552c526ee5ac5e5828fb31b4ea6cb 100644 (file)
--- a/server/-modules/pom.xml
+++ b/server/-modules/pom.xml
@@ -43,11 +43,6 @@
                        <layout>p2</layout>\r
                        <url>file:${project.basedir}/../-dependencies/target/repository/</url>\r
                </repository>\r
-               <repository>\r
-                       <id>theme</id>\r
-                       <layout>p2</layout>\r
-                       <url>file:${project.basedir}/../hu.user.theme.userdark/target/repository/</url>\r
-               </repository>\r
        </repositories>\r
 \r
        <build>\r

diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product
index ee07e55552df237c18dcbcab1368ea165397f5f3..7f48d93d92162e95cd82f957dd59c21b1a6ddacc 100644 (file)
--- a/server/-product/mediacube.product
+++ b/server/-product/mediacube.product
@@ -105,7 +105,6 @@
       <plugin id="user.jobengine.osgi.services"/>\r
       <plugin id="user.mediacube.gui"/>\r
       <plugin id="user.mediacube.metadata"/>\r
-      <plugin id="user.theme.userdark"/>\r
       <plugin id="user.tsm.client"/>\r
    </plugins>\r
 \r

diff --git a/server/hu.user.theme.userdark/.classpath b/server/hu.user.theme.userdark/.classpath
index 6c7c3b0269b2d1deac412a1d78b848cbd3b3d207..05f70db394ea7b8480886e6edfac3bcc94fbefcd 100644 (file)
--- a/server/hu.user.theme.userdark/.classpath
+++ b/server/hu.user.theme.userdark/.classpath
@@ -6,12 +6,12 @@
                        <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/J2SE-1.5">\r
+       <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">\r
                <attributes>\r
                        <attribute name="maven.pomderived" value="true"/>\r
                </attributes>\r
        </classpathentry>\r
-       <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">\r
                <attributes>\r
                        <attribute name="maven.pomderived" value="true"/>\r
                </attributes>\r

diff --git a/server/hu.user.theme.userdark/pom.xml b/server/hu.user.theme.userdark/pom.xml
index 53733a8ad597b7d171523311712dab7e3d9dc7b4..51be433b0b4e15e12f2b9d78a7f75fae89a46e6b 100644 (file)
--- 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 00e79319d4d0c05cb1357635784b930f41401de4..ba66f8d4c72f106043220e9462aabdf2e415c1aa 100644 (file)
--- 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"?>\r
-<!DOCTYPE xml>\r
-\r
 <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">\r
+    <intAttribute key="M2_COLORS" value="0"/>\r
     <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>\r
-    <stringAttribute key="M2_GOALS" value="clean install"/>\r
+    <stringAttribute key="M2_GOALS" value="clean package install"/>\r
     <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>\r
     <booleanAttribute key="M2_OFFLINE" value="false"/>\r
     <stringAttribute key="M2_PROFILES" value=""/>\r
@@ -14,6 +13,7 @@
     <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>\r
     <stringAttribute key="M2_USER_SETTINGS" value=""/>\r
     <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>\r
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>\r
     <listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
         <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
     </listAttribute>\r

diff --git a/server/user.commons.zk/pom.xml b/server/user.commons.zk/pom.xml
index 42bffbdced99c7209349e091a7724bd551b73f13..c96e5bef8675481de07048d76383116d6de8e443 100644 (file)
--- a/server/user.commons.zk/pom.xml
+++ b/server/user.commons.zk/pom.xml
@@ -28,7 +28,7 @@
                                                        <file>lib/zk.jar</file>\r
                                                        <groupId>org.zkoss.zk</groupId>\r
                                                        <artifactId>zk</artifactId>\r
-                                                       <version>${version}</version>\r
+                                                       <version>${project.version}</version>\r
                                                        <packaging>jar</packaging>\r
                                                </configuration>\r
                                        </execution>\r
@@ -42,7 +42,7 @@
                                                        <file>lib/zul.jar</file>\r
                                                        <groupId>org.zkoss.zk</groupId>\r
                                                        <artifactId>zul</artifactId>\r
-                                                       <version>${version}</version>\r
+                                                       <version>${project.version}</version>\r
                                                        <packaging>jar</packaging>\r
                                                </configuration>\r
                                        </execution>\r
@@ -56,7 +56,7 @@
                                                        <file>lib/zkmax.jar</file>\r
                                                        <groupId>org.zkoss.zk</groupId>\r
                                                        <artifactId>zkmax</artifactId>\r
-                                                       <version>${version}</version>\r
+                                                       <version>${project.version}</version>\r
                                                        <packaging>jar</packaging>\r
                                                </configuration>\r
                                        </execution>\r

diff --git a/server/user.jobengine.osgi.services/build-services-module.launch b/server/user.jobengine.osgi.services/build-services-module.launch
index b7d4e22d32dd2c5525edb28881ad584a96b0f89a..0860635346127dc7a3f7fc41336bd8f1eeb2f9ef 100644 (file)
--- 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"?>\r
 <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">\r
+    <intAttribute key="M2_COLORS" value="0"/>\r
     <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>\r
     <stringAttribute key="M2_GOALS" value="clean install"/>\r
     <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>\r
@@ -12,5 +13,6 @@
     <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>\r
     <stringAttribute key="M2_USER_SETTINGS" value=""/>\r
     <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>\r
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>\r
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/user.jobengine.osgi.services}"/>\r
 </launchConfiguration>\r

diff --git a/server/user.mediacube.gui/.classpath b/server/user.mediacube.gui/.classpath
index 190fd9b00fe8524e79e8e09bcf0bf94343ceaf8c..2dfbbd1bf4c42bd1bccff859f40fc938aa0a6488 100644 (file)
--- a/server/user.mediacube.gui/.classpath
+++ b/server/user.mediacube.gui/.classpath
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE xml>\r
-\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 77da9444632c6c51ec07be925d43303acb788aa3..a5c9ed0089e8a3a25d148f3de818b636201046e4 100644 (file)
--- 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 209d9de15a7480bbe46db638088ae93d116a4817..d63ad93d0711ad551d444900485959ff6d44ca57 100644 (file)
--- a/server/user.mediacube.gui/build.properties
+++ b/server/user.mediacube.gui/build.properties
@@ -1,5 +1,15 @@
 source.. = src/,\\r
            test/\r
 output.. = bin/\r
-bin.includes = .,META-INF/,OSGI-INF/,WEB-INF/,index.zul,pages/,css/,img/,js/,resources/\r
+bin.includes = .,\\r
+               META-INF/,\\r
+               OSGI-INF/,\\r
+               WEB-INF/,\\r
+               index.zul,\\r
+               pages/,\\r
+               css/,\\r
+               img/,\\r
+               js/,\\r
+               resources/,\\r
+               lib/\r
 src.includes = .,WEB-INF/,index.zul,pages/,css/,img/,js/,resources/\r

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 (file)
index 0000000..5344a95
Binary files /dev/null and b/server/user.mediacube.gui/lib/userdark-1.0.0.jar differ