merge issues fixed
Change-Id: Ib8693f499c57f7458f8329c2d8c729630a4220b8
diff --git a/core/contexts/org.eclipse.rcptt.ctx.preferences/gen-src/org/eclipse/rcptt/preferences/ListPrefData.java b/core/contexts/org.eclipse.rcptt.ctx.preferences/gen-src/org/eclipse/rcptt/preferences/ListPrefData.java
index 4da2a8d..da90b16 100644
--- a/core/contexts/org.eclipse.rcptt.ctx.preferences/gen-src/org/eclipse/rcptt/preferences/ListPrefData.java
+++ b/core/contexts/org.eclipse.rcptt.ctx.preferences/gen-src/org/eclipse/rcptt/preferences/ListPrefData.java
@@ -5,8 +5,9 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
- * $Id$
- */
+ * Contributors:
+ * Xored Software Inc - initial API and implementation and/or initial documentation
+ *******************************************************************************/
package org.eclipse.rcptt.preferences;
import org.eclipse.emf.common.util.EList;
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.filesystem/gen-src/org/eclipse/rcptt/ecl/filesystem/impl/FilesystemFactoryImpl.java b/ecl/plugins/org.eclipse.rcptt.ecl.filesystem/gen-src/org/eclipse/rcptt/ecl/filesystem/impl/FilesystemFactoryImpl.java
index fd319b2..8b94006 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.filesystem/gen-src/org/eclipse/rcptt/ecl/filesystem/impl/FilesystemFactoryImpl.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.filesystem/gen-src/org/eclipse/rcptt/ecl/filesystem/impl/FilesystemFactoryImpl.java
@@ -36,7 +36,7 @@
*/
public static FilesystemFactory init() {
try {
- FilesystemFactory theFilesystemFactory = (FilesystemFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/ecl/filesystem.ecore");
+ FilesystemFactory theFilesystemFactory = (FilesystemFactory)EPackage.Registry.INSTANCE.getEFactory(FilesystemPackage.eNS_URI);
if (theFilesystemFactory != null) {
return theFilesystemFactory;
}
diff --git a/ecl/repository/category.xml b/ecl/repository/category.xml
new file mode 100644
index 0000000..79f1f21
--- /dev/null
+++ b/ecl/repository/category.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature url="features/org.eclipse.rcptt.ecl.core_1.5.4.qualifier.jar" id="org.eclipse.rcptt.ecl.core" version="1.5.4.qualifier">
+ <category name="ecl"/>
+ </feature>
+ <feature url="features/org.eclipse.rcptt.ecl.server_1.5.4.qualifier.jar" id="org.eclipse.rcptt.ecl.server" version="1.5.4.qualifier">
+ <category name="ecl"/>
+ </feature>
+ <feature url="features/org.eclipse.rcptt.ecl.server.ui_1.5.4.qualifier.jar" id="org.eclipse.rcptt.ecl.server.ui" version="1.5.4.qualifier">
+ <category name="ecl"/>
+ </feature>
+ <feature url="features/org.eclipse.rcptt.ecl.shell_1.5.4.qualifier.jar" id="org.eclipse.rcptt.ecl.shell" version="1.5.4.qualifier">
+ <category name="ecl"/>
+ </feature>
+ <feature url="features/org.eclipse.rcptt.ecl.platform_1.5.4.qualifier.jar" id="org.eclipse.rcptt.ecl.platform" version="1.5.4.qualifier">
+ <category name="ecl"/>
+ </feature>
+ <feature url="features/org.eclipse.rcptt.ecl.platform.ui_1.5.4.qualifier.jar" id="org.eclipse.rcptt.ecl.platform.ui" version="1.5.4.qualifier">
+ <category name="ecl"/>
+ </feature>
+ <feature url="features/org.eclipse.rcptt.ecl.ide_1.5.4.qualifier.jar" id="org.eclipse.rcptt.ecl.ide" version="1.5.4.qualifier">
+ <category name="ecl"/>
+ </feature>
+ <category-def name="ecl" label="Eclipse Command Language"/>
+</site>
