### Eclipse Workspace Patch 1.0
#P Apache Karaf EIK SVN trunk
Index: plugins/org.osgi.jmx/META-INF/MANIFEST.MF
===================================================================
--- plugins/org.osgi.jmx/META-INF/MANIFEST.MF	(revision 1371955)
+++ plugins/org.osgi.jmx/META-INF/MANIFEST.MF	(working copy)
@@ -12,4 +12,4 @@
  org.osgi.jmx.service.permissionadmin;version="1.2.0",
  org.osgi.jmx.service.provisioning;version="1.2.0",
  org.osgi.jmx.service.useradmin;version="1.1.0"
-Import-Package: javax.management.openmbean
\ No newline at end of file
+Import-Package: javax.management.openmbean
Index: plugins/org.apache.karaf.eik.workbench/plugin.xml
===================================================================
--- plugins/org.apache.karaf.eik.workbench/plugin.xml	(revision 1371955)
+++ plugins/org.apache.karaf.eik.workbench/plugin.xml	(working copy)
@@ -73,7 +73,7 @@
                   type="org.eclipse.core.resources.IProject">
                <test
                      property="org.eclipse.core.resources.projectNature"
-                     value="info.evanchik.eclipse.karaf.KarafProjectNature">
+                     value="org.apache.karaf.eik.KarafProjectNature">
                </test>
             </adapt>
          </enablement>
Index: plugins/org.apache.karaf.eik.wtp.ui/plugin.xml
===================================================================
--- plugins/org.apache.karaf.eik.wtp.ui/plugin.xml	(revision 1371955)
+++ plugins/org.apache.karaf.eik.wtp.ui/plugin.xml	(working copy)
@@ -5,20 +5,20 @@
          point="org.eclipse.wst.server.ui.serverImages">
       <image
             icon="icons/obj16/felixLogo16x16.gif"
-            id="info.evanchik.eclipse.karaf.server.2"
-            typeIds="info.evanchik.eclipse.karaf.server.2">
+            id="org.apache.karaf.eik.server.2"
+            typeIds="org.apache.karaf.eik.server.2">
       </image>
       <image
             icon="icons/obj16/felixLogo16x16.gif"
-            id="info.evanchik.eclipse.karaf.wtp.server.runtime.2"
-            typeIds="info.evanchik.eclipse.karaf.wtp.server.runtime.2">
+            id="org.apache.karaf.eik.wtp.server.runtime.2"
+            typeIds="org.apache.karaf.eik.wtp.server.runtime.2">
       </image>
    </extension>
    <extension
          point="org.eclipse.wst.common.project.facet.ui.images">
       <image
             path="icons/obj16/felixLogo16x16.gif"
-            runtime-component-type="info.evanchik.eclipse.server.karaf">
+            runtime-component-type="org.apache.karaf.eik.server">
       </image>
       <image
             category="org.apache.karaf.eik.wtp.core.category"
@@ -33,15 +33,15 @@
          point="org.eclipse.wst.server.ui.wizardFragments">
       <fragment
             class="org.apache.karaf.eik.wtp.ui.KarafRuntimeWizardFragment"
-            id="info.evanchik.eclipse.server.karaf.runtime.12"
-            typeIds="info.evanchik.eclipse.server.karaf.runtime.12">
+            id="org.apache.karaf.eik.server.runtime.12"
+            typeIds="org.apache.karaf.eik.server.runtime.12">
       </fragment>
    </extension>
    <extension
          point="org.eclipse.wst.common.project.facet.core.runtimes">
       <adapter>
          <runtime-component
-               id="info.evanchik.eclipse.server.karaf">
+               id="org.apache.karaf.eik.server">
          </runtime-component>
          <factory
                class="org.eclipse.jst.server.ui.internal.RuntimeLabelProvider$Factory">
