Skip to content

Commit

Permalink
Deployment refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
wgalanciak committed Feb 11, 2015
1 parent 125dddb commit 97498af
Show file tree
Hide file tree
Showing 27 changed files with 230 additions and 242 deletions.
Expand Up @@ -41,7 +41,6 @@ Export-Package: org.zend.php.zendserver.deployment.ui,
org.zend.php.zendserver.deployment.ui.contentassist,
org.zend.php.zendserver.deployment.ui.contributions,
org.zend.php.zendserver.deployment.ui.editors,
org.zend.php.zendserver.deployment.ui.preferences,
org.zend.php.zendserver.deployment.ui.wizards,
org.zend.php.zendserver.deployment.ui.zendserver
Bundle-ClassPath: swt.elevate.jar,
Expand Down
Expand Up @@ -100,23 +100,23 @@
<extension
point="org.eclipse.ui.preferencePages">
<page
class="org.zend.php.zendserver.deployment.ui.preferences.OpenShiftPreferencesPage"
class="org.zend.php.zendserver.deployment.ui.openshift.OpenShiftPreferencesPage"
id="org.zend.php.zendserver.deployment.ui.OpenShiftPreferences"
name="%page.name">
</page>
</extension>
<extension
point="org.eclipse.core.runtime.preferences">
<initializer
class="org.zend.php.zendserver.deployment.ui.preferences.OpenShiftPreferenceInitializer">
class="org.zend.php.zendserver.deployment.ui.openshift.OpenShiftPreferenceInitializer">
</initializer>
</extension>
<extension
id="com.zend.php.platform.ui.platformWizardFragment"
name="Deployment"
point="org.eclipse.php.ui.wizardAndCompositeFragments">
<wizardAndCompositeFragment
class="org.zend.php.zendserver.deployment.ui.preferences.DeploymentFragmentFactory"
class="org.zend.php.zendserver.deployment.ui.servers.DeploymentFragmentFactory"
fragmentsGroupID="org.eclipse.php.server.ui.serverWizardAndComposite"
id="org.zend.php.zendserver.deployment.ui.deploymentFragmentFactory"
name="Deployment Wizard Fragment"
Expand All @@ -134,7 +134,7 @@
<extension
point="org.eclipse.php.ui.wizardAndCompositeFragments">
<wizardAndCompositeFragment
class="org.zend.php.zendserver.deployment.ui.preferences.OpenShiftFragmentFactory"
class="org.zend.php.zendserver.deployment.ui.openshift.OpenShiftFragmentFactory"
fragmentsGroupID="org.eclipse.php.server.ui.serverWizardAndComposite"
id="org.zend.php.zendserver.deployment.ui.preferences.OpenShiftFragmentFactory"
name="RedHat OpenShift Fragment">
Expand All @@ -143,7 +143,7 @@
<extension
point="org.eclipse.php.ui.wizardAndCompositeFragments">
<wizardAndCompositeFragment
class="org.zend.php.zendserver.deployment.ui.preferences.TunnelingFragmentFactory"
class="org.zend.php.zendserver.deployment.ui.tunneling.TunnelingFragmentFactory"
fragmentsGroupID="org.eclipse.php.server.ui.serverWizardAndComposite"
id="org.zend.php.zendserver.deployment.ui.TunnelingFragmentFactory"
name="SSH Tunneling">
Expand Down
@@ -0,0 +1,41 @@
package org.zend.php.zendserver.deployment.ui.openshift;

import org.eclipse.osgi.util.NLS;

public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.zend.php.zendserver.deployment.ui.openshift.messages"; //$NON-NLS-1$
public static String OpenShiftCompositeFragment_AppCreatedMessage;
public static String OpenShiftCompositeFragment_BrowseLabel;
public static String OpenShiftCompositeFragment_CreateAccountLabel;
public static String OpenShiftCompositeFragment_CreateTargetLabel;
public static String OpenShiftCompositeFragment_Desc;
public static String OpenShiftCompositeFragment_DetectingAppsTitle;
public static String OpenShiftCompositeFragment_EmptyKeyError;
public static String OpenShiftCompositeFragment_EmptyPasswordError;
public static String OpenShiftCompositeFragment_EmptyUsernameError;
public static String OpenShiftCompositeFragment_GenerateLabel;
public static String OpenShiftCompositeFragment_InvalidKeyError;
public static String OpenShiftCompositeFragment_KeyDesc;
public static String OpenShiftCompositeFragment_KeyLabel;
public static String OpenShiftCompositeFragment_KeyTooltip;
public static String OpenShiftCompositeFragment_NoCredentialsError;
public static String OpenShiftCompositeFragment_NotExistKeyError;
public static String OpenShiftCompositeFragment_NoValidAppsError;
public static String OpenShiftCompositeFragment_PasswordLabel;
public static String OpenShiftCompositeFragment_PasswordTooltip;
public static String OpenShiftCompositeFragment_RestoreLabel;
public static String OpenShiftCompositeFragment_Title;
public static String OpenShiftCompositeFragment_UsernameLabel;
public static String OpenShiftCompositeFragment_UsernameTooltip;
public static String OpenShiftCompositeFragment_WarningMessage;
public static String OpenShiftCompositeFragment_WarningTitle;
public static String OpenShiftPreferencesPage_0;
public static String OpenShiftPreferencesPage_1;
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
}

