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 10:35:35 UTC
svn commit: r1229074 [3/3] - in /karaf/eik/trunk:
features/org.apache.karaf.eik.update/src/main/resources/
plugins/org.apache.karaf.eik.ui/ plugins/org.apache.karaf.eik.ui/META-INF/
plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/ka...
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/project/impl/FilteredOsgiFrameworkJarBuildUnit.java (from r1229073, karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/impl/FilteredOsgiFrameworkJarBuildUnit.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/project/impl/FilteredOsgiFrameworkJarBuildUnit.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/project/impl/FilteredOsgiFrameworkJarBuildUnit.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/impl/FilteredOsgiFrameworkJarBuildUnit.java&r1=1229073&r2=1229074&rev=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/impl/FilteredOsgiFrameworkJarBuildUnit.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/project/impl/FilteredOsgiFrameworkJarBuildUnit.java Mon Jan 9 09:35:31 2012
@@ -1,18 +1,26 @@
-/**
- * Copyright (c) 2011 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.ui.project.impl;
+package org.apache.karaf.eik.ui.project.impl;
import org.apache.karaf.eik.core.KarafPlatformModel;
-import info.evanchik.eclipse.karaf.ui.IKarafProject;
-import info.evanchik.eclipse.karaf.ui.KarafUIPluginActivator;
+import org.apache.karaf.eik.ui.IKarafProject;
+import org.apache.karaf.eik.ui.KarafUIPluginActivator;
import java.io.File;
import java.io.FileInputStream;
@@ -35,16 +43,8 @@ import org.eclipse.core.runtime.IProgres
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public class FilteredOsgiFrameworkJarBuildUnit extends AbstractKarafBuildUnit {
- /**
- * @param karafPlatformModel
- * @param karafProject
- */
public FilteredOsgiFrameworkJarBuildUnit(final KarafPlatformModel karafPlatformModel, final IKarafProject karafProject) {
super(karafPlatformModel, karafProject);
}
@@ -149,4 +149,5 @@ public class FilteredOsgiFrameworkJarBui
}
}
}
+
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/project/impl/KarafPlatformResourcesBuildUnit.java (from r1229073, karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/impl/KarafPlatformResourcesBuildUnit.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/project/impl/KarafPlatformResourcesBuildUnit.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/project/impl/KarafPlatformResourcesBuildUnit.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/impl/KarafPlatformResourcesBuildUnit.java&r1=1229073&r2=1229074&rev=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/impl/KarafPlatformResourcesBuildUnit.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/project/impl/KarafPlatformResourcesBuildUnit.java Mon Jan 9 09:35:31 2012
@@ -1,17 +1,25 @@
-/**
- * Copyright (c) 2011 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.ui.project.impl;
+package org.apache.karaf.eik.ui.project.impl;
import org.apache.karaf.eik.core.KarafPlatformModel;
-import info.evanchik.eclipse.karaf.ui.IKarafProject;
+import org.apache.karaf.eik.ui.IKarafProject;
import java.util.Map;
@@ -23,17 +31,8 @@ import org.eclipse.core.runtime.Path;
import org.eclipse.core.variables.IDynamicVariable;
import org.eclipse.core.variables.VariablesPlugin;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public class KarafPlatformResourcesBuildUnit extends AbstractKarafBuildUnit {
- /**
- *
- * @param karafPlatformModel
- * @param karafProject
- */
public KarafPlatformResourcesBuildUnit(final KarafPlatformModel karafPlatformModel, final IKarafProject karafProject) {
super(karafPlatformModel, karafProject);
}
@@ -82,4 +81,5 @@ public class KarafPlatformResourcesBuild
project.getFolder(".bin/platform/eclipse/plugins").createLink(new Path(eclipseHome).append("plugins"), 0, monitor);
}
}
+
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/project/impl/KarafRuntimePropertyBuildUnit.java (from r1229073, karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/impl/KarafRuntimePropertyBuildUnit.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/project/impl/KarafRuntimePropertyBuildUnit.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/project/impl/KarafRuntimePropertyBuildUnit.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/impl/KarafRuntimePropertyBuildUnit.java&r1=1229073&r2=1229074&rev=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/impl/KarafRuntimePropertyBuildUnit.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/project/impl/KarafRuntimePropertyBuildUnit.java Mon Jan 9 09:35:31 2012
@@ -1,20 +1,28 @@
-/**
- * Copyright (c) 2011 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.ui.project.impl;
+package org.apache.karaf.eik.ui.project.impl;
import org.apache.karaf.eik.core.KarafCorePluginUtils;
import org.apache.karaf.eik.core.KarafPlatformModel;
import org.apache.karaf.eik.core.PropertyUtils;
-import info.evanchik.eclipse.karaf.ui.IKarafProject;
-import info.evanchik.eclipse.karaf.ui.KarafUIPluginActivator;
+import org.apache.karaf.eik.ui.IKarafProject;
+import org.apache.karaf.eik.ui.KarafUIPluginActivator;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -28,11 +36,6 @@ import org.eclipse.core.runtime.IProgres
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-/**
- *
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public class KarafRuntimePropertyBuildUnit extends AbstractKarafBuildUnit {
public KarafRuntimePropertyBuildUnit(final KarafPlatformModel karafPlatformModel, final IKarafProject karafProject) {
@@ -83,4 +86,5 @@ public class KarafRuntimePropertyBuildUn
e));
}
}
+
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/project/impl/PopulateObrFileBuildUnit.java (from r1229073, karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/impl/PopulateObrFileBuildUnit.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/project/impl/PopulateObrFileBuildUnit.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/project/impl/PopulateObrFileBuildUnit.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/impl/PopulateObrFileBuildUnit.java&r1=1229073&r2=1229074&rev=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/project/impl/PopulateObrFileBuildUnit.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/project/impl/PopulateObrFileBuildUnit.java Mon Jan 9 09:35:31 2012
@@ -1,19 +1,27 @@
-/**
- * Copyright (c) 2011 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.ui.project.impl;
+package org.apache.karaf.eik.ui.project.impl;
import org.apache.karaf.eik.core.KarafPlatformModel;
-import info.evanchik.eclipse.karaf.ui.IKarafProject;
-import info.evanchik.eclipse.karaf.ui.KarafUIPluginActivator;
-import info.evanchik.eclipse.karaf.ui.internal.PopulateObrFileJob;
+import org.apache.karaf.eik.ui.IKarafProject;
+import org.apache.karaf.eik.ui.KarafUIPluginActivator;
+import org.apache.karaf.eik.ui.internal.PopulateObrFileJob;
import java.util.Map;
@@ -24,16 +32,8 @@ import org.eclipse.core.runtime.IProgres
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public class PopulateObrFileBuildUnit extends AbstractKarafBuildUnit {
- /**
- * @param karafPlatformModel
- * @param karafProject
- */
public PopulateObrFileBuildUnit(final KarafPlatformModel karafPlatformModel, final IKarafProject karafProject) {
super(karafPlatformModel, karafProject);
}
@@ -61,4 +61,5 @@ public class PopulateObrFileBuildUnit ex
throw new CoreException(new Status(IStatus.ERROR, KarafUIPluginActivator.PLUGIN_ID, "Unable to populate OBR file", e));
}
}
+
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/wizards/NewKarafProjectWizard.java (from r1229073, karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/wizards/NewKarafProjectWizard.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/wizards/NewKarafProjectWizard.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/wizards/NewKarafProjectWizard.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/wizards/NewKarafProjectWizard.java&r1=1229073&r2=1229074&rev=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/wizards/NewKarafProjectWizard.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/wizards/NewKarafProjectWizard.java Mon Jan 9 09:35:31 2012
@@ -1,23 +1,31 @@
-/**
- * Copyright (c) 2011 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.ui.wizards;
+package org.apache.karaf.eik.ui.wizards;
import org.apache.karaf.eik.core.KarafPlatformModel;
import org.apache.karaf.eik.core.KarafWorkingPlatformModel;
import org.apache.karaf.eik.core.model.WorkingKarafPlatformModel;
-import info.evanchik.eclipse.karaf.ui.IKarafProject;
-import info.evanchik.eclipse.karaf.ui.KarafUIPluginActivator;
-import info.evanchik.eclipse.karaf.ui.project.KarafProject;
-import info.evanchik.eclipse.karaf.ui.project.NewKarafProjectOperation;
-import info.evanchik.eclipse.karaf.ui.wizards.provisioner.KarafInstallationSelectionPage;
+import org.apache.karaf.eik.ui.IKarafProject;
+import org.apache.karaf.eik.ui.KarafUIPluginActivator;
+import org.apache.karaf.eik.ui.project.KarafProject;
+import org.apache.karaf.eik.ui.project.NewKarafProjectOperation;
+import org.apache.karaf.eik.ui.wizards.provisioner.KarafInstallationSelectionPage;
import java.lang.reflect.InvocationTargetException;
@@ -26,10 +34,6 @@ import org.eclipse.jface.wizard.Wizard;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public class NewKarafProjectWizard extends Wizard implements INewWizard {
private KarafInstallationSelectionPage installationSelectionPage;
@@ -42,9 +46,6 @@ public class NewKarafProjectWizard exten
private IWorkbench workbench;;
- /**
- *
- */
public NewKarafProjectWizard() {
setDefaultPageImageDescriptor(KarafUIPluginActivator.getDefault().getImageRegistry().getDescriptor(KarafUIPluginActivator.LOGO_64X64_IMG));
setDialogSettings(KarafUIPluginActivator.getDefault().getDialogSettings());
@@ -53,7 +54,7 @@ public class NewKarafProjectWizard exten
@Override
public void addPages() {
- mainPage = new NewKarafProjectWizardPage("Create a new Apache Karaf Project", selection);
+ mainPage = new NewKarafProjectWizardPage("Create a new Apache Karaf project", selection);
addPage(mainPage);
@@ -95,4 +96,5 @@ public class NewKarafProjectWizard exten
return false;
}
}
+
}
Added: karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/wizards/NewKarafProjectWizardPage.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/wizards/NewKarafProjectWizardPage.java?rev=1229074&view=auto
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/wizards/NewKarafProjectWizardPage.java (added)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/wizards/NewKarafProjectWizardPage.java Mon Jan 9 09:35:31 2012
@@ -0,0 +1,33 @@
+/*
+ * 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.ui.wizards;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
+
+public class NewKarafProjectWizardPage extends WizardNewProjectCreationPage {
+
+ public NewKarafProjectWizardPage(final String pageName, final IStructuredSelection selection) {
+ super(pageName);
+
+ setTitle("Create an Apache Karaf project");
+ setDescription("Name the project");
+ }
+
+}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/wizards/provisioner/KarafInstallationProvisionerWizard.java (from r1229073, karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/wizards/provisioner/KarafInstallationProvisionerWizard.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/wizards/provisioner/KarafInstallationProvisionerWizard.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/wizards/provisioner/KarafInstallationProvisionerWizard.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/wizards/provisioner/KarafInstallationProvisionerWizard.java&r1=1229073&r2=1229074&rev=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/wizards/provisioner/KarafInstallationProvisionerWizard.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/wizards/provisioner/KarafInstallationProvisionerWizard.java Mon Jan 9 09:35:31 2012
@@ -1,18 +1,26 @@
-/**
- * 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.ui.wizards.provisioner;
+package org.apache.karaf.eik.ui.wizards.provisioner;
import org.apache.karaf.eik.core.KarafPlatformModel;
-import info.evanchik.eclipse.karaf.ui.KarafUIPluginActivator;
-import info.evanchik.eclipse.karaf.ui.internal.KarafLaunchUtils;
+import org.apache.karaf.eik.ui.KarafUIPluginActivator;
+import org.apache.karaf.eik.ui.internal.KarafLaunchUtils;
import java.io.File;
import java.util.Collection;
@@ -20,10 +28,6 @@ import java.util.Collection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.pde.ui.IProvisionerWizard;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public class KarafInstallationProvisionerWizard extends Wizard implements IProvisionerWizard {
private KarafPlatformModel karafPlatformModel;
@@ -59,4 +63,5 @@ public class KarafInstallationProvisione
karafPlatformModel = karafInstallationPage.getKarafPlatformModel();
return true;
}
+
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/wizards/provisioner/KarafInstallationSelectionPage.java (from r1229073, karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/wizards/provisioner/KarafInstallationSelectionPage.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/wizards/provisioner/KarafInstallationSelectionPage.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/wizards/provisioner/KarafInstallationSelectionPage.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/wizards/provisioner/KarafInstallationSelectionPage.java&r1=1229073&r2=1229074&rev=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/wizards/provisioner/KarafInstallationSelectionPage.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/wizards/provisioner/KarafInstallationSelectionPage.java Mon Jan 9 09:35:31 2012
@@ -1,19 +1,27 @@
-/**
- * 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.ui.wizards.provisioner;
+package org.apache.karaf.eik.ui.wizards.provisioner;
import org.apache.karaf.eik.core.KarafPlatformDetails;
import org.apache.karaf.eik.core.KarafPlatformModel;
import org.apache.karaf.eik.core.KarafPlatformModelRegistry;
-import info.evanchik.eclipse.karaf.ui.KarafUIPluginActivator;
+import org.apache.karaf.eik.ui.KarafUIPluginActivator;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Path;
@@ -33,10 +41,6 @@ import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public class KarafInstallationSelectionPage extends WizardPage {
protected KarafPlatformModel karafPlatform;
@@ -186,4 +190,5 @@ public class KarafInstallationSelectionP
KarafUIPluginActivator.getLogger().error("There was an error loading the installation", e);
}
}
+
}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/workbench/KarafWorkbenchService.java (from r1229073, karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/workbench/KarafWorkbenchService.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/workbench/KarafWorkbenchService.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/workbench/KarafWorkbenchService.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/workbench/KarafWorkbenchService.java&r1=1229073&r2=1229074&rev=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/workbench/KarafWorkbenchService.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/workbench/KarafWorkbenchService.java Mon Jan 9 09:35:31 2012
@@ -1,14 +1,22 @@
-/**
- * Copyright (c) 2010 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.ui.workbench;
+package org.apache.karaf.eik.ui.workbench;
import org.apache.karaf.eik.core.KarafWorkingPlatformModel;
import org.apache.karaf.eik.core.equinox.BundleEntry;
@@ -22,18 +30,8 @@ import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public interface KarafWorkbenchService {
- /**
- *
- * @param platformModel
- * @param configuration
- * @return
- */
public List<BundleEntry> getAdditionalBundles(KarafWorkingPlatformModel platformModel, ILaunchConfiguration configuration);
/**
@@ -47,12 +45,6 @@ public interface KarafWorkbenchService {
*/
public Map<String, String> getAdditionalEquinoxConfiguration(KarafWorkingPlatformModel platformModel, ILaunchConfiguration configuration);
- /**
- *
- * @param configuration
- * @return
- * @throws CoreException
- */
public List<String> getVMArguments(KarafWorkingPlatformModel platformModel, ILaunchConfiguration configuration) throws CoreException;
/**
@@ -66,13 +58,6 @@ public interface KarafWorkbenchService {
*/
public void initialize(KarafWorkingPlatformModel platformModel, ILaunchConfigurationWorkingCopy configuration);
- /**
- *
- * @param configuration
- * @param mode
- * @param launch
- * @param monitor
- * @throws CoreException
- */
public void launch(KarafWorkingPlatformModel platformModel, ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException;
+
}
Added: karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/workbench/KarafWorkbenchServiceFactory.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/workbench/KarafWorkbenchServiceFactory.java?rev=1229074&view=auto
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/workbench/KarafWorkbenchServiceFactory.java (added)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/workbench/KarafWorkbenchServiceFactory.java Mon Jan 9 09:35:31 2012
@@ -0,0 +1,25 @@
+/*
+ * 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.ui.workbench;
+
+public interface KarafWorkbenchServiceFactory {
+
+ public KarafWorkbenchService getWorkbenchService();
+
+}
Copied: karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/workbench/internal/GenericKarafWorkbenchService.java (from r1229073, karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/workbench/internal/GenericKarafWorkbenchService.java)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/workbench/internal/GenericKarafWorkbenchService.java?p2=karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/workbench/internal/GenericKarafWorkbenchService.java&p1=karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/workbench/internal/GenericKarafWorkbenchService.java&r1=1229073&r2=1229074&rev=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/info/evanchik/eclipse/karaf/ui/workbench/internal/GenericKarafWorkbenchService.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/workbench/internal/GenericKarafWorkbenchService.java Mon Jan 9 09:35:31 2012
@@ -1,14 +1,22 @@
-/**
- * Copyright (c) 2010 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.ui.workbench.internal;
+package org.apache.karaf.eik.ui.workbench.internal;
import org.apache.karaf.eik.core.IKarafConstants;
import org.apache.karaf.eik.core.KarafCorePluginUtils;
@@ -21,11 +29,11 @@ import org.apache.karaf.eik.core.equinox
import org.apache.karaf.eik.core.model.GenericKarafPlatformModel;
import org.apache.karaf.eik.core.shell.KarafSshConnectionUrl;
import org.apache.karaf.eik.core.shell.KarafSshShellConnection;
-import info.evanchik.eclipse.karaf.ui.IKarafProject;
-import info.evanchik.eclipse.karaf.ui.KarafLaunchConfigurationConstants;
-import info.evanchik.eclipse.karaf.ui.KarafUIPluginActivator;
-import info.evanchik.eclipse.karaf.ui.console.KarafRemoteConsole;
-import info.evanchik.eclipse.karaf.ui.workbench.KarafWorkbenchService;
+import org.apache.karaf.eik.ui.IKarafProject;
+import org.apache.karaf.eik.ui.KarafLaunchConfigurationConstants;
+import org.apache.karaf.eik.ui.KarafUIPluginActivator;
+import org.apache.karaf.eik.ui.console.KarafRemoteConsole;
+import org.apache.karaf.eik.ui.workbench.KarafWorkbenchService;
import java.util.ArrayList;
import java.util.Collections;
@@ -55,17 +63,8 @@ import org.eclipse.ui.console.ConsolePlu
import org.eclipse.ui.console.IConsole;
import org.eclipse.ui.console.IConsoleManager;
-/**
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
public class GenericKarafWorkbenchService implements KarafWorkbenchService {
- /**
- *
- * @author Stephen Evanchik (evanchsa@gmail.com)
- *
- */
private final class KarafConsoleLaunchListener implements ILaunchListener {
/**
@@ -208,16 +207,16 @@ public class GenericKarafWorkbenchServic
}
final String[] bundles = {
- "org.apache.karaf.eik.app", //$NON-NLS-1$
- "org.eclipse.core.contenttype", //$NON-NLS-1$
- "org.eclipse.core.jobs", //$NON-NLS-1$
- "org.eclipse.core.runtime", //$NON-NLS-1$
- "org.eclipse.core.runtime.compatibility.auth", //$NON-NLS-1$
- "org.eclipse.equinox.app", //$NON-NLS-1$
- "org.eclipse.equinox.common", //$NON-NLS-1$
- "org.eclipse.equinox.registry", //$NON-NLS-1$
- "org.eclipse.equinox.preferences", //$NON-NLS-1$
- "org.eclipse.osgi.util" //$NON-NLS-1$
+ "org.apache.karaf.eik.app",
+ "org.eclipse.core.contenttype",
+ "org.eclipse.core.jobs",
+ "org.eclipse.core.runtime",
+ "org.eclipse.core.runtime.compatibility.auth",
+ "org.eclipse.equinox.app",
+ "org.eclipse.equinox.common",
+ "org.eclipse.equinox.registry",
+ "org.eclipse.equinox.preferences",
+ "org.eclipse.osgi.util"
};
final List<BundleEntry> bundleEntries = new ArrayList<BundleEntry>();
@@ -360,10 +359,6 @@ public class GenericKarafWorkbenchServic
configureJMXConnector(platformModel);
}
- /**
- * @param platformModel
- * @param equinoxProperties
- */
private void addEclipseObrFile(
final KarafWorkingPlatformModel platformModel,
final Map<String, String> equinoxProperties) {
@@ -386,11 +381,6 @@ public class GenericKarafWorkbenchServic
}
}
- /**
- *
- * @param platformModel
- * @throws CoreException
- */
private void configureJMXConnector(
final KarafWorkingPlatformModel platformModel) throws CoreException {
/*
@@ -413,11 +403,6 @@ public class GenericKarafWorkbenchServic
managementSection.save();
}
- /**
- *
- * @param platformModel
- * @throws CoreException
- */
private void configureKarafFeatures(
final KarafWorkingPlatformModel platformModel, final ILaunchConfiguration configuration) throws CoreException {
@@ -441,12 +426,6 @@ public class GenericKarafWorkbenchServic
featuresSection.save();
}
- /**
- * @param platformModel
- * @param configuration
- * @return
- * @throws CoreException
- */
private Properties createLaunchSystemProperties(
final KarafWorkingPlatformModel platformModel,
final ILaunchConfiguration configuration) throws CoreException {
@@ -492,11 +471,6 @@ public class GenericKarafWorkbenchServic
return systemProperties;
}
- /**
- *
- * @param platformModel
- * @return
- */
private Properties loadSystemProperties(final KarafWorkingPlatformModel platformModel) {
try {
@@ -513,4 +487,5 @@ public class GenericKarafWorkbenchServic
return new Properties();
}
+
}
Added: karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/workbench/internal/GenericKarafWorkbenchServiceFactory.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/workbench/internal/GenericKarafWorkbenchServiceFactory.java?rev=1229074&view=auto
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/workbench/internal/GenericKarafWorkbenchServiceFactory.java (added)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/workbench/internal/GenericKarafWorkbenchServiceFactory.java Mon Jan 9 09:35:31 2012
@@ -0,0 +1,33 @@
+/*
+ * 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.ui.workbench.internal;
+
+import org.apache.karaf.eik.ui.workbench.KarafWorkbenchService;
+import org.apache.karaf.eik.ui.workbench.KarafWorkbenchServiceFactory;
+
+public class GenericKarafWorkbenchServiceFactory implements KarafWorkbenchServiceFactory {
+
+ private static final GenericKarafWorkbenchService workbenchService =
+ new GenericKarafWorkbenchService();
+
+ public KarafWorkbenchService getWorkbenchService() {
+ return workbenchService;
+ }
+
+}
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/META-INF/MANIFEST.MF?rev=1229074&r1=1229073&r2=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/META-INF/MANIFEST.MF (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/META-INF/MANIFEST.MF Mon Jan 9 09:35:31 2012
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.runtime
org.eclipse.ui.navigator.resources;bundle-version="3.4.202",
org.apache.karaf.eik.core;bundle-version="0.5.3",
org.apache.karaf.eik.jmx;bundle-version="0.5.0",
- info.evanchik.eclipse.karaf.ui;bundle-version="0.5.3"
+ org.apache.karaf.eik.ui;bundle-version="0.5.3"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: info.evanchik.eclipse.karaf.workbench,
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/plugin.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/plugin.xml?rev=1229074&r1=1229073&r2=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/plugin.xml (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/plugin.xml Mon Jan 9 09:35:31 2012
@@ -5,7 +5,7 @@
<extension
id="runtimeData"
name="OSGi C&C Runtime Data provider"
- point="info.evanchik.eclipse.karaf.ui.service">
+ point="org.apache.karaf.eik.ui.service">
<launchCustomizer
class="info.evanchik.eclipse.karaf.workbench.factory.MBeanProviderWorkbenchServiceFactory">
</launchCustomizer>
@@ -59,7 +59,7 @@
class="info.evanchik.eclipse.karaf.workbench.ui.editor.KarafPlatformEditorPart"
default="false"
icon="icons/obj16/karaf-logo-16x16.png"
- id="info.evanchik.eclipse.karaf.ui.editors.KarafPlatformEditor"
+ id="org.apache.karaf.eik.ui.editors.KarafPlatformEditor"
name="Karaf Platform">
</editor>
</extension>
@@ -67,7 +67,7 @@
point="org.eclipse.ui.navigator.navigatorContent">
<actionProvider
class="info.evanchik.eclipse.karaf.workbench.internal.WorkbenchActionProvider"
- id="info.evanchik.eclipse.karaf.ui.navigator.workbenchActionProvider">
+ id="org.apache.karaf.eik.ui.navigator.workbenchActionProvider">
<enablement>
<adapt
type="org.eclipse.core.resources.IProject">
@@ -85,7 +85,7 @@
viewerId="org.eclipse.ui.navigator.ProjectExplorer">
<includes>
<actionExtension
- pattern="info.evanchik.eclipse.karaf.ui.navigator.*">
+ pattern="org.apache.karaf.eik.ui.navigator.*">
</actionExtension>
</includes>
</viewerActionBinding>
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/KarafWorkbenchActivator.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/KarafWorkbenchActivator.java?rev=1229074&r1=1229073&r2=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/KarafWorkbenchActivator.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/KarafWorkbenchActivator.java Mon Jan 9 09:35:31 2012
@@ -1,7 +1,7 @@
package info.evanchik.eclipse.karaf.workbench;
import org.apache.karaf.eik.core.LogWrapper;
-import info.evanchik.eclipse.karaf.ui.KarafUIPluginActivator;
+import org.apache.karaf.eik.ui.KarafUIPluginActivator;
import info.evanchik.eclipse.karaf.workbench.internal.MBeanProviderManager;
import info.evanchik.eclipse.karaf.workbench.internal.RuntimeDataProviderManager;
import info.evanchik.eclipse.karaf.workbench.internal.eclipse.EclipseRuntimeDataProvider;
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/factory/MBeanProviderWorkbenchServiceFactory.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/factory/MBeanProviderWorkbenchServiceFactory.java?rev=1229074&r1=1229073&r2=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/factory/MBeanProviderWorkbenchServiceFactory.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/factory/MBeanProviderWorkbenchServiceFactory.java Mon Jan 9 09:35:31 2012
@@ -10,8 +10,8 @@
*/
package info.evanchik.eclipse.karaf.workbench.factory;
-import info.evanchik.eclipse.karaf.ui.workbench.KarafWorkbenchService;
-import info.evanchik.eclipse.karaf.ui.workbench.KarafWorkbenchServiceFactory;
+import org.apache.karaf.eik.ui.workbench.KarafWorkbenchService;
+import org.apache.karaf.eik.ui.workbench.KarafWorkbenchServiceFactory;
import info.evanchik.eclipse.karaf.workbench.internal.KarafMBeanProviderWorkbenchService;
/**
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/internal/KarafMBeanProviderWorkbenchService.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/internal/KarafMBeanProviderWorkbenchService.java?rev=1229074&r1=1229073&r2=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/internal/KarafMBeanProviderWorkbenchService.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/internal/KarafMBeanProviderWorkbenchService.java Mon Jan 9 09:35:31 2012
@@ -13,7 +13,7 @@ package info.evanchik.eclipse.karaf.work
import org.apache.karaf.eik.core.KarafCorePluginUtils;
import org.apache.karaf.eik.core.KarafWorkingPlatformModel;
import org.apache.karaf.eik.core.equinox.BundleEntry;
-import info.evanchik.eclipse.karaf.ui.workbench.KarafWorkbenchService;
+import org.apache.karaf.eik.ui.workbench.KarafWorkbenchService;
import info.evanchik.eclipse.karaf.workbench.KarafWorkbenchActivator;
import info.evanchik.eclipse.karaf.workbench.MBeanProvider;
import info.evanchik.eclipse.karaf.workbench.WorkbenchServiceManager;
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/internal/WorkbenchActionProvider.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/internal/WorkbenchActionProvider.java?rev=1229074&r1=1229073&r2=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/internal/WorkbenchActionProvider.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/internal/WorkbenchActionProvider.java Mon Jan 9 09:35:31 2012
@@ -10,7 +10,7 @@
*/
package info.evanchik.eclipse.karaf.workbench.internal;
-import info.evanchik.eclipse.karaf.ui.IKarafProject;
+import org.apache.karaf.eik.ui.IKarafProject;
import info.evanchik.eclipse.karaf.workbench.KarafWorkbenchActivator;
import info.evanchik.eclipse.karaf.workbench.ui.editor.KarafPlatformEditorInput;
import info.evanchik.eclipse.karaf.workbench.ui.editor.KarafPlatformEditorPart;
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/ui/KarafWorkbenchPerspectiveFactory.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/ui/KarafWorkbenchPerspectiveFactory.java?rev=1229074&r1=1229073&r2=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/ui/KarafWorkbenchPerspectiveFactory.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/ui/KarafWorkbenchPerspectiveFactory.java Mon Jan 9 09:35:31 2012
@@ -34,7 +34,7 @@ public class KarafWorkbenchPerspectiveFa
layout.addActionSet("org.eclipse.debug.ui.launchActionSet");
layout.addActionSet("org.eclipse.debug.ui.profileActionSet");
- layout.addNewWizardShortcut("info.evanchik.eclipse.karaf.ui.karafPlatformProject");
+ layout.addNewWizardShortcut("org.apache.karaf.eik.ui.karafPlatformProject");
final IFolderLayout leftFolder =
layout.createFolder(
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/ui/editor/KarafPlatformEditorInput.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/ui/editor/KarafPlatformEditorInput.java?rev=1229074&r1=1229073&r2=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/ui/editor/KarafPlatformEditorInput.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/ui/editor/KarafPlatformEditorInput.java Mon Jan 9 09:35:31 2012
@@ -11,7 +11,7 @@
package info.evanchik.eclipse.karaf.workbench.ui.editor;
import org.apache.karaf.eik.core.KarafPlatformModel;
-import info.evanchik.eclipse.karaf.ui.IKarafProject;
+import org.apache.karaf.eik.ui.IKarafProject;
import info.evanchik.eclipse.karaf.workbench.KarafWorkbenchActivator;
import org.eclipse.jface.resource.ImageDescriptor;
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/ui/editor/KarafPlatformEditorPart.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/ui/editor/KarafPlatformEditorPart.java?rev=1229074&r1=1229073&r2=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/ui/editor/KarafPlatformEditorPart.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.workbench/src/main/java/info/evanchik/eclipse/karaf/workbench/ui/editor/KarafPlatformEditorPart.java Mon Jan 9 09:35:31 2012
@@ -25,7 +25,7 @@ import org.eclipse.ui.forms.editor.FormE
*/
public class KarafPlatformEditorPart extends FormEditor {
- public static final String ID = "info.evanchik.eclipse.karaf.ui.editors.KarafPlatformEditor";
+ public static final String ID = "org.apache.karaf.eik.ui.editors.KarafPlatformEditor";
private KarafPlatformEditorInput karafEditorInput;
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/META-INF/MANIFEST.MF?rev=1229074&r1=1229073&r2=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/META-INF/MANIFEST.MF (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/META-INF/MANIFEST.MF Mon Jan 9 09:35:31 2012
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.jst.server.c
org.eclipse.jst.common.project.facet.core;bundle-version="1.4.0",
org.osgi.jmx;bundle-version="1.0.0",
org.apache.karaf.eik.core;bundle-version="0.5.2",
- info.evanchik.eclipse.karaf.ui;bundle-version="0.5.2",
+ org.apache.karaf.eik.ui;bundle-version="0.5.2",
info.evanchik.eclipse.karaf.workbench;bundle-version="0.5.2"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/plugin.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/plugin.xml?rev=1229074&r1=1229073&r2=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/plugin.xml (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/plugin.xml Mon Jan 9 09:35:31 2012
@@ -93,7 +93,7 @@
point="org.eclipse.wst.server.core.publishTasks">
<publishTask
class="info.evanchik.eclipse.karaf.wtp.core.tasks.KarafPublishTask"
- id="info.evanchik.eclipse.karaf.ui.publishTask"
+ id="org.apache.karaf.eik.ui.publishTask"
typeIds="info.evanchik.eclipse.server.karaf.*">
</publishTask>
</extension>
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/src/main/java/info/evanchik/eclipse/karaf/wtp/core/KarafServerLaunchConfiguration.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/src/main/java/info/evanchik/eclipse/karaf/wtp/core/KarafServerLaunchConfiguration.java?rev=1229074&r1=1229073&r2=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/src/main/java/info/evanchik/eclipse/karaf/wtp/core/KarafServerLaunchConfiguration.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/src/main/java/info/evanchik/eclipse/karaf/wtp/core/KarafServerLaunchConfiguration.java Mon Jan 9 09:35:31 2012
@@ -12,7 +12,7 @@ package info.evanchik.eclipse.karaf.wtp.
import org.apache.karaf.eik.core.KarafPlatformModelRegistry;
import org.apache.karaf.eik.core.model.WorkingKarafPlatformModel;
-import info.evanchik.eclipse.karaf.ui.KarafLaunchConfigurationDelegate;
+import org.apache.karaf.eik.ui.KarafLaunchConfigurationDelegate;
import info.evanchik.eclipse.karaf.wtp.core.server.KarafServerBehavior;
import org.eclipse.core.runtime.CoreException;
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/src/main/java/info/evanchik/eclipse/karaf/wtp/core/KarafServerLaunchConfigurationInitializer.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/src/main/java/info/evanchik/eclipse/karaf/wtp/core/KarafServerLaunchConfigurationInitializer.java?rev=1229074&r1=1229073&r2=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/src/main/java/info/evanchik/eclipse/karaf/wtp/core/KarafServerLaunchConfigurationInitializer.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.core/src/main/java/info/evanchik/eclipse/karaf/wtp/core/KarafServerLaunchConfigurationInitializer.java Mon Jan 9 09:35:31 2012
@@ -12,7 +12,7 @@ package info.evanchik.eclipse.karaf.wtp.
import org.apache.karaf.eik.core.KarafPlatformModelRegistry;
import org.apache.karaf.eik.core.configuration.StartupSection;
-import info.evanchik.eclipse.karaf.ui.KarafLaunchConfigurationInitializer;
+import org.apache.karaf.eik.ui.KarafLaunchConfigurationInitializer;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
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=1229074&r1=1229073&r2=1229074&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 09:35:31 2012
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.debug.ui;bun
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",
- info.evanchik.eclipse.karaf.ui;bundle-version="0.5.2"
+ 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
Modified: 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/info/evanchik/eclipse/karaf/wtp/ui/KarafRuntimeComposite.java?rev=1229074&r1=1229073&r2=1229074&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/info/evanchik/eclipse/karaf/wtp/ui/KarafRuntimeComposite.java Mon Jan 9 09:35:31 2012
@@ -10,7 +10,7 @@
*/
package info.evanchik.eclipse.karaf.wtp.ui;
-import info.evanchik.eclipse.karaf.ui.KarafUIPluginActivator;
+import org.apache.karaf.eik.ui.KarafUIPluginActivator;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
Modified: 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/info/evanchik/eclipse/karaf/wtp/ui/KarafRuntimeWizardFragment.java?rev=1229074&r1=1229073&r2=1229074&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/info/evanchik/eclipse/karaf/wtp/ui/KarafRuntimeWizardFragment.java Mon Jan 9 09:35:31 2012
@@ -10,7 +10,7 @@
*/
package info.evanchik.eclipse.karaf.wtp.ui;
-import info.evanchik.eclipse.karaf.ui.KarafUIPluginActivator;
+import org.apache.karaf.eik.ui.KarafUIPluginActivator;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
Modified: 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/info/evanchik/eclipse/karaf/wtp/ui/launcher/KarafLauncherTabGroup.java?rev=1229074&r1=1229073&r2=1229074&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/info/evanchik/eclipse/karaf/wtp/ui/launcher/KarafLauncherTabGroup.java Mon Jan 9 09:35:31 2012
@@ -10,8 +10,8 @@
*/
package info.evanchik.eclipse.karaf.wtp.ui.launcher;
-import info.evanchik.eclipse.karaf.ui.KarafConfigurationTab;
-import info.evanchik.eclipse.karaf.ui.KarafLaunchConfigurationInitializer;
+import org.apache.karaf.eik.ui.KarafConfigurationTab;
+import org.apache.karaf.eik.ui.KarafLaunchConfigurationInitializer;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
Modified: karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/launcher/KarafServerLaunchShortcut.java
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/launcher/KarafServerLaunchShortcut.java?rev=1229074&r1=1229073&r2=1229074&view=diff
==============================================================================
--- karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/launcher/KarafServerLaunchShortcut.java (original)
+++ karaf/eik/trunk/plugins/org.apache.karaf.eik.wtp.ui/src/main/java/info/evanchik/eclipse/karaf/wtp/ui/launcher/KarafServerLaunchShortcut.java Mon Jan 9 09:35:31 2012
@@ -10,7 +10,7 @@
*/
package info.evanchik.eclipse.karaf.wtp.ui.launcher;
-import info.evanchik.eclipse.karaf.ui.KarafLaunchConfigurationInitializer;
+import org.apache.karaf.eik.ui.KarafLaunchConfigurationInitializer;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.pde.ui.launcher.OSGiLaunchShortcut;