Index: plugins/org.apache.mina.core/META-INF/MANIFEST.MF
===================================================================
--- plugins/org.apache.mina.core/META-INF/MANIFEST.MF	(revision 1371955)
+++ plugins/org.apache.mina.core/META-INF/MANIFEST.MF	(working copy)
@@ -326,7 +326,6 @@
  org.apache.mina.transport.vmpipe;version="2.0.1",
  org.apache.mina.util;version="2.0.1",
  org.apache.mina.util.byteaccess;version="2.0.1",
- org.ietf.jgss,
- org.slf4j
+ org.ietf.jgss
 Bundle-ClassPath: lib/mina-core-2.0.1.jar
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
\ No newline at end of file
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Index: plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF
===================================================================
--- plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF	(revision 1371955)
+++ plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF	(working copy)
@@ -23,4 +23,4 @@
  org.apache.karaf.eik.core.shell
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.apache.karaf.eik.core.internal.KarafCorePluginActivator
-Bundle-Vendor: Apache Software Foundation
\ No newline at end of file
+Bundle-Vendor: Apache Software Foundation
Index: plugins/org.apache.karaf.eik.wtp.core/src/main/java/org/apache/karaf/eik/wtp/core/KarafWtpPluginActivator.java
===================================================================
--- plugins/org.apache.karaf.eik.wtp.core/src/main/java/org/apache/karaf/eik/wtp/core/KarafWtpPluginActivator.java	(revision 1371955)
+++ plugins/org.apache.karaf.eik.wtp.core/src/main/java/org/apache/karaf/eik/wtp/core/KarafWtpPluginActivator.java	(working copy)
@@ -35,7 +35,7 @@
      * The list of runtime type identifiers that this plugin defines
      */
     public static final String[] RUNTIME_TYPE_IDS = new String[] {
-        "info.evanchik.eclipse.karaf.wtp.server.runtime.2"
+        "org.apache.karaf.eik.wtp.server.runtime.2"
     };
 
     // The shared instance
Index: plugins/org.apache.karaf.eik.workbench/schema/jmxConnectorProvider.exsd
===================================================================
--- plugins/org.apache.karaf.eik.workbench/schema/jmxConnectorProvider.exsd	(revision 1371955)
+++ plugins/org.apache.karaf.eik.workbench/schema/jmxConnectorProvider.exsd	(working copy)
@@ -1,109 +1,109 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="info.evanchik.eclipse.karaf.workbench" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appinfo>
-         <meta.schema plugin="info.evanchik.eclipse.karaf.workbench" id="jmxConnectorProvider" name="JMX Connector Provider"/>
-      </appinfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appinfo>
-            <meta.element />
-         </appinfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="transport" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="transport">
-      <complexType>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn=":javax.management.remote.JMXConnectorProvider"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="protocol" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="since"/>
-      </appinfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="examples"/>
-      </appinfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="apiinfo"/>
-      </appinfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="implementation"/>
-      </appinfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.apache.karaf.eik.workbench" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.apache.karaf.eik.workbench" id="jmxConnectorProvider" name="JMX Connector Provider"/>
+      </appinfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="transport" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="transport">
+      <complexType>
+         <attribute name="class" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":javax.management.remote.JMXConnectorProvider"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+         <attribute name="protocol" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
Index: plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/project/NewKarafProjectOperation.java
===================================================================
--- plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/project/NewKarafProjectOperation.java	(revision 1371955)
+++ plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/project/NewKarafProjectOperation.java	(working copy)
@@ -125,6 +125,7 @@
 
         final ILaunchConfigurationWorkingCopy launchConfiguration =
             launchType.newInstance(newKarafProject.getProjectHandle(), newKarafProject.getName());
+        launchConfiguration.setAttribute("karafModel", karafPlatformModel.getRootDirectory().toString());
 
         KarafLaunchConfigurationInitializer.initializeConfiguration(launchConfiguration);
 
Index: plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/KarafLaunchConfigurationInitializer.java
===================================================================
--- plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/KarafLaunchConfigurationInitializer.java	(revision 1371955)
+++ plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/KarafLaunchConfigurationInitializer.java	(working copy)
@@ -90,7 +90,7 @@
 
         // TODO: Factor this out so that it pulls the ID from this plugins
         // registry
