Config changes

diff --git a/server/hu.user.mediacube.indexer/.classpath b/server/hu.user.mediacube.indexer/.classpath
index 397d43fd03cedbddfef5690817080ca098aa7eaf..a98de71f75ecfc7a16c00fae82560e7d3351dc0d 100644 (file)
--- 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"?>\r
+\r
+<!DOCTYPE xml>\r
 <classpath>\r
        <classpathentry kind="src" output="target/classes" path="src/main/java">\r
                <attributes>\r
@@ -10,13 +12,11 @@
                <attributes>\r
                        <attribute name="test" value="true"/>\r
                        <attribute name="maven.pomderived" value="true"/>\r
-                       <attribute name="optional" value="true"/>\r
                </attributes>\r
        </classpathentry>\r
        <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">\r
                <attributes>\r
                        <attribute name="maven.pomderived" value="true"/>\r
-                       <attribute name="optional" value="true"/>\r
                </attributes>\r
        </classpathentry>\r
        <classpathentry kind="src" output="target/test-classes" path="src/test/java">\r

diff --git a/server/hu.user.theme.userdark/.classpath b/server/hu.user.theme.userdark/.classpath
index ac341a8c8d0433970bc866b61ac9cc62142cb9f0..a7fe5f1f0810ffb66c6aa5b936dd3cf7bbd1f726 100644 (file)
--- 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"?>\r
 <classpath>\r
-       <classpathentry including="**/*.java" kind="src" output="target/classes" path="src">\r
+       <classpathentry including="**/*.java" kind="src" path="src">\r
                <attributes>\r
                        <attribute name="optional" value="true"/>\r
                        <attribute name="maven.pomderived" value="true"/>\r
@@ -11,7 +11,7 @@
                        <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.7">\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 2268f09b2ea911dab27738f898c065b5f1456987..51be433b0b4e15e12f2b9d78a7f75fae89a46e6b 100644 (file)
--- 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"?>\r
-\r
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-       <modelVersion>4.0.0</modelVersion>\r
-       <groupId>user.theme</groupId>\r
-       <artifactId>userdark</artifactId>\r
-       <packaging>jar</packaging>\r
-       <version>1.0.0</version>\r
-       <name>ZK User Dark</name>\r
-       <description>ZK User Dark Theme</description>\r
-       <properties>\r
-               <zk.version>8.0.3</zk.version>\r
-       </properties>\r
-       <pluginRepositories>\r
-               <pluginRepository>\r
-                       <id>zkmaven</id>\r
-                       <name>ZK Maven Plugin Repository</name>\r
-                       <url>https://mavensync.zkoss.org/maven2</url>\r
-               </pluginRepository>\r
-               <pluginRepository>\r
-                       <id>maven-bundle-plugin</id>\r
-                       <name>bnd maven plugin</name>\r
-                       <url>https://repo1.maven.org/maven2</url>\r
-               </pluginRepository>\r
-       </pluginRepositories>\r
-       <dependencies>\r
-               <dependency>\r
-                       <groupId>org.zkoss.zk</groupId>\r
-                       <artifactId>zk</artifactId>\r
-                       <version>${zk.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.zkoss.zk</groupId>\r
-                       <artifactId>zul</artifactId>\r
-                       <version>${zk.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.zkoss.zk</groupId>\r
-                       <artifactId>zkmax</artifactId>\r
-                       <version>${zk.version}</version>\r
-               </dependency>\r
-       </dependencies>\r
-       \r
-       <build>\r
-               <sourceDirectory>${project.basedir}/src/</sourceDirectory>\r
-               <resources>\r
-                       <resource>\r
-                               <directory>${project.basedir}/src/archive</directory>\r
-                       </resource>\r
-               </resources>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.zkoss.maven</groupId>\r
-                               <artifactId>zkless-engine-maven-plugin</artifactId>\r
-                               <version>1.0.0</version>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>compile-less</id>\r
-                                               <goals>\r
-                                                       <goal>lessc</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <sourceDirectory>${project.basedir}/src/archive</sourceDirectory>\r
-                                                       <outputDirectory>${project.basedir}/target/classes</outputDirectory>\r
-                                               </configuration>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\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}/../user.mediacube.gui/lib</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
-                       <!-- \r
-                   <plugin>\r
-                     <groupId>org.apache.maven.plugins</groupId>\r
-                     <artifactId>maven-jar-plugin</artifactId>\r
-                     <version>2.3.1</version>\r
-                     <configuration>\r
-                       <outputDirectory>${project.parent.basedir}/user.commons.zk/lib</outputDirectory>\r
-                     </configuration>\r
-                   </plugin>\r
-                       <plugin>\r
-                               <groupId>org.reficio</groupId>\r
-                               <artifactId>p2-maven-plugin</artifactId>\r
-                               <version>1.7.0</version>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>default-cli</id>\r
-                                               <configuration>\r
-                                                       <artifacts>\r
-                                                               <artifact>\r
-                                                                       <id>user.theme:userdark:1.0.0</id>\r
-                                                                       <transitive>false</transitive>\r
-                                                               </artifact>\r
-                                                       </artifacts>\r
-                                               </configuration>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-                       -->\r
-               </plugins>\r
-       </build>\r
-</project>\r
+<?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 6203ff038610a98d7cfab5dd709c7d13b79e0cae..ba66f8d4c72f106043220e9462aabdf2e415c1aa 100644 (file)
--- 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">\r
         <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
     </listAttribute>\r
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>\r
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>\r
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>\r
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/user.commons.zk}"/>\r
 </launchConfiguration>\r