aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbveliev2011-10-22 05:38:54 (EDT)
committerbveliev2011-10-22 05:38:54 (EDT)
commit4408a8d869288f6a6996485fcfa5b23d537c361f (patch)
treec5cc6a74d92fe7db42607473b802de29c56774b8
parent71db7cd0a707c93445b4ea4a8dc204255678ffa0 (diff)
downloadorg.eclipse.rtp-4408a8d869288f6a6996485fcfa5b23d537c361f.zip
org.eclipse.rtp-4408a8d869288f6a6996485fcfa5b23d537c361f.tar.gz
org.eclipse.rtp-4408a8d869288f6a6996485fcfa5b23d537c361f.tar.bz2
NEW - bug 361723: [Configurator] Rename
org.eclipse.rtp.configurator.model to org.eclipse.rtp.core.model https://bugs.eclipse.org/bugs/show_bug.cgi?id=361723
-rw-r--r--bundles/org.eclipse.rtp.configurator.console/RT Configurator Console.launch4
-rw-r--r--bundles/org.eclipse.rtp.configurator.feature/feature.xml104
-rw-r--r--bundles/org.eclipse.rtp.configurator.model/OSGI-INF/sourceUnMarshaler.xml7
-rw-r--r--bundles/org.eclipse.rtp.core.model/.classpath (renamed from bundles/org.eclipse.rtp.configurator.model/.classpath)0
-rw-r--r--bundles/org.eclipse.rtp.core.model/.project (renamed from bundles/org.eclipse.rtp.configurator.model/.project)66
-rw-r--r--bundles/org.eclipse.rtp.core.model/.settings/org.eclipse.jdt.core.prefs (renamed from bundles/org.eclipse.rtp.configurator.model/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--bundles/org.eclipse.rtp.core.model/.settings/org.eclipse.jdt.ui.prefs (renamed from bundles/org.eclipse.rtp.configurator.model/.settings/org.eclipse.jdt.ui.prefs)0
-rw-r--r--bundles/org.eclipse.rtp.core.model/.settings/org.eclipse.pde.core.prefs (renamed from bundles/org.eclipse.rtp.configurator.model/.settings/org.eclipse.pde.core.prefs)0
-rw-r--r--bundles/org.eclipse.rtp.core.model/META-INF/MANIFEST.MF (renamed from bundles/org.eclipse.rtp.configurator.model/META-INF/MANIFEST.MF)4
-rw-r--r--bundles/org.eclipse.rtp.core.model/OSGI-INF/sourceUnMarshaler.xml7
-rw-r--r--bundles/org.eclipse.rtp.core.model/build.properties (renamed from bundles/org.eclipse.rtp.configurator.model/build.properties)0
-rw-r--r--bundles/org.eclipse.rtp.core.model/pom.xml (renamed from bundles/org.eclipse.rtp.configurator.model/pom.xml)2
-rw-r--r--bundles/org.eclipse.rtp.core.model/src/org/eclipse/rtp/core/model/Feature.java (renamed from bundles/org.eclipse.rtp.configurator.model/src/org/eclipse/rtp/configurator/model/Feature.java)2
-rw-r--r--bundles/org.eclipse.rtp.core.model/src/org/eclipse/rtp/core/model/Source.java (renamed from bundles/org.eclipse.rtp.configurator.model/src/org/eclipse/rtp/configurator/model/Source.java)2
-rw-r--r--bundles/org.eclipse.rtp.core.model/src/org/eclipse/rtp/core/model/SourceProvider.java (renamed from bundles/org.eclipse.rtp.configurator.model/src/org/eclipse/rtp/configurator/model/SourceProvider.java)2
-rw-r--r--bundles/org.eclipse.rtp.core.model/src/org/eclipse/rtp/core/model/SourceUnMarshaller.java (renamed from bundles/org.eclipse.rtp.configurator.model/src/org/eclipse/rtp/configurator/model/SourceUnMarshaller.java)2
-rw-r--r--bundles/org.eclipse.rtp.core.model/src/org/eclipse/rtp/core/model/SourceVersion.java (renamed from bundles/org.eclipse.rtp.configurator.model/src/org/eclipse/rtp/configurator/model/SourceVersion.java)2
-rw-r--r--bundles/org.eclipse.rtp.core.model/src/org/eclipse/rtp/core/model/internal/SourceUnMarshallerImpl.java (renamed from bundles/org.eclipse.rtp.configurator.model/src/org/eclipse/rtp/configurator/model/internal/SourceUnMarshallerImpl.java)6
-rw-r--r--bundles/org.eclipse.rtp.core.service.provider/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.rtp.core.service.provider/OSGI-INF/rtpConfiguratorModel.xml2
-rw-r--r--bundles/org.eclipse.rtp.core.service.provider/src/org/eclipse/rtp/configurator/service/provider/internal/DefaultConfiguratorService.java7
-rw-r--r--bundles/org.eclipse.rtp.core.service.provider/src/org/eclipse/rtp/configurator/service/provider/internal/deploy/FeatureManager.java4
-rw-r--r--bundles/org.eclipse.rtp.core.service.provider/src/org/eclipse/rtp/configurator/service/provider/internal/util/ConfiguratorModelUtil.java4
-rw-r--r--packages/org.eclipse.rtp.package.products/org.eclipse.rtp.package.basic.product94
-rw-r--r--packages/org.eclipse.rtp.releng/pom.xml2
-rw-r--r--tests/org.eclipse.rtp.core.model.test/.classpath (renamed from tests/org.eclipse.rtp.configurator.model.test/.classpath)0
-rw-r--r--tests/org.eclipse.rtp.core.model.test/.project (renamed from tests/org.eclipse.rtp.configurator.model.test/.project)2
-rw-r--r--tests/org.eclipse.rtp.core.model.test/.settings/org.eclipse.jdt.core.prefs (renamed from tests/org.eclipse.rtp.configurator.model.test/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--tests/org.eclipse.rtp.core.model.test/.settings/org.eclipse.jdt.ui.prefs (renamed from tests/org.eclipse.rtp.configurator.model.test/.settings/org.eclipse.jdt.ui.prefs)0
-rw-r--r--tests/org.eclipse.rtp.core.model.test/.settings/org.eclipse.pde.core.prefs (renamed from tests/org.eclipse.rtp.configurator.model.test/.settings/org.eclipse.pde.core.prefs)0
-rw-r--r--tests/org.eclipse.rtp.core.model.test/META-INF/MANIFEST.MF (renamed from tests/org.eclipse.rtp.configurator.model.test/META-INF/MANIFEST.MF)4
-rw-r--r--tests/org.eclipse.rtp.core.model.test/build.properties (renamed from tests/org.eclipse.rtp.configurator.model.test/build.properties)0
-rw-r--r--tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/FeatureTest.java (renamed from tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/FeatureTest.java)3
-rw-r--r--tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/SourceProviderTest.java (renamed from tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/SourceProviderTest.java)4
-rw-r--r--tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/SourceTest.java (renamed from tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/SourceTest.java)5
-rw-r--r--tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/SourceUnMarshallerTest.java (renamed from tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/SourceUnMarshallerTest.java)9
-rw-r--r--tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/SourceVersionTest.java (renamed from tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/SourceVersionTest.java)3
-rw-r--r--tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/example-sources.json (renamed from tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/example-sources.json)0
-rw-r--r--tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/test/AllModelTestSuite.java (renamed from tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/test/AllModelTestSuite.java)10
-rw-r--r--tests/org.eclipse.rtp.core.service.provider.test/src/org/eclipse/rtp/configurator/service/provider/internal/ConfiguratorServiceSearchTest.java4
-rw-r--r--tests/org.eclipse.rtp.core.service.provider.test/src/org/eclipse/rtp/configurator/service/provider/internal/ConfiguratorServiceTest.java4
-rw-r--r--tests/org.eclipse.rtp.core.service.provider.test/src/org/eclipse/rtp/configurator/service/provider/internal/deploy/FeatureManagerTest.java2
-rw-r--r--tests/org.eclipse.rtp.core.service.provider.test/src/org/eclipse/rtp/configurator/service/provider/internal/util/Fixture.java4
43 files changed, 195 insertions, 184 deletions
diff --git a/bundles/org.eclipse.rtp.configurator.console/RT Configurator Console.launch b/bundles/org.eclipse.rtp.configurator.console/RT Configurator Console.launch
index fae1a14..9c92466 100644
--- a/bundles/org.eclipse.rtp.configurator.console/RT Configurator Console.launch
+++ b/bundles/org.eclipse.rtp.configurator.console/RT Configurator Console.launch
@@ -16,9 +16,9 @@
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true"/>
<stringAttribute key="pde.version" value="3.3"/>
<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="target_bundles" value="com.google.gson@default:default,javax.servlet@default:default,org.apache.ant@default:default,org.apache.commons.io@default:default,org.easymock@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.optional.junit@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@default:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.hamcrest.integration@default:default,org.hamcrest.library@default:default,org.hamcrest.text@default:default,org.hamcrest@default:default,org.junit*4.8.2.v4_8_2_v20110321-1705@default:default,org.mockito@default:default,org.objenesis@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default"/>
+<stringAttribute key="target_bundles" value="com.google.gson@default:default,javax.servlet@default:default,org.apache.ant@default:default,org.apache.commons.io@default:default,org.easymock@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.optional.junit@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@default:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.hamcrest.integration@default:default,org.hamcrest.library@default:default,org.hamcrest.text@default:default,org.hamcrest@default:default,org.junit*4.8.2.v4_8_2_v20110321-1705@default:default,org.mockito@default:default,org.objenesis@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="org.eclipes.rtp.core@default:default,org.eclipse.rtp.configurator.console@default:default,org.eclipse.rtp.configurator.model.test@default:false,org.eclipse.rtp.configurator.model@default:default,org.eclipse.rtp.configurator.test@default:false,org.eclipse.rtp.core.service.provider.test@default:false,org.eclipse.rtp.core.service.provider@default:default,org.eclipse.rtp.core.test@default:default"/>
+<stringAttribute key="workspace_bundles" value="org.eclipse.rtp.configurator.console@default:default,org.eclipse.rtp.configurator.test@default:false,org.eclipse.rtp.core.model.test@default:false,org.eclipse.rtp.core.model@default:default,org.eclipse.rtp.core.service.provider.test@default:false,org.eclipse.rtp.core.service.provider@default:default,org.eclipse.rtp.core.test@default:default,org.eclipse.rtp.core@default:default"/>
</launchConfiguration>
diff --git a/bundles/org.eclipse.rtp.configurator.feature/feature.xml b/bundles/org.eclipse.rtp.configurator.feature/feature.xml
index 2f82b45..d394d12 100644
--- a/bundles/org.eclipse.rtp.configurator.feature/feature.xml
+++ b/bundles/org.eclipse.rtp.configurator.feature/feature.xml
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.rtp.configurator.feature"
- label="%featureName"
- version="1.0.0.qualifier"
- provider-name="%featureName">
-
- <copyright url="http://www.example.com/copyright">
- %copyright
- </copyright>
-
- <license url="http://www.example.com/license">
- [Enter License Description here.]
- </license>
-
- <includes
- id="org.eclipse.equinox.p2.core.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.rcp"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.rtp.configurator.console"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.rtp.configurator.model"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.rtp.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.rtp.core.service.provider"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.rtp.configurator.feature"
+ label="%featureName"
+ version="1.0.0.qualifier"
+ provider-name="%featureName">
+
+ <copyright url="http://www.example.com/copyright">
+ %copyright
+ </copyright>
+
+ <license url="http://www.example.com/license">
+ [Enter License Description here.]
+ </license>
+
+ <includes
+ id="org.eclipse.equinox.p2.core.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.rcp"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.rtp.configurator.console"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.rtp.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.rtp.core.service.provider"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.rtp.core.model"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/bundles/org.eclipse.rtp.configurator.model/OSGI-INF/sourceUnMarshaler.xml b/bundles/org.eclipse.rtp.configurator.model/OSGI-INF/sourceUnMarshaler.xml
deleted file mode 100644
index c91b94e..0000000
--- a/bundles/org.eclipse.rtp.configurator.model/OSGI-INF/sourceUnMarshaler.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.rtp.configurator.model">
- <implementation class="org.eclipse.rtp.configurator.model.internal.SourceUnMarshallerImpl"/>
- <service>
- <provide interface="org.eclipse.rtp.configurator.model.SourceUnMarshaller"/>
- </service>
-</scr:component>
diff --git a/bundles/org.eclipse.rtp.configurator.model/.classpath b/bundles/org.eclipse.rtp.core.model/.classpath
index ad32c83..ad32c83 100644
--- a/bundles/org.eclipse.rtp.configurator.model/.classpath
+++ b/bundles/org.eclipse.rtp.core.model/.classpath
diff --git a/bundles/org.eclipse.rtp.configurator.model/.project b/bundles/org.eclipse.rtp.core.model/.project
index ac18bf7..ae744d9 100644
--- a/bundles/org.eclipse.rtp.configurator.model/.project
+++ b/bundles/org.eclipse.rtp.core.model/.project
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.rtp.configurator.model</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ds.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.rtp.core.model</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.rtp.configurator.model/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.rtp.core.model/.settings/org.eclipse.jdt.core.prefs
index 3dd9ba6..3dd9ba6 100644
--- a/bundles/org.eclipse.rtp.configurator.model/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.rtp.core.model/.settings/org.eclipse.jdt.core.prefs
diff --git a/bundles/org.eclipse.rtp.configurator.model/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.rtp.core.model/.settings/org.eclipse.jdt.ui.prefs
index dacffb7..dacffb7 100644
--- a/bundles/org.eclipse.rtp.configurator.model/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.rtp.core.model/.settings/org.eclipse.jdt.ui.prefs
diff --git a/bundles/org.eclipse.rtp.configurator.model/.settings/org.eclipse.pde.core.prefs b/bundles/org.eclipse.rtp.core.model/.settings/org.eclipse.pde.core.prefs
index 7d61edf..7d61edf 100644
--- a/bundles/org.eclipse.rtp.configurator.model/.settings/org.eclipse.pde.core.prefs
+++ b/bundles/org.eclipse.rtp.core.model/.settings/org.eclipse.pde.core.prefs
diff --git a/bundles/org.eclipse.rtp.configurator.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.rtp.core.model/META-INF/MANIFEST.MF
index 4bf826a..a7e61d9 100644
--- a/bundles/org.eclipse.rtp.configurator.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rtp.core.model/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Configurator Model
-Bundle-SymbolicName: org.eclipse.rtp.configurator.model
+Bundle-SymbolicName: org.eclipse.rtp.core.model
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: com.google.gson;version="[1.6.0,2.0.0)",
com.google.gson.stream;version="[1.6.0,2.0.0)"
-Export-Package: org.eclipse.rtp.configurator.model;version="1.0.0"
+Export-Package: org.eclipse.rtp.core.model;version="1.0.0"
Service-Component: OSGI-INF/sourceUnMarshaler.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.rtp.core.model/OSGI-INF/sourceUnMarshaler.xml b/bundles/org.eclipse.rtp.core.model/OSGI-INF/sourceUnMarshaler.xml
new file mode 100644
index 0000000..ffd782e
--- /dev/null
+++ b/bundles/org.eclipse.rtp.core.model/OSGI-INF/sourceUnMarshaler.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.rtp.core.model">
+ <implementation class="org.eclipse.rtp.core.model.internal.SourceUnMarshallerImpl"/>
+ <service>
+ <provide interface="org.eclipse.rtp.core.model.SourceUnMarshaller"/>
+ </service>
+</scr:component>
diff --git a/bundles/org.eclipse.rtp.configurator.model/build.properties b/bundles/org.eclipse.rtp.core.model/build.properties
index 680ce68..680ce68 100644
--- a/bundles/org.eclipse.rtp.configurator.model/build.properties
+++ b/bundles/org.eclipse.rtp.core.model/build.properties
diff --git a/bundles/org.eclipse.rtp.configurator.model/pom.xml b/bundles/org.eclipse.rtp.core.model/pom.xml
index fbf4924..cfa105a 100644
--- a/bundles/org.eclipse.rtp.configurator.model/pom.xml
+++ b/bundles/org.eclipse.rtp.core.model/pom.xml
@@ -14,7 +14,7 @@
<relativePath>../../packages/org.eclipse.rtp.releng/pom.xml</relativePath>
</parent>
<groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.rtp.configurator.model</artifactId>
+ <artifactId>org.eclipse.rtp.core.model</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.rtp.configurator.model/src/org/eclipse/rtp/configurator/model/Feature.java b/bundles/org.eclipse.rtp.core.model/src/org/eclipse/rtp/core/model/Feature.java
index a24ae96..0d6750f 100644
--- a/bundles/org.eclipse.rtp.configurator.model/src/org/eclipse/rtp/configurator/model/Feature.java
+++ b/bundles/org.eclipse.rtp.core.model/src/org/eclipse/rtp/core/model/Feature.java
@@ -1,4 +1,4 @@
-package org.eclipse.rtp.configurator.model;
+package org.eclipse.rtp.core.model;
public class Feature {
diff --git a/bundles/org.eclipse.rtp.configurator.model/src/org/eclipse/rtp/configurator/model/Source.java b/bundles/org.eclipse.rtp.core.model/src/org/eclipse/rtp/core/model/Source.java
index 04976e9..01e1e77 100644
--- a/bundles/org.eclipse.rtp.configurator.model/src/org/eclipse/rtp/configurator/model/Source.java
+++ b/bundles/org.eclipse.rtp.core.model/src/org/eclipse/rtp/core/model/Source.java
@@ -7,7 +7,7 @@
* Contributors:
* EclipseSource - initial API and implementation
*******************************************************************************/
-package org.eclipse.rtp.configurator.model;
+package org.eclipse.rtp.core.model;
import java.util.ArrayList;
import java.util.List;
diff --git a/bundles/org.eclipse.rtp.configurator.model/src/org/eclipse/rtp/configurator/model/SourceProvider.java b/bundles/org.eclipse.rtp.core.model/src/org/eclipse/rtp/core/model/SourceProvider.java
index b8890a6..0f0fefd 100644
--- a/bundles/org.eclipse.rtp.configurator.model/src/org/eclipse/rtp/configurator/model/SourceProvider.java
+++ b/bundles/org.eclipse.rtp.core.model/src/org/eclipse/rtp/core/model/SourceProvider.java
@@ -7,7 +7,7 @@
* Contributors:
* EclipseSource - initial API and implementation
*******************************************************************************/
-package org.eclipse.rtp.configurator.model;
+package org.eclipse.rtp.core.model;
import java.util.ArrayList;
import java.util.List;
diff --git a/bundles/org.eclipse.rtp.configurator.model/src/org/eclipse/rtp/configurator/model/SourceUnMarshaller.java b/bundles/org.eclipse.rtp.core.model/src/org/eclipse/rtp/core/model/SourceUnMarshaller.java
index 7efd799..8485960 100644
--- a/bundles/org.eclipse.rtp.configurator.model/src/org/eclipse/rtp/configurator/model/SourceUnMarshaller.java
+++ b/bundles/org.eclipse.rtp.core.model/src/org/eclipse/rtp/core/model/SourceUnMarshaller.java
@@ -7,7 +7,7 @@
* Contributors:
* EclipseSource - initial API and implementation
*******************************************************************************/
-package org.eclipse.rtp.configurator.model;
+package org.eclipse.rtp.core.model;
import java.io.InputStream;
diff --git a/bundles/org.eclipse.rtp.configurator.model/src/org/eclipse/rtp/configurator/model/SourceVersion.java b/bundles/org.eclipse.rtp.core.model/src/org/eclipse/rtp/core/model/SourceVersion.java
index d260d28..48656b1 100644
--- a/bundles/org.eclipse.rtp.configurator.model/src/org/eclipse/rtp/configurator/model/SourceVersion.java
+++ b/bundles/org.eclipse.rtp.core.model/src/org/eclipse/rtp/core/model/SourceVersion.java
@@ -5,7 +5,7 @@
* http://www.eclipse.org/legal/epl-v10.html Contributors: EclipseSource - initial API and
* implementation
*******************************************************************************/
-package org.eclipse.rtp.configurator.model;
+package org.eclipse.rtp.core.model;
import java.util.Collections;
import java.util.List;
diff --git a/bundles/org.eclipse.rtp.configurator.model/src/org/eclipse/rtp/configurator/model/internal/SourceUnMarshallerImpl.java b/bundles/org.eclipse.rtp.core.model/src/org/eclipse/rtp/core/model/internal/SourceUnMarshallerImpl.java
index b57560f..4eb9b2e 100644
--- a/bundles/org.eclipse.rtp.configurator.model/src/org/eclipse/rtp/configurator/model/internal/SourceUnMarshallerImpl.java
+++ b/bundles/org.eclipse.rtp.core.model/src/org/eclipse/rtp/core/model/internal/SourceUnMarshallerImpl.java
@@ -7,14 +7,14 @@
* Contributors:
* EclipseSource - initial API and implementation
*******************************************************************************/
-package org.eclipse.rtp.configurator.model.internal;
+package org.eclipse.rtp.core.model.internal;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
-import org.eclipse.rtp.configurator.model.SourceUnMarshaller;
-import org.eclipse.rtp.configurator.model.SourceProvider;
+import org.eclipse.rtp.core.model.SourceProvider;
+import org.eclipse.rtp.core.model.SourceUnMarshaller;
import com.google.gson.Gson;
import com.google.gson.stream.JsonReader;
diff --git a/bundles/org.eclipse.rtp.core.service.provider/META-INF/MANIFEST.MF b/bundles/org.eclipse.rtp.core.service.provider/META-INF/MANIFEST.MF
index 8638320..fa5bfaa 100644
--- a/bundles/org.eclipse.rtp.core.service.provider/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rtp.core.service.provider/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: EclipseSource
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.rtp.core;bundle-version="1.0.0",
- org.eclipse.rtp.configurator.model;bundle-version="1.0.0"
+ org.eclipse.rtp.core.model;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/rtpConfiguratorServiceProvider.xml, OSGI-INF/rtpConfigurator.xml, OSGI-INF/rtpConfiguratorModel.xml
diff --git a/bundles/org.eclipse.rtp.core.service.provider/OSGI-INF/rtpConfiguratorModel.xml b/bundles/org.eclipse.rtp.core.service.provider/OSGI-INF/rtpConfiguratorModel.xml
index ce787ec..27cfcb4 100644
--- a/bundles/org.eclipse.rtp.core.service.provider/OSGI-INF/rtpConfiguratorModel.xml
+++ b/bundles/org.eclipse.rtp.core.service.provider/OSGI-INF/rtpConfiguratorModel.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.rtp.core.service.provider.model">
<implementation class="org.eclipse.rtp.configurator.service.provider.internal.util.ConfiguratorModelUtil"/>
- <reference bind="setUnMarshaller" cardinality="1..1" interface="org.eclipse.rtp.configurator.model.SourceUnMarshaller" name="SourceUnMarshaller" policy="static" unbind="unsetUnMarshaller"/>
+ <reference bind="setUnMarshaller" cardinality="1..1" interface="org.eclipse.rtp.core.model.SourceUnMarshaller" name="SourceUnMarshaller" policy="static" unbind="unsetUnMarshaller"/>
</scr:component>
diff --git a/bundles/org.eclipse.rtp.core.service.provider/src/org/eclipse/rtp/configurator/service/provider/internal/DefaultConfiguratorService.java b/bundles/org.eclipse.rtp.core.service.provider/src/org/eclipse/rtp/configurator/service/provider/internal/DefaultConfiguratorService.java
index a5a2a6f..282ab33 100644
--- a/bundles/org.eclipse.rtp.core.service.provider/src/org/eclipse/rtp/configurator/service/provider/internal/DefaultConfiguratorService.java
+++ b/bundles/org.eclipse.rtp.core.service.provider/src/org/eclipse/rtp/configurator/service/provider/internal/DefaultConfiguratorService.java
@@ -19,13 +19,13 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.rtp.configurator.core.IConfiguratorService;
-import org.eclipse.rtp.configurator.model.Source;
-import org.eclipse.rtp.configurator.model.SourceVersion;
import org.eclipse.rtp.configurator.service.provider.internal.deploy.FeatureInstallException;
import org.eclipse.rtp.configurator.service.provider.internal.deploy.FeatureManager;
import org.eclipse.rtp.configurator.service.provider.internal.deploy.RepositoryManager;
import org.eclipse.rtp.configurator.service.provider.internal.util.ConfiguratorModelUtil;
import org.eclipse.rtp.configurator.service.provider.internal.util.P2Util;
+import org.eclipse.rtp.core.model.Source;
+import org.eclipse.rtp.core.model.SourceVersion;
import org.osgi.framework.Version;
public class DefaultConfiguratorService implements IConfiguratorService {
@@ -58,7 +58,8 @@ public class DefaultConfiguratorService implements IConfiguratorService {
result = Status.CANCEL_STATUS;
}
} catch( Exception e ) {
- System.out.println( "Feature will not be installed. Failed to load repository" );
+ System.out.println( "Feature will not be installed" );
+ e.printStackTrace();
result = new Status( IStatus.ERROR,
ProviderActivator.BUNDLE_ID,
"Failed to isntall features",
diff --git a/bundles/org.eclipse.rtp.core.service.provider/src/org/eclipse/rtp/configurator/service/provider/internal/deploy/FeatureManager.java b/bundles/org.eclipse.rtp.core.service.provider/src/org/eclipse/rtp/configurator/service/provider/internal/deploy/FeatureManager.java
index 5b26935..df8f28a 100644
--- a/bundles/org.eclipse.rtp.core.service.provider/src/org/eclipse/rtp/configurator/service/provider/internal/deploy/FeatureManager.java
+++ b/bundles/org.eclipse.rtp.core.service.provider/src/org/eclipse/rtp/configurator/service/provider/internal/deploy/FeatureManager.java
@@ -29,8 +29,8 @@ import org.eclipse.equinox.p2.operations.UninstallOperation;
import org.eclipse.equinox.p2.query.IQueryResult;
import org.eclipse.equinox.p2.query.IQueryable;
import org.eclipse.equinox.p2.query.QueryUtil;
-import org.eclipse.rtp.configurator.model.Feature;
-import org.eclipse.rtp.configurator.model.SourceVersion;
+import org.eclipse.rtp.core.model.Feature;
+import org.eclipse.rtp.core.model.SourceVersion;
@SuppressWarnings( "restriction" )
public class FeatureManager {
diff --git a/bundles/org.eclipse.rtp.core.service.provider/src/org/eclipse/rtp/configurator/service/provider/internal/util/ConfiguratorModelUtil.java b/bundles/org.eclipse.rtp.core.service.provider/src/org/eclipse/rtp/configurator/service/provider/internal/util/ConfiguratorModelUtil.java
index 4ba769c..48c6016 100644
--- a/bundles/org.eclipse.rtp.core.service.provider/src/org/eclipse/rtp/configurator/service/provider/internal/util/ConfiguratorModelUtil.java
+++ b/bundles/org.eclipse.rtp.core.service.provider/src/org/eclipse/rtp/configurator/service/provider/internal/util/ConfiguratorModelUtil.java
@@ -11,9 +11,9 @@ import java.net.URL;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
-import org.eclipse.rtp.configurator.model.SourceProvider;
-import org.eclipse.rtp.configurator.model.SourceUnMarshaller;
import org.eclipse.rtp.configurator.service.provider.internal.ProviderActivator;
+import org.eclipse.rtp.core.model.SourceProvider;
+import org.eclipse.rtp.core.model.SourceUnMarshaller;
public class ConfiguratorModelUtil {
diff --git a/packages/org.eclipse.rtp.package.products/org.eclipse.rtp.package.basic.product b/packages/org.eclipse.rtp.package.products/org.eclipse.rtp.package.basic.product
index 98bfc5e..9ef8279 100644
--- a/packages/org.eclipse.rtp.package.products/org.eclipse.rtp.package.basic.product
+++ b/packages/org.eclipse.rtp.package.products/org.eclipse.rtp.package.basic.product
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="org.eclipse.rtp.package.basic (Incubation)" uid="org.eclipse.rtp.package.basic" id="org.eclipse.rtp.package.basic" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true">
-
- <configIni use="default">
- </configIni>
-
- <launcherArgs>
- <programArgs>-console</programArgs>
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="org.eclipse.rtp.package.basic (Incubation)" uid="org.eclipse.rtp.package.basic" id="org.eclipse.rtp.package.basic" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true">
+
+ <configIni use="default">
+ </configIni>
+
+ <launcherArgs>
+ <programArgs>-console</programArgs>
<vmArgs>-Declipse.ignoreApp=true
--Dosgi.noShutdown=true</vmArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
- </launcherArgs>
-
- <vm>
- </vm>
-
- <license>
- <url>http://eclipse.org/legal/epl/notice.php</url>
- <text>
+-Dosgi.noShutdown=true</vmArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+ </launcherArgs>
+
+ <vm>
+ </vm>
+
+ <license>
+ <url>http://eclipse.org/legal/epl/notice.php</url>
+ <text>
Eclipse Foundation Software User Agreement
April 14, 2010
@@ -140,30 +140,30 @@ using any encryption software, please check the country&apos;s laws,
regulations and policies concerning the import, possession, or use, and
re-export of encryption software, to see if this is permitted.
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
- </text>
- </license>
-
- <plugins>
- </plugins>
-
- <features>
- <feature id="org.eclipse.rtp.package.basic.feature"/>
- </features>
-
- <configurations>
- <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
- <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
- <plugin id="org.eclipse.equinox.frameworkadmin.equinox" autoStart="true" startLevel="3" />
- <plugin id="org.eclipse.equinox.p2.console" autoStart="true" startLevel="3" />
- <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
- <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator" autoStart="true" startLevel="3" />
- <plugin id="org.eclipse.rtp.core" autoStart="true" startLevel="4" />
- <plugin id="org.eclipse.rtp.core.service.provider" autoStart="true" startLevel="4" />
- <plugin id="org.eclipse.rtp.configurator.model" autoStart="true" startLevel="4" />
- <plugin id="org.eclipse.rtp.configurator.console" autoStart="true" startLevel="4" />
- <property name="eclipse.ignoreApp" value="true" />
- <property name="osgi.noShutdown" value="true" />
- </configurations>
-
-</product>
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
+ </text>
+ </license>
+
+ <plugins>
+ </plugins>
+
+ <features>
+ <feature id="org.eclipse.rtp.package.basic.feature"/>
+ </features>
+
+ <configurations>
+ <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+ <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
+ <plugin id="org.eclipse.equinox.frameworkadmin.equinox" autoStart="true" startLevel="3" />
+ <plugin id="org.eclipse.equinox.p2.console" autoStart="true" startLevel="3" />
+ <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+ <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator" autoStart="true" startLevel="3" />
+ <plugin id="org.eclipse.rtp.configurator.console" autoStart="true" startLevel="4" />
+ <plugin id="org.eclipse.rtp.core" autoStart="true" startLevel="4" />
+ <plugin id="org.eclipse.rtp.core.model" autoStart="true" startLevel="4" />
+ <plugin id="org.eclipse.rtp.core.service.provider" autoStart="true" startLevel="4" />
+ <property name="eclipse.ignoreApp" value="true" />
+ <property name="osgi.noShutdown" value="true" />
+ </configurations>
+
+</product>
diff --git a/packages/org.eclipse.rtp.releng/pom.xml b/packages/org.eclipse.rtp.releng/pom.xml
index 6af9cd4..55c2934 100644
--- a/packages/org.eclipse.rtp.releng/pom.xml
+++ b/packages/org.eclipse.rtp.releng/pom.xml
@@ -124,7 +124,7 @@
<!-- Configurator -->
<module>../../bundles/org.eclipse.rtp.core</module>
<module>../../bundles/org.eclipse.rtp.core.service.provider</module>
- <module>../../bundles/org.eclipse.rtp.configurator.model</module>
+ <module>../../bundles/org.eclipse.rtp.core.model</module>
<module>../../bundles/org.eclipse.rtp.configurator.console</module>
<module>../../bundles/org.eclipse.rtp.configurator.feature</module>
<!-- Packages -->
diff --git a/tests/org.eclipse.rtp.configurator.model.test/.classpath b/tests/org.eclipse.rtp.core.model.test/.classpath
index 8a8f166..8a8f166 100644
--- a/tests/org.eclipse.rtp.configurator.model.test/.classpath
+++ b/tests/org.eclipse.rtp.core.model.test/.classpath
diff --git a/tests/org.eclipse.rtp.configurator.model.test/.project b/tests/org.eclipse.rtp.core.model.test/.project
index f2719d8..d6b4896 100644
--- a/tests/org.eclipse.rtp.configurator.model.test/.project
+++ b/tests/org.eclipse.rtp.core.model.test/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.rtp.configurator.model.test</name>
+ <name>org.eclipse.rtp.core.model.test</name>
<comment></comment>
<projects>
</projects>
diff --git a/tests/org.eclipse.rtp.configurator.model.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.rtp.core.model.test/.settings/org.eclipse.jdt.core.prefs
index 3dd9ba6..3dd9ba6 100644
--- a/tests/org.eclipse.rtp.configurator.model.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.rtp.core.model.test/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/org.eclipse.rtp.configurator.model.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.rtp.core.model.test/.settings/org.eclipse.jdt.ui.prefs
index dacffb7..dacffb7 100644
--- a/tests/org.eclipse.rtp.configurator.model.test/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.rtp.core.model.test/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tests/org.eclipse.rtp.configurator.model.test/.settings/org.eclipse.pde.core.prefs b/tests/org.eclipse.rtp.core.model.test/.settings/org.eclipse.pde.core.prefs
index 7d61edf..7d61edf 100644
--- a/tests/org.eclipse.rtp.configurator.model.test/.settings/org.eclipse.pde.core.prefs
+++ b/tests/org.eclipse.rtp.core.model.test/.settings/org.eclipse.pde.core.prefs
diff --git a/tests/org.eclipse.rtp.configurator.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rtp.core.model.test/META-INF/MANIFEST.MF
index 92d72e7..a9953bc 100644
--- a/tests/org.eclipse.rtp.configurator.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rtp.core.model.test/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Configurator Model Tests
-Bundle-SymbolicName: org.eclipse.rtp.configurator.model.test
+Bundle-SymbolicName: org.eclipse.rtp.core.model.test
Bundle-Version: 1.0.0.qualifier
-Fragment-Host: org.eclipse.rtp.configurator.model;bundle-version="1.0.0"
+Fragment-Host: org.eclipse.rtp.core.model;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.junit;bundle-version="[4.8.2,4.9.0)",
org.mockito;bundle-version="[1.8.0,1.9.0)"
diff --git a/tests/org.eclipse.rtp.configurator.model.test/build.properties b/tests/org.eclipse.rtp.core.model.test/build.properties
index 34d2e4d..34d2e4d 100644
--- a/tests/org.eclipse.rtp.configurator.model.test/build.properties
+++ b/tests/org.eclipse.rtp.core.model.test/build.properties
diff --git a/tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/FeatureTest.java b/tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/FeatureTest.java
index 630c23d..7135de3 100644
--- a/tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/FeatureTest.java
+++ b/tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/FeatureTest.java
@@ -5,10 +5,11 @@
* http://www.eclipse.org/legal/epl-v10.html Contributors: EclipseSource - initial API and
* implementation
*******************************************************************************/
-package org.eclipse.rtp.configurator.model;
+package org.eclipse.rtp.core.model;
import static org.junit.Assert.assertEquals;
+import org.eclipse.rtp.core.model.Feature;
import org.junit.Test;
public class FeatureTest {
diff --git a/tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/SourceProviderTest.java b/tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/SourceProviderTest.java
index 0a2383c..4cb3d6d 100644
--- a/tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/SourceProviderTest.java
+++ b/tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/SourceProviderTest.java
@@ -7,13 +7,15 @@
* Contributors:
* EclipseSource - initial API and implementation
*******************************************************************************/
-package org.eclipse.rtp.configurator.model;
+package org.eclipse.rtp.core.model;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import java.util.List;
+import org.eclipse.rtp.core.model.Source;
+import org.eclipse.rtp.core.model.SourceProvider;
import org.junit.Test;
diff --git a/tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/SourceTest.java b/tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/SourceTest.java
index df71f09..d74ee5f 100644
--- a/tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/SourceTest.java
+++ b/tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/SourceTest.java
@@ -7,14 +7,15 @@
* Contributors:
* EclipseSource - initial API and implementation
*******************************************************************************/
-package org.eclipse.rtp.configurator.model;
+package org.eclipse.rtp.core.model;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import java.util.List;
-import org.eclipse.rtp.configurator.model.Source;
+import org.eclipse.rtp.core.model.Source;
+import org.eclipse.rtp.core.model.SourceVersion;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/SourceUnMarshallerTest.java b/tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/SourceUnMarshallerTest.java
index 6181247..42c7d11 100644
--- a/tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/SourceUnMarshallerTest.java
+++ b/tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/SourceUnMarshallerTest.java
@@ -5,7 +5,7 @@
* http://www.eclipse.org/legal/epl-v10.html Contributors: EclipseSource - initial API and
* implementation
*******************************************************************************/
-package org.eclipse.rtp.configurator.model;
+package org.eclipse.rtp.core.model;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -14,7 +14,12 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.List;
-import org.eclipse.rtp.configurator.model.internal.SourceUnMarshallerImpl;
+import org.eclipse.rtp.core.model.Feature;
+import org.eclipse.rtp.core.model.Source;
+import org.eclipse.rtp.core.model.SourceProvider;
+import org.eclipse.rtp.core.model.SourceUnMarshaller;
+import org.eclipse.rtp.core.model.SourceVersion;
+import org.eclipse.rtp.core.model.internal.SourceUnMarshallerImpl;
import org.junit.Test;
public class SourceUnMarshallerTest {
diff --git a/tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/SourceVersionTest.java b/tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/SourceVersionTest.java
index 3ddd6ed..0be84cf 100644
--- a/tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/SourceVersionTest.java
+++ b/tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/SourceVersionTest.java
@@ -5,11 +5,12 @@
* http://www.eclipse.org/legal/epl-v10.html Contributors: EclipseSource - initial API and
* implementation
*******************************************************************************/
-package org.eclipse.rtp.configurator.model;
+package org.eclipse.rtp.core.model;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import org.eclipse.rtp.core.model.SourceVersion;
import org.junit.Test;
public class SourceVersionTest {
diff --git a/tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/example-sources.json b/tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/example-sources.json
index ff65b7e..ff65b7e 100644
--- a/tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/example-sources.json
+++ b/tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/example-sources.json
diff --git a/tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/test/AllModelTestSuite.java b/tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/test/AllModelTestSuite.java
index 095970b..5595e56 100644
--- a/tests/org.eclipse.rtp.configurator.model.test/src/org/eclipse/rtp/configurator/model/test/AllModelTestSuite.java
+++ b/tests/org.eclipse.rtp.core.model.test/src/org/eclipse/rtp/core/model/test/AllModelTestSuite.java
@@ -7,12 +7,12 @@
* Contributors:
* EclipseSource - initial API and implementation
*******************************************************************************/
-package org.eclipse.rtp.configurator.model.test;
+package org.eclipse.rtp.core.model.test;
-import org.eclipse.rtp.configurator.model.SourceUnMarshallerTest;
-import org.eclipse.rtp.configurator.model.SourceProviderTest;
-import org.eclipse.rtp.configurator.model.SourceTest;
-import org.eclipse.rtp.configurator.model.SourceVersionTest;
+import org.eclipse.rtp.core.model.SourceProviderTest;
+import org.eclipse.rtp.core.model.SourceTest;
+import org.eclipse.rtp.core.model.SourceUnMarshallerTest;
+import org.eclipse.rtp.core.model.SourceVersionTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
diff --git a/tests/org.eclipse.rtp.core.service.provider.test/src/org/eclipse/rtp/configurator/service/provider/internal/ConfiguratorServiceSearchTest.java b/tests/org.eclipse.rtp.core.service.provider.test/src/org/eclipse/rtp/configurator/service/provider/internal/ConfiguratorServiceSearchTest.java
index 032a913..afa2f30 100644
--- a/tests/org.eclipse.rtp.core.service.provider.test/src/org/eclipse/rtp/configurator/service/provider/internal/ConfiguratorServiceSearchTest.java
+++ b/tests/org.eclipse.rtp.core.service.provider.test/src/org/eclipse/rtp/configurator/service/provider/internal/ConfiguratorServiceSearchTest.java
@@ -17,10 +17,10 @@ import java.util.Collections;
import java.util.List;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.rtp.configurator.model.Source;
-import org.eclipse.rtp.configurator.model.SourceProvider;
import org.eclipse.rtp.configurator.service.provider.internal.util.ConfiguratorModelUtil;
import org.eclipse.rtp.configurator.service.provider.internal.util.Fixture;
+import org.eclipse.rtp.core.model.Source;
+import org.eclipse.rtp.core.model.SourceProvider;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/org.eclipse.rtp.core.service.provider.test/src/org/eclipse/rtp/configurator/service/provider/internal/ConfiguratorServiceTest.java b/tests/org.eclipse.rtp.core.service.provider.test/src/org/eclipse/rtp/configurator/service/provider/internal/ConfiguratorServiceTest.java
index 085f55e..38f2b73 100644
--- a/tests/org.eclipse.rtp.core.service.provider.test/src/org/eclipse/rtp/configurator/service/provider/internal/ConfiguratorServiceTest.java
+++ b/tests/org.eclipse.rtp.core.service.provider.test/src/org/eclipse/rtp/configurator/service/provider/internal/ConfiguratorServiceTest.java
@@ -26,14 +26,14 @@ import java.util.List;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.rtp.configurator.model.SourceProvider;
-import org.eclipse.rtp.configurator.model.SourceVersion;
import org.eclipse.rtp.configurator.service.provider.internal.deploy.FeatureInstallException;
import org.eclipse.rtp.configurator.service.provider.internal.deploy.FeatureManager;
import org.eclipse.rtp.configurator.service.provider.internal.deploy.RepositoryManager;
import org.eclipse.rtp.configurator.service.provider.internal.util.ConfiguratorModelUtil;
import org.eclipse.rtp.configurator.service.provider.internal.util.Fixture;
import org.eclipse.rtp.configurator.service.provider.internal.util.P2Util;
+import org.eclipse.rtp.core.model.SourceProvider;
+import org.eclipse.rtp.core.model.SourceVersion;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.Version;
diff --git a/tests/org.eclipse.rtp.core.service.provider.test/src/org/eclipse/rtp/configurator/service/provider/internal/deploy/FeatureManagerTest.java b/tests/org.eclipse.rtp.core.service.provider.test/src/org/eclipse/rtp/configurator/service/provider/internal/deploy/FeatureManagerTest.java
index 125bb27..752d374 100644
--- a/tests/org.eclipse.rtp.core.service.provider.test/src/org/eclipse/rtp/configurator/service/provider/internal/deploy/FeatureManagerTest.java
+++ b/tests/org.eclipse.rtp.core.service.provider.test/src/org/eclipse/rtp/configurator/service/provider/internal/deploy/FeatureManagerTest.java
@@ -27,7 +27,7 @@ import org.eclipse.equinox.p2.planner.IPlanner;
import org.eclipse.equinox.p2.planner.IProfileChangeRequest;
import org.eclipse.equinox.p2.repository.IRepositoryManager;
import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
-import org.eclipse.rtp.configurator.model.SourceVersion;
+import org.eclipse.rtp.core.model.SourceVersion;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
diff --git a/tests/org.eclipse.rtp.core.service.provider.test/src/org/eclipse/rtp/configurator/service/provider/internal/util/Fixture.java b/tests/org.eclipse.rtp.core.service.provider.test/src/org/eclipse/rtp/configurator/service/provider/internal/util/Fixture.java
index 79072e3..5bc3998 100644
--- a/tests/org.eclipse.rtp.core.service.provider.test/src/org/eclipse/rtp/configurator/service/provider/internal/util/Fixture.java
+++ b/tests/org.eclipse.rtp.core.service.provider.test/src/org/eclipse/rtp/configurator/service/provider/internal/util/Fixture.java
@@ -9,8 +9,8 @@ import java.net.URL;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.rtp.configurator.model.SourceProvider;
-import org.eclipse.rtp.configurator.model.SourceUnMarshaller;
+import org.eclipse.rtp.core.model.SourceProvider;
+import org.eclipse.rtp.core.model.SourceUnMarshaller;
import org.osgi.framework.Bundle;
public class Fixture {