-        configuration.setAttribute(IPDELauncherConstants.OSGI_FRAMEWORK_ID, "info.evanchik.eclipse.karaf.Framework"); //$NON-NLS-1$
+        configuration.setAttribute(IPDELauncherConstants.OSGI_FRAMEWORK_ID, "org.apache.karaf.eik.Framework"); //$NON-NLS-1$
         configuration.setAttribute(IPDEUIConstants.LAUNCHER_PDE_VERSION, "3.3"); //$NON-NLS-1$
 
         configuration.setAttribute(KarafLaunchConfigurationConstants.KARAF_LAUNCH_SOURCE_RUNTIME, karafPlatform.getRootDirectory().toOSString());
@@ -214,6 +214,13 @@
     protected void loadKarafPlatform(final ILaunchConfigurationWorkingCopy configuration) {
         try {
             this.karafPlatform = KarafPlatformModelRegistry.findActivePlatformModel();
+
+            if (this.karafPlatform == null && configuration.hasAttribute("karafModel")) {
+            	String platformModelPath = configuration.getAttribute("karafModel",(String)null);
+            	IPath path = new Path (platformModelPath);
+            	this.karafPlatform = KarafPlatformModelRegistry.findPlatformModel(path);
+            }
+
             this.karafPlatformFactory = KarafPlatformModelRegistry.findPlatformModelFactory(karafPlatform.getRootDirectory());
 
             this.startupSection = (StartupSection) this.karafPlatform.getAdapter(StartupSection.class);
Index: features/org.apache.karaf.eik.update/src/main/resources/content.xml
===================================================================
--- features/org.apache.karaf.eik.update/src/main/resources/content.xml	(revision 1371955)
+++ features/org.apache.karaf.eik.update/src/main/resources/content.xml	(working copy)
@@ -85,7 +85,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'><![CDATA[
-            Bundle-Vendor: Apache Software Foundation&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.apache.karaf.eik.core.internal.KarafCorePluginActivator&#xA;Bundle-RequiredExecutionEnvironment: JavaSE-1.6&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.core.resources;bundle-version=&quot;[3.0.0,4.0.0)&quot;,org.eclipse.osgi.services;bundle-version=&quot;3.2.0&quot;,org.eclipse.core.variables;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.pde.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.apache.commons.collections;bundle-version=&quot;3.2.0&quot;,org.jdom;bundle-version=&quot;1.0.0&quot;,org.apache.mina.core;bundle-version=&quot;2.0.0&quot;,org.fusesource.jansi;bundle-version=&quot;1.5.0&quot;,sshd-core;bundle-version=&quot;0.5.0&quot;&#xA;Bundle-Name: Eclipse Integration for Apache Karaf&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: info.evanchik.eclipse.karaf.core;singleton:=true&#xA;Bundle-Version: 0.5.3.2011org.aporg.apache.karaf.eik.corelipse.karaf.core,info.evanchik.ecorg.apache.karaf.eik.corenfo.evanchik.eclipse.korg.apache.karaf.eik.core,info.evanchik.eclipse.karaf.core.equinoorg.apache.karaf.eik.cororg.apache.karaf.eik.corese.karaf.core.moorg.apache.karaf.eik.corecore.shell
+            Bundle-Vendor: Apache Software Foundation&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.apache.karaf.eik.core.internal.KarafCorePluginActivator&#xA;Bundle-RequiredExecutionEnvironment: JavaSE-1.6&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.core.resources;bundle-version=&quot;[3.0.0,4.0.0)&quot;,org.eclipse.osgi.services;bundle-version=&quot;3.2.0&quot;,org.eclipse.core.variables;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.pde.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.apache.commons.collections;bundle-version=&quot;3.2.0&quot;,org.jdom;bundle-version=&quot;1.0.0&quot;,org.apache.mina.core;bundle-version=&quot;2.0.0&quot;,org.fusesource.jansi;bundle-version=&quot;1.5.0&quot;,sshd-core;bundle-version=&quot;0.5.0&quot;&#xA;Bundle-Name: Eclipse Integration for Apache Karaf&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.apache.karaf.eik.core;singleton:=true&#xA;Bundle-Version: 0.5.3.2011org.aporg.apache.karaf.eik.corelipse.karaf.core,info.evanchik.ecorg.apache.karaf.eik.corenfo.evanchik.eclipse.korg.apache.karaf.eik.core,info.evanchik.eclipse.karaf.core.equinoorg.apache.karaf.eik.cororg.apache.karaf.eik.corese.karaf.core.moorg.apache.karaf.eik.corecore.shell
           ]]></instruction>
         </instructions>
       </touchpointData>
