You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/01/09 11:17:36 UTC
svn commit: r1229081 - in /karaf/eik/trunk:
features/org.apache.karaf.eik.update/src/main/resources/
plugins/org.apache.karaf.eik.wtp.ui/
plugins/org.apache.karaf.eik.wtp.ui/META-INF/
plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/ecli...
Author: jbonofre
Date: Mon Jan 9 10:17:36 2012
New Revision: 1229081
URL: http://svn.apache.org/viewvc?rev=1229081&view=rev
Log:
Refactoring of EIK WTP UI
Added:
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/KarafRuntimeComposite.java
- copied, changed from r1229079, karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafRuntimeComposite.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/KarafRuntimeUtils.java
- copied, changed from r1229079, karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafRuntimeUtils.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/KarafRuntimeWizardFragment.java
- copied, changed from r1229079, karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafRuntimeWizardFragment.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/KarafWtpUIPluginActivator.java
- copied, changed from r1229079, karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafWtpUIPluginActivator.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/launcher/
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/launcher/KarafLauncherTabGroup.java
- copied, changed from r1229079, karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/launcher/KarafLauncherTabGroup.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/launcher/KarafServerLaunchShortcut.java
Removed:
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafRuntimeComposite.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafRuntimeUtils.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafRuntimeWizardFragment.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafWtpUIPluginActivator.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/launcher/KarafLauncherTabGroup.java
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/launcher/KarafServerLaunchShortcut.java
Modified:
karaf/eik/trunk/features/org.apache.karaf.eik.update/src/main/resources/artifacts.xml
karaf/eik/trunk/features/org.apache.karaf.eik.update/src/main/resources/content.xml
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/META-INF/MANIFEST.MF
karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/plugin.xml
Modified: karaf/eik/trunk/features/org.apache.karaf.eik.update/src/main/resources/artifacts.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/features/org.apache.karaf.eik.update/src/main/resources/artifacts.xml?rev=1229081&r1=1229080&r2=1229081&view=diff
==============================================================================
--- karaf/eik/trunk/features/org.apache.karaf.eik.update/src/main/resources/artifacts.xml (original)
+++ karaf/eik/trunk/features/org.apache.karaf.eik.update/src/main/resources/artifacts.xml Mon Jan 9 10:17:36 2012
@@ -89,7 +89,7 @@
<property name='download.size' value='659'/>
</properties>
</artifact>
- <artifact classifier='osgi.bundle' id='info.evanchik.eclipse.karaf.wtp.ui' version='0.5.2.201109050850'>
+ <artifact classifier='osgi.bundle' id='org.apache.karaf.eik.wtp.ui' version='0.5.2.201109050850'>
<properties size='2'>
<property name='artifact.size' value='4096'/>
<property name='download.size' value='37506'/>
Modified: karaf/eik/trunk/features/org.apache.karaf.eik.update/src/main/resources/content.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/features/org.apache.karaf.eik.update/src/main/resources/content.xml?rev=1229081&r1=1229080&r2=1229081&view=diff
==============================================================================
--- karaf/eik/trunk/features/org.apache.karaf.eik.update/src/main/resources/content.xml (original)
+++ karaf/eik/trunk/features/org.apache.karaf.eik.update/src/main/resources/content.xml Mon Jan 9 10:17:36 2012
@@ -550,15 +550,15 @@
</instructions>
</touchpointData>
</unit>
- <unit id='info.evanchik.eclipse.karaf.wtp.ui' version='0.5.2.201109050850'>
- <update id='info.evanchik.eclipse.karaf.wtp.ui' range='[0.0.0,0.5.2.201109050850)' severity='0'/>
+ <unit id='org.apache.karaf.eik.wtp.ui' version='0.5.2.201109050850'>
+ <update id='org.apache.karaf.eik.wtp.ui' range='[0.0.0,0.5.2.201109050850)' severity='0'/>
<properties size='1'>
<property name='org.eclipse.equinox.p2.name' value='Eclipse WTP UI Integration'/>
</properties>
<provides size='4'>
- <provided namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.eclipse.karaf.wtp.ui' version='0.5.2.201109050850'/>
- <provided namespace='osgi.bundle' name='info.evanchik.eclipse.karaf.wtp.ui' version='0.5.2.201109050850'/>
- <provided namespace='java.package' name='info.evanchik.eclipse.karaf.wtp.ui' version='0.0.0'/>
+ <provided namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.wtp.ui' version='0.5.2.201109050850'/>
+ <provided namespace='osgi.bundle' name='org.apache.karaf.eik.wtp.ui' version='0.5.2.201109050850'/>
+ <provided namespace='java.package' name='org.apache.karaf.eik.wtp.ui' version='0.0.0'/>
<provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
</provides>
<requires size='8'>
@@ -572,14 +572,14 @@
<required namespace='osgi.bundle' name='org.apache.karaf.eik.ui' range='0.5.2'/>
</requires>
<artifacts size='1'>
- <artifact classifier='osgi.bundle' id='info.evanchik.eclipse.karaf.wtp.ui' version='0.5.2.201109050850'/>
+ <artifact classifier='osgi.bundle' id='org.apache.karaf.eik.wtp.ui' version='0.5.2.201109050850'/>
</artifacts>
<touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
<touchpointData size='1'>
<instructions size='1'>
- <instruction key='manifest'>
- Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.pde.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,2.0.0)",org.eclipse.wst.server.ui;bundle-version="[1.0.204,2.0.0)",org.eclipse.wst.server.core;bundle-version="[1.0.204,2.0.0)",org.eclipse.jdt.debug.ui;bundle-version="[3.2.0,4.0.0)",org.apache.karaf.eik.core;bundle-version="0.5.2",org.apache.karaf.eik.ui;bundle-version="0.5.2"
Bundle-Activator: info.evanchik.eclipse.karaf.wtp.ui.KarafWtpUIPluginActivator
Manifest-Version: 1.0
Bundle-Version: 0.5.2.201109050850
Export-Package: info.evanchik.eclipse.karaf.wtp.ui
Bundle-SymbolicName: info.evanchik.eclipse.karaf.wtp.ui;singleton:=true
Bundle-ActivationPolicy: lazy
Bundle-Name: Eclipse WTP UI Integrati
on
- </instruction>
+ <instruction key='manifest'><![CDATA[
+ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.pde.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,2.0.0)",org.eclipse.wst.server.ui;bundle-version="[1.0.204,2.0.0)",org.eclipse.wst.server.core;bundle-version="[1.0.204,2.0.0)",org.eclipse.jdt.debug.ui;bundle-version="[3.2.0,4.0.0)",org.apache.karaf.eik.core;bundle-version="0.5.2",org.apache.karaf.eik.ui;bundle-version="0.5.2"
Bundle-Activator: org.apache.karaf.eik.wtp.ui.KarafWtpUIPluginActivator
Manifest-Version: 1.0
Bundle-Version: 0.5.2.201109050850
Export-Package: info.evanchik.eclipse.karaf.wtp.ui
Bundle-SymbolicName: info.evanchik.eclipse.karaf.wtp.ui;singleton:=true
Bundle-ActivationPolicy: lazy
Bundle-Name: Eclipse WTP UI Integration
+ ]]></instruction>
</instructions>
</touchpointData>
</unit>
@@ -1026,7 +1026,7 @@
<required namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.ui' range='0.5.2'/>
<required namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.workbench' range='0.5.2'/>
<required namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.wtp.core' range='[0.5.2.201109050850,0.5.2.201109050850]'/>
- <required namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.eclipse.karaf.wtp.ui' range='[0.5.2.201109050850,0.5.2.201109050850]'/>
+ <required namespace='org.eclipse.equinox.p2.iu' name='org.apache.karaf.eik.wtp.ui' range='[0.5.2.201109050850,0.5.2.201109050850]'/>
<required namespace='org.eclipse.equinox.p2.iu' name='info.evanchik.eclipse.karaf.wtp.feature.feature.jar' range='[0.5.2.201109050850,0.5.2.201109050850]'>
<filter>
(org.eclipse.update.install.features=true)
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/META-INF/MANIFEST.MF?rev=1229081&r1=1229080&r2=1229081&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/META-INF/MANIFEST.MF (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/META-INF/MANIFEST.MF Mon Jan 9 10:17:36 2012
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Apache Karaf :: EIK :: Plugins :: Eclipse WTP UI Integration
Bundle-SymbolicName: org.apache.karaf.eik.wtp.ui;singleton:=true
Bundle-Version: 3.0.0.qualifier
-Bundle-Activator: info.evanchik.eclipse.karaf.wtp.ui.KarafWtpUIPluginActivator
+Bundle-Activator: org.apache.karaf.eik.wtp.ui.KarafWtpUIPluginActivator
Require-Bundle: org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
org.eclipse.pde.ui;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,2.0.0)",
@@ -14,4 +14,4 @@ Require-Bundle: org.eclipse.debug.ui;bun
org.apache.karaf.eik.ui;bundle-version="0.5.2"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: info.evanchik.eclipse.karaf.wtp.ui
+Export-Package: org.apache.karaf.eik.wtp.ui
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/plugin.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/plugin.xml?rev=1229081&r1=1229080&r2=1229081&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/plugin.xml (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/plugin.xml Mon Jan 9 10:17:36 2012
@@ -32,7 +32,7 @@
<extension
point="org.eclipse.wst.server.ui.wizardFragments">
<fragment
- class="info.evanchik.eclipse.karaf.wtp.ui.KarafRuntimeWizardFragment"
+ class="org.apache.karaf.eik.wtp.ui.KarafRuntimeWizardFragment"
id="info.evanchik.eclipse.server.karaf.runtime.12"
typeIds="info.evanchik.eclipse.server.karaf.runtime.12">
</fragment>
@@ -54,8 +54,8 @@
<extension
point="org.eclipse.debug.ui.launchConfigurationTabGroups">
<launchConfigurationTabGroup
- class="info.evanchik.eclipse.karaf.wtp.ui.launcher.KarafLauncherTabGroup"
- id="info.evanchik.eclipse.karaf.wtp.ui.KarafLauncherTabGroup"
+ class="org.apache.karaf.eik.wtp.ui.launcher.KarafLauncherTabGroup"
+ id="org.apache.karaf.eik.wtp.ui.KarafLauncherTabGroup"
type="org.apache.karaf.eik.wtp.core.KarafServerLauncher">
</launchConfigurationTabGroup>
</extension>
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/KarafRuntimeComposite.java (from r1229079, karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafRuntimeComposite.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/KarafRuntimeComposite.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/KarafRuntimeComposite.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafRuntimeComposite.java&r1=1229079&r2=1229081&rev=1229081&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafRuntimeComposite.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/KarafRuntimeComposite.java Mon Jan 9 10:17:36 2012
@@ -1,14 +1,22 @@
-/**
- * Copyright (c) 2009 Stephen Evanchik
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Contributors:
- * Stephen Evanchik - initial implementation
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
-package info.evanchik.eclipse.karaf.wtp.ui;
+package org.apache.karaf.eik.wtp.ui;
import org.apache.karaf.eik.ui.KarafUIPluginActivator;
@@ -33,10 +41,6 @@ import org.eclipse.wst.server.core.IRunt
import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
import org.eclipse.wst.server.ui.wizard.IWizardHandle;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public class KarafRuntimeComposite extends Composite {
/**
@@ -79,7 +83,7 @@ public class KarafRuntimeComposite exten
this.wizard.setTitle("Karaf Server");
this.wizard.setDescription("Specify the installation directory");
- this.wizard.setImageDescriptor(KarafUIPluginActivator.getDefault().getImageRegistry().getDescriptor("logo64")); //$NON-NLS-1$
+ this.wizard.setImageDescriptor(KarafUIPluginActivator.getDefault().getImageRegistry().getDescriptor("logo64"));
createCompositeControls();
}
@@ -239,4 +243,5 @@ public class KarafRuntimeComposite exten
return true;
}
+
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/KarafRuntimeUtils.java (from r1229079, karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafRuntimeUtils.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/KarafRuntimeUtils.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/KarafRuntimeUtils.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafRuntimeUtils.java&r1=1229079&r2=1229081&rev=1229081&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafRuntimeUtils.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/KarafRuntimeUtils.java Mon Jan 9 10:17:36 2012
@@ -1,14 +1,22 @@
-/**
- * Copyright (c) 2009 Stephen Evanchik
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Contributors:
- * Stephen Evanchik - initial implementation
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
-package info.evanchik.eclipse.karaf.wtp.ui;
+package org.apache.karaf.eik.wtp.ui;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
@@ -21,11 +29,8 @@ import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public final class KarafRuntimeUtils {
+
private static FontMetrics fontMetrics;
protected static void initializeDialogUnits(Control testControl) {
@@ -61,4 +66,5 @@ public final class KarafRuntimeUtils {
b.setLayoutData(data);
return b;
}
+
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/KarafRuntimeWizardFragment.java (from r1229079, karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafRuntimeWizardFragment.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/KarafRuntimeWizardFragment.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/KarafRuntimeWizardFragment.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafRuntimeWizardFragment.java&r1=1229079&r2=1229081&rev=1229081&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafRuntimeWizardFragment.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/KarafRuntimeWizardFragment.java Mon Jan 9 10:17:36 2012
@@ -1,14 +1,22 @@
-/**
- * Copyright (c) 2009 Stephen Evanchik
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Contributors:
- * Stephen Evanchik - initial implementation
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
-package info.evanchik.eclipse.karaf.wtp.ui;
+package org.apache.karaf.eik.wtp.ui;
import org.apache.karaf.eik.ui.KarafUIPluginActivator;
@@ -21,10 +29,6 @@ import org.eclipse.wst.server.core.TaskM
import org.eclipse.wst.server.ui.wizard.IWizardHandle;
import org.eclipse.wst.server.ui.wizard.WizardFragment;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public class KarafRuntimeWizardFragment extends WizardFragment {
/**
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/KarafWtpUIPluginActivator.java (from r1229079, karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafWtpUIPluginActivator.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/KarafWtpUIPluginActivator.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/KarafWtpUIPluginActivator.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafWtpUIPluginActivator.java&r1=1229079&r2=1229081&rev=1229081&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/KarafWtpUIPluginActivator.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/KarafWtpUIPluginActivator.java Mon Jan 9 10:17:36 2012
@@ -1,14 +1,22 @@
-/**
- * Copyright (c) 2009 Stephen Evanchik
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Contributors:
- * Stephen Evanchik - initial implementation
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
-package info.evanchik.eclipse.karaf.wtp.ui;
+package org.apache.karaf.eik.wtp.ui;
import org.apache.karaf.eik.core.LogWrapper;
@@ -21,7 +29,7 @@ import org.osgi.framework.BundleContext;
public class KarafWtpUIPluginActivator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "info.evanchik.eclipse.karaf.wtp.ui"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.apache.karaf.eik.wtp.ui";
// The shared instance
private static KarafWtpUIPluginActivator plugin;
@@ -62,4 +70,5 @@ public class KarafWtpUIPluginActivator e
public static LogWrapper getLogger() {
return new LogWrapper(getDefault().getLog(), PLUGIN_ID);
}
+
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/launcher/KarafLauncherTabGroup.java (from r1229079, karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/launcher/KarafLauncherTabGroup.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/launcher/KarafLauncherTabGroup.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/launcher/KarafLauncherTabGroup.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/launcher/KarafLauncherTabGroup.java&r1=1229079&r2=1229081&rev=1229081&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/launcher/KarafLauncherTabGroup.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/launcher/KarafLauncherTabGroup.java Mon Jan 9 10:17:36 2012
@@ -1,14 +1,22 @@
-/**
- * Copyright (c) 2009 Stephen Evanchik
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Contributors:
- * Stephen Evanchik - initial implementation
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
-package info.evanchik.eclipse.karaf.wtp.ui.launcher;
+package org.apache.karaf.eik.wtp.ui.launcher;
import org.apache.karaf.eik.ui.KarafConfigurationTab;
import org.apache.karaf.eik.ui.KarafLaunchConfigurationInitializer;
@@ -25,10 +33,6 @@ import org.eclipse.pde.ui.launcher.OSGiS
import org.eclipse.pde.ui.launcher.TracingTab;
import org.eclipse.wst.server.ui.ServerLaunchConfigurationTab;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public class KarafLauncherTabGroup extends AbstractLaunchConfigurationTabGroup {
/**
@@ -39,7 +43,7 @@ public class KarafLauncherTabGroup exten
@Override
public void createTabs(final ILaunchConfigurationDialog dialog, final String mode) {
final ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
- new ServerLaunchConfigurationTab(new String[] { "info.evanchik.eclipse.karaf.server" }), //$NON-NLS-1$
+ new ServerLaunchConfigurationTab(new String[] { "org.apache.karaf.eik.server" }),
new JavaArgumentsTab(),
new OSGiSettingsTab(),
new TracingTab(),
@@ -62,4 +66,5 @@ public class KarafLauncherTabGroup exten
public void setDefaults(final ILaunchConfigurationWorkingCopy configuration) {
super.setDefaults(configuration);
}
+
}
Added: karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/launcher/KarafServerLaunchShortcut.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/launcher/KarafServerLaunchShortcut.java?rev=1229081&view=auto
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/launcher/KarafServerLaunchShortcut.java (added)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/org/apache/karaf/eik/wtp/ui/launcher/KarafServerLaunchShortcut.java Mon Jan 9 10:17:36 2012
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.karaf.eik.wtp.ui.launcher;
+
+import org.apache.karaf.eik.ui.KarafLaunchConfigurationInitializer;
+
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.pde.ui.launcher.OSGiLaunchShortcut;
+
+public class KarafServerLaunchShortcut extends OSGiLaunchShortcut {
+
+ @Override
+ protected String getLaunchConfigurationTypeName() {
+ return "org.apache.karaf.eik.wtp.ui.KarafLauncher";
+ }
+
+ @Override
+ protected void initializeConfiguration(
+ ILaunchConfigurationWorkingCopy configuration) {
+ super.initializeConfiguration(configuration);
+
+ KarafLaunchConfigurationInitializer.initializeConfiguration(configuration);
+ }
+
+}