private Messages() {
}
}
Expand Up @@ -6,7 +6,7 @@
* You must not copy, adapt or redistribute this document for
* any use.
*******************************************************************************/
package org.zend.php.zendserver.deployment.ui.preferences;
package org.zend.php.zendserver.deployment.ui.openshift;

import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -49,6 +49,8 @@
import org.zend.php.zendserver.deployment.core.targets.TargetsManagerService;
import org.zend.php.zendserver.deployment.core.tunnel.SSHTunnelConfiguration;
import org.zend.php.zendserver.deployment.ui.Activator;
import org.zend.php.zendserver.deployment.ui.servers.AbstractCloudCompositeFragment;
import org.zend.php.zendserver.deployment.ui.servers.TargetConnectionTester;
import org.zend.php.zendserver.deployment.ui.wizards.OpenShiftTargetData;
import org.zend.php.zendserver.deployment.ui.wizards.OpenShiftTargetWizard;
import org.zend.php.zendserver.deployment.ui.wizards.OpenShiftTargetWizardDialog;
Expand Down
Expand Up @@ -6,7 +6,7 @@
* You must not copy, adapt or redistribute this document for
* any use.
*******************************************************************************/
package org.zend.php.zendserver.deployment.ui.preferences;
package org.zend.php.zendserver.deployment.ui.openshift;

import org.eclipse.php.internal.server.core.Server;
import org.eclipse.php.internal.ui.wizards.CompositeFragment;
Expand Down
@@ -1,4 +1,4 @@
package org.zend.php.zendserver.deployment.ui.preferences;
package org.zend.php.zendserver.deployment.ui.openshift;

import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.core.runtime.preferences.DefaultScope;
Expand Down
Expand Up @@ -8,7 +8,7 @@
* Contributors:
* Zend Technologies Ltd. - initial API and implementation
*******************************************************************************/
package org.zend.php.zendserver.deployment.ui.preferences;
package org.zend.php.zendserver.deployment.ui.openshift;

import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.InstanceScope;
Expand Down
Expand Up @@ -6,7 +6,7 @@
* You must not copy, adapt or redistribute this document for
* any use.
*******************************************************************************/
package org.zend.php.zendserver.deployment.ui.preferences;
package org.zend.php.zendserver.deployment.ui.openshift;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
Expand Down
@@ -0,0 +1,27 @@
OpenShiftCompositeFragment_AppCreatedMessage=A new OpenShift server has been created. Click Finish to complete the process.
OpenShiftCompositeFragment_BrowseLabel=Browse...
OpenShiftCompositeFragment_CreateAccountLabel=Create New Account
OpenShiftCompositeFragment_CreateTargetLabel=Create New Server
OpenShiftCompositeFragment_Desc=Enter OpenShift account details.
OpenShiftCompositeFragment_DetectingAppsTitle=Detecting OpenShift applications with zend-6.1 cartridge...
OpenShiftCompositeFragment_EmptyKeyError=Path to private key cannot be empty.
OpenShiftCompositeFragment_EmptyPasswordError=Password cannot be empty.
OpenShiftCompositeFragment_EmptyUsernameError=Username cannot be empty.
OpenShiftCompositeFragment_GenerateLabel=Generate
OpenShiftCompositeFragment_InvalidKeyError=Private SSH key is not valid.
OpenShiftCompositeFragment_KeyDesc=In order to debug and connect to your applications with Zend Server cartridges without a password, you need to specify a SSH private key that enables authentication via asymmetric cryptography. You can either browse to an existing key or generate a new one.
OpenShiftCompositeFragment_KeyLabel=SSH Private Key:
OpenShiftCompositeFragment_KeyTooltip=Select the private key for your OpenShift account.
OpenShiftCompositeFragment_NoCredentialsError=Username and password are required.
OpenShiftCompositeFragment_NotExistKeyError=Private SSH key file does not exist.
OpenShiftCompositeFragment_NoValidAppsError=Could not detect any valid OpenShift servers. You can create new OpenShift server by using 'Create New Server' button below.
OpenShiftCompositeFragment_PasswordLabel=Password:
OpenShiftCompositeFragment_PasswordTooltip=Your OpenShift account password.
OpenShiftCompositeFragment_RestoreLabel=Restore
OpenShiftCompositeFragment_Title=Configure an OpenShift Server
OpenShiftCompositeFragment_UsernameLabel=Username:
OpenShiftCompositeFragment_UsernameTooltip=Your OpenShift account username.
OpenShiftCompositeFragment_WarningMessage=Could not detect all servers on your OpenShift account. At least one of them failed with the following message:\n{0}
OpenShiftCompositeFragment_WarningTitle=OpenShift Issue
OpenShiftPreferencesPage_0=Server URL:
OpenShiftPreferencesPage_1=Domain:

This file was deleted.

0 comments on commit 97498af

Please sign in to comment.