@@ -900,7 +900,7 @@
         <required namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.workbench' range='3.0.0'/>
         <required namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.wtp.core' range='3.0.0'/>
         <required namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.wtp.ui' range='3.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.eclipse.karaf.wtp.feature.feature.jar' range='3.0.0'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.wtp.feature.feature.jar' range='3.0.0'>
           <filter>
             (org.eclipse.update.install.features=true)
           </filter>
Index: plugins/org.apache.aries.jmx.api/META-INF/MANIFEST.MF
===================================================================
--- plugins/org.apache.aries.jmx.api/META-INF/MANIFEST.MF	(revision 1371955)
+++ plugins/org.apache.aries.jmx.api/META-INF/MANIFEST.MF	(working copy)
@@ -24,5 +24,4 @@
 Bundle-SymbolicName: org.apache.aries.jmx.api
 Import-Package: javax.management.openmbean
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ClassPath: lib/org.apache.aries.jmx.api-0.3.jar,
- .
\ No newline at end of file
+Bundle-ClassPath: lib/org.apache.aries.jmx.api-0.3.jar
Index: plugins/org.apache.karaf.eik.wtp.core/plugin.xml
===================================================================
--- plugins/org.apache.karaf.eik.wtp.core/plugin.xml	(revision 1371955)
+++ plugins/org.apache.karaf.eik.wtp.core/plugin.xml	(working copy)
@@ -6,7 +6,7 @@
       <runtimeType
             class="org.apache.karaf.eik.wtp.core.runtime.KarafRuntime"
             description="Apache Karaf OSGi Application framework"
-            id="info.evanchik.eclipse.karaf.wtp.server.runtime.2"
+            id="org.apache.karaf.eik.wtp.server.runtime.2"
             name="Apache Karaf"
             vendor="Apache"
             vendorId="apache"
@@ -30,15 +30,15 @@
       <runtimeLocator
             class="org.apache.karaf.eik.wtp.core.runtime.KarafRuntimeLocator"
             id="org.apache.karaf.eik.wtp.core.runtimeLocator"
-            typeIds="info.evanchik.eclipse.karaf.wtp.server.runtime.*">
+            typeIds="org.apache.karaf.eik.wtp.server.runtime.*">
       </runtimeLocator>
    </extension>
    <extension
          point="org.eclipse.jst.server.core.runtimeClasspathProviders">
       <runtimeClasspathProvider
             class="org.apache.karaf.eik.wtp.core.runtime.KarafRuntimeClasspathProvider"
-            id="info.evanchik.eclipse.karaf.wtp.server.runtimeTarget"
-            runtimeTypeIds="info.evanchik.eclipse.karaf.wtp.server.runtime.*">
+            id="org.apache.karaf.eik.wtp.server.runtimeTarget"
+            runtimeTypeIds="org.apache.karaf.eik.wtp.server.runtime.*">
       </runtimeClasspathProvider>
    </extension>
    <extension
@@ -48,12 +48,12 @@
             class="org.apache.karaf.eik.wtp.core.server.KarafServer"
             description="Apache Karaf server"
             hasConfiguration="true"
-            id="info.evanchik.eclipse.karaf.server.2"
+            id="org.apache.karaf.eik.server.2"
             initialState="stopped"
             launchConfigId="org.apache.karaf.eik.wtp.core.KarafServerLauncher"
             name="Apache Karaf"
             runtime="true"
-            runtimeTypeId="info.evanchik.eclipse.karaf.wtp.server.runtime.2"
+            runtimeTypeId="org.apache.karaf.eik.wtp.server.runtime.2"
             startTimeout="45000"
             stopTimeout="15000"
             supportsRemoteHosts="false">
@@ -65,14 +65,14 @@
             class="org.apache.karaf.eik.wtp.core.server.KarafServerLocator"
             id="org.apache.karaf.eik.wtp.core.server.locator"
             supportsRemoteHosts="false"
-            typeIds="info.evanchik.eclipse.karaf.server.*">
+            typeIds="org.apache.karaf.eik.server.*">
       </serverLocator>
    </extension>
    <extension
          point="org.eclipse.wst.server.core.launchableAdapters">
       <launchableAdapter
             class="org.apache.karaf.eik.wtp.core.server.KarafLaunchableAdapterDelegate"
-            id="info.evanchik.eclipse.server.karaf.web">
+            id="org.apache.karaf.eik.server.web">
       </launchableAdapter>
    </extension>
    <extension
@@ -94,21 +94,21 @@
       <publishTask
             class="org.apache.karaf.eik.wtp.core.tasks.KarafPublishTask"
             id="org.apache.karaf.eik.ui.publishTask"
-            typeIds="info.evanchik.eclipse.server.karaf.*">
+            typeIds="org.apache.karaf.eik.server.*">
       </publishTask>
    </extension>
    <extension
          point="org.eclipse.wst.common.project.facet.core.runtimes">
       <runtime-component-type
-            id="info.evanchik.eclipse.server.karaf">
+            id="org.apache.karaf.eik.server">
       </runtime-component-type>
       <runtime-component-version
-            type="info.evanchik.eclipse.server.karaf"
+            type="org.apache.karaf.eik.server"
             version="1.2">
       </runtime-component-version>
       <adapter>
          <runtime-component
-               id="info.evanchik.eclipse.server.karaf">
+               id="org.apache.karaf.eik.server">
          </runtime-component>
          <factory
                class="org.eclipse.jst.server.core.internal.RuntimeClasspathProvider$Factory">
@@ -119,7 +119,7 @@
       </adapter>
       <supported>
          <runtime-component
-               id="info.evanchik.eclipse.server.karaf"
+               id="org.apache.karaf.eik.server"
                version="1.2">
          </runtime-component>
          <facet
@@ -139,8 +139,8 @@
    <extension
          point="org.eclipse.jst.server.core.runtimeFacetMappings">
       <runtimeFacetMapping
-            runtime-component="info.evanchik.eclipse.server.karaf"
-            runtimeTypeId="info.evanchik.eclipse.server.karaf.runtime.12"
+            runtime-component="org.apache.karaf.eik.server"
+            runtimeTypeId="org.apache.karaf.eik.server.runtime.12"
             version="1.2">
       </runtimeFacetMapping>
    </extension>
Index: plugins/org.ops4j.pax.url.mvn/src/main/java/org/ops4j/pax/url/mvn/MvnURLConnectionFactory.java
===================================================================
--- plugins/org.ops4j.pax.url.mvn/src/main/java/org/ops4j/pax/url/mvn/MvnURLConnectionFactory.java	(revision 1371955)
+++ plugins/org.ops4j.pax.url.mvn/src/main/java/org/ops4j/pax/url/mvn/MvnURLConnectionFactory.java	(working copy)
@@ -62,7 +62,7 @@
         final MavenConfigurationImpl config =
                 new MavenConfigurationImpl(configuredProperties, ServiceConstants.PID);
 
-        config.setSettings(new MavenSettingsImpl(config.getSettingsFileUrl(), config.useFallbackRepositories()));
+        config.setSettings(new MavenSettingsImpl(config.getSettingsFileUrl(), config.useFallbackRepositories().booleanValue()));
 
         return new Connection(url, config);
     }
Index: plugins/org.apache.karaf.eik.ui/schema/service.exsd
===================================================================
--- plugins/org.apache.karaf.eik.ui/schema/service.exsd	(revision 1371955)
+++ plugins/org.apache.karaf.eik.ui/schema/service.exsd	(working copy)
@@ -1,102 +1,102 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="info.evanchik.eclipse.karaf.ui" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appinfo>
-         <meta.schema plugin="info.evanchik.eclipse.karaf.ui" id="service" name="Apache Felix Karaf Workbench Service"/>
-      </appinfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appinfo>
-            <meta.element />
-         </appinfo>
-      </annotation>
-      <complexType>
-         <choice>
-            <element ref="launchCustomizer"/>
-         </choice>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="launchCustomizer">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn=":info.evanchik.eclipse.karaf.workbench.KarafWorkbenchServiceFactory"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="since"/>
-      </appinfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="examples"/>
-      </appinfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="apiinfo"/>
-      </appinfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="implementation"/>
-      </appinfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.apache.karaf.eik.ui" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.apache.karaf.eik.ui" id="service" name="Apache Felix Karaf Workbench Service"/>
+      </appinfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <choice>
+            <element ref="launchCustomizer"/>
+         </choice>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="launchCustomizer">
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.apache.karaf.eik.ui.workbench.KarafWorkbenchServiceFactory"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
Index: plugins/org.apache.sshd.core/META-INF/MANIFEST.MF
===================================================================
--- plugins/org.apache.sshd.core/META-INF/MANIFEST.MF	(revision 1371955)
+++ plugins/org.apache.sshd.core/META-INF/MANIFEST.MF	(working copy)
@@ -293,4 +293,4 @@
 Bundle-SymbolicName: sshd-core
 Bundle-DocURL: http://www.apache.org/
 Bundle-ClassPath: lib/sshd-core-0.5.0.jar
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
\ No newline at end of file
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Index: plugins/org.apache.karaf.eik.ui/plugin.xml
===================================================================
--- plugins/org.apache.karaf.eik.ui/plugin.xml	(revision 1371955)
+++ plugins/org.apache.karaf.eik.ui/plugin.xml	(working copy)
@@ -28,7 +28,7 @@
    <extension
          point="org.eclipse.pde.ui.osgiFrameworks">
       <framework
-            id="info.evanchik.eclipse.karaf.Framework"
+            id="org.apache.karaf.eik.Framework"
             initializer="org.apache.karaf.eik.ui.KarafLaunchConfigurationInitializer"
             launcherDelegate="org.apache.karaf.eik.ui.KarafLaunchConfigurationDelegate"
             name="Apache Karaf on Equinox">
@@ -98,7 +98,7 @@
       </wizard>
    </extension>
    <extension
-         id="info.evanchik.eclipse.karaf.KarafProjectNature"
+         id="org.apache.karaf.eik.KarafProjectNature"
          name="Apache Karaf Project Nature"
          point="org.eclipse.core.resources.natures">
       <runtime>
@@ -112,7 +112,7 @@
       <image
             icon="icons/obj16/karaf-logo-nature-16x16.png"
             id="org.apache.karaf.eik.ui.KarafProjectNatureImage"
-            natureId="info.evanchik.eclipse.karaf.KarafProjectNature">
+            natureId="org.apache.karaf.eik.KarafProjectNature">
       </image>
    </extension>
    <extension
@@ -129,7 +129,7 @@
                   type="org.eclipse.core.resources.IProject">
                <test
                      property="org.eclipse.core.resources.projectNature"
-                     value="info.evanchik.eclipse.karaf.KarafProjectNature">
+                     value="org.apache.karaf.eik.KarafProjectNature">
                </test>
             </adapt>
          </triggerPoints>
@@ -146,7 +146,7 @@
                   type="org.eclipse.core.resources.IProject">
                <test
                      property="org.eclipse.core.resources.projectNature"
-                     value="info.evanchik.eclipse.karaf.KarafProjectNature">
+                     value="org.apache.karaf.eik.KarafProjectNature">
                </test>
             </adapt>
          </triggerPoints>