JBoss Tools SVN: r38809 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-02-16 05:08:00 -0500 (Thu, 16 Feb 2012)
New Revision: 38809
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
Log:
[JBIDE-10931] also storing/creating the user if the user is valid but has no domain
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-02-16 10:05:46 UTC (rev 38808)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-02-16 10:08:00 UTC (rev 38809)
@@ -207,8 +207,8 @@
NLS.bind("The credentials for user {0} are not valid", user.getRhlogin()));
}
} catch (NotFoundOpenShiftException e) {
+ // valid user without domain
storeUser(user);
- // valid user without domain
} catch (Exception e) {
status = OpenShiftUIActivator.createErrorStatus(NLS.bind(
"Could not check user credentials: {0}.", e.getMessage()));
12 years, 8 months
JBoss Tools SVN: r38808 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-02-16 05:05:46 -0500 (Thu, 16 Feb 2012)
New Revision: 38808
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
Log:
[JBIDE-10931] also storing/creating the user if the user is valid but has no domain
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-02-16 10:04:32 UTC (rev 38807)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-02-16 10:05:46 UTC (rev 38808)
@@ -194,10 +194,6 @@
setCredentialsStatus(status);
return status;
}
-
- protected void setUser(IUser user) {
- wizardModel.setUser(user);
- }
private IStatus getValidityStatus(String rhLogin, String password) {
IStatus status = Status.OK_STATUS;
@@ -221,7 +217,7 @@
}
private void storeUser(IUser user) {
- setUser(user);
+ wizardModel.setUser(user);
if (rememberPassword) {
storePassword(password);
} else {
12 years, 8 months
JBoss Tools SVN: r38807 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-02-16 05:04:32 -0500 (Thu, 16 Feb 2012)
New Revision: 38807
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
Log:
[JBIDE-10931] also storing/creating the user if the user is valid but has no domain
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-02-16 09:09:11 UTC (rev 38806)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-02-16 10:04:32 UTC (rev 38807)
@@ -201,21 +201,17 @@
private IStatus getValidityStatus(String rhLogin, String password) {
IStatus status = Status.OK_STATUS;
+ IUser user = null;
try {
- IUser user = UserModel.getDefault().createUser(getRhLogin(), getPassword());
+ user = UserModel.getDefault().createUser(getRhLogin(), getPassword());
if (user.isValid()) {
- setUser(user);
- if (rememberPassword) {
- storePassword(password);
- } else {
- erasePasswordStore();
- }
+ storeUser(user);
} else {
status = OpenShiftUIActivator.createErrorStatus(
NLS.bind("The credentials for user {0} are not valid", user.getRhlogin()));
-
}
} catch (NotFoundOpenShiftException e) {
+ storeUser(user);
// valid user without domain
} catch (Exception e) {
status = OpenShiftUIActivator.createErrorStatus(NLS.bind(
@@ -224,4 +220,13 @@
return status;
}
+ private void storeUser(IUser user) {
+ setUser(user);
+ if (rememberPassword) {
+ storePassword(password);
+ } else {
+ erasePasswordStore();
+ }
+ }
+
}
12 years, 8 months
JBoss Tools SVN: r38806 - in trunk: openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-16 04:09:11 -0500 (Thu, 16 Feb 2012)
New Revision: 38806
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentTypeUIUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/IDeploymentTypeUI.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressBinaryUI.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
Log:
JBIDE-10900 - express console needs to create server
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentTypeUIUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentTypeUIUtil.java 2012-02-16 07:57:07 UTC (rev 38805)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentTypeUIUtil.java 2012-02-16 09:09:11 UTC (rev 38806)
@@ -96,6 +96,9 @@
handle.setMessage(msg, IMessageProvider.ERROR);
handle.update();
}
+ public Object getAttribute(String key) {
+ return tm.getObject(key);
+ }
}
@@ -135,6 +138,9 @@
else
section.setErrorMessage(msg);
}
+ public Object getAttribute(String key) {
+ return null;
+ }
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/IDeploymentTypeUI.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/IDeploymentTypeUI.java 2012-02-16 07:57:07 UTC (rev 38805)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/IDeploymentTypeUI.java 2012-02-16 09:09:11 UTC (rev 38806)
@@ -26,6 +26,7 @@
public void execute(IUndoableOperation operation);
public void executeLongRunning(Job j);
public void setErrorMessage(String msg);
+ public Object getAttribute(String key);
}
/**
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-02-16 07:57:07 UTC (rev 38805)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-02-16 09:09:11 UTC (rev 38806)
@@ -65,6 +65,12 @@
/** the OpensHift Server Type as defined in the plugin.xml.*/
public static final String OPENSHIFT_SERVER_TYPE = "org.jboss.tools.openshift.express.openshift.server.type";
+ /* For use inside express wizard fragment */
+ public static final String TASK_WIZARD_ATTR_USER = "user";
+ public static final String TASK_WIZARD_ATTR_APP_LIST = "appList";
+ public static final String TASK_WIZARD_ATTR_SELECTED_APP = "application";
+
+
public static String getExpressMode(IServerAttributes attributes ) {
return attributes.getAttribute(ATTRIBUTE_EXPRESS_MODE, EXPRESS_SOURCE_MODE);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java 2012-02-16 07:57:07 UTC (rev 38805)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java 2012-02-16 09:09:11 UTC (rev 38806)
@@ -1,11 +1,27 @@
package org.jboss.tools.openshift.express.internal.ui.action;
+import java.util.List;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ITreeSelection;
-import org.eclipse.wst.server.core.ServerCore;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.wst.server.ui.internal.Messages;
+import org.eclipse.wst.server.ui.internal.wizard.TaskWizard;
+import org.eclipse.wst.server.ui.internal.wizard.WizardTaskUtil;
+import org.eclipse.wst.server.ui.internal.wizard.fragment.ModifyModulesWizardFragment;
+import org.eclipse.wst.server.ui.internal.wizard.fragment.NewServerWizardFragment;
+import org.eclipse.wst.server.ui.internal.wizard.fragment.TasksWizardFragment;
+import org.eclipse.wst.server.ui.wizard.WizardFragment;
+import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import com.openshift.express.client.IApplication;
+import com.openshift.express.client.IUser;
+import com.openshift.express.client.OpenShiftException;
public class CreateServerAdapterAction extends AbstractAction {
@@ -20,12 +36,36 @@
if (selection != null && selection instanceof ITreeSelection
&& treeSelection.getFirstElement() instanceof IApplication) {
final IApplication application = (IApplication) treeSelection.getFirstElement();
- ServerCore.getServers();
- /*
- * EmbedCartridgeWizard wizard = new EmbedCartridgeWizard(user, user); WizardDialog dialog = new
- * WizardDialog(Display.getCurrent().getActiveShell(), wizard); dialog.create(); dialog.open();
- */
+ IUser user = application.getUser();
+ NewServerWizard w = new NewServerWizard(ExpressServerUtils.OPENSHIFT_SERVER_TYPE);
+ w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_USER, user);
+ w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_SELECTED_APP, application);
+ WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), w);
+ dialog.open();
+ }
+ }
+
+ public class NewServerWizard extends TaskWizard implements INewWizard {
+ public NewServerWizard(final String serverType) {
+ super(Messages.wizNewServerWizardTitle, new WizardFragment() {
+ protected void createChildFragments(List<WizardFragment> list) {
+ list.add(new NewServerWizardFragment(null, serverType));
+
+ list.add(WizardTaskUtil.TempSaveRuntimeFragment);
+ list.add(WizardTaskUtil.TempSaveServerFragment);
+
+ list.add(new ModifyModulesWizardFragment());
+ list.add(new TasksWizardFragment());
+
+ list.add(WizardTaskUtil.SaveRuntimeFragment);
+ list.add(WizardTaskUtil.SaveServerFragment);
+ list.add(WizardTaskUtil.SaveHostnameFragment);
+ }
+ });
+ }
+ public void init(IWorkbench newWorkbench, IStructuredSelection newSelection) {
+ // do nothing
}
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressBinaryUI.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressBinaryUI.java 2012-02-16 07:57:07 UTC (rev 38805)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressBinaryUI.java 2012-02-16 09:09:11 UTC (rev 38806)
@@ -70,6 +70,9 @@
public void setErrorMessage(String msg) {
inner.setErrorMessage(msg);
}
+ public Object getAttribute(String key) {
+ return null;
+ }
};
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-02-16 07:57:07 UTC (rev 38805)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-02-16 09:09:11 UTC (rev 38806)
@@ -10,11 +10,9 @@
*******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.behaviour;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@@ -88,7 +86,9 @@
this.mode = mode;
this.composite = fill;
this.showVerify = showVerify;
- fillSection(fill);
+ initModel();
+ createWidgets(fill);
+ fillWidgets();
addListeners();
}
@@ -96,7 +96,57 @@
return composite;
}
- private void fillSection(Composite composite) {
+ private void initModel() {
+ String nameFromExistingServer = ExpressServerUtils.getExpressUsername(server);
+ if( nameFromExistingServer == null ) {
+ // We're in a new server wizard.
+ // First, check if the taskmodel has data
+ IUser tmpUser = (IUser)callback.getAttribute(ExpressServerUtils.TASK_WIZARD_ATTR_USER);
+ if( tmpUser == null ) {
+ // If not, use recent user
+ tmpUser = UserModel.getDefault().getRecentUser();
+ }
+ if( tmpUser == null && UserModel.getDefault().getUsers().length > 0 ) {
+ tmpUser = UserModel.getDefault().getUsers()[0];
+ }
+ if( tmpUser != null ) {
+ try {
+ this.fuser = tmpUser;
+ this.user = tmpUser.getRhlogin();
+ List<IApplication> allApps = tmpUser.getApplications();
+ this.appListNames = getAppNamesAsStrings(allApps);
+ } catch(Exception e) { /* ignore */ }
+ }
+ } else {
+ this.user = nameFromExistingServer;
+ }
+ IApplication app = (IApplication)callback.getAttribute(ExpressServerUtils.TASK_WIZARD_ATTR_SELECTED_APP);
+ if( app != null ) {
+ this.fapplication = app;
+ this.app = app.getName();
+ }
+
+ this.pass = UserModel.getDefault().getPasswordFromSecureStorage(this.user);
+ this.remote = ExpressServerUtils.getExpressRemoteName(server);
+ this.remote = this.remote == null ? IOpenShiftExpressWizardModel.NEW_PROJECT_REMOTE_NAME_DEFAULT : this.remote;
+ }
+
+ /* Set widgets initial values */
+ private void fillWidgets() {
+ if( user != null ) userText.setText(user);
+ if( pass != null ) passText.setText(pass);
+ if( remote != null ) remoteText.setText(remote);
+ if( appListNames != null ) appNameCombo.setItems(appListNames);
+ if( app != null ) {
+ int ind = appNameCombo.indexOf(app);
+ if( ind != -1 ) {
+ appNameCombo.select(ind);
+ }
+ }
+ remoteText.setText(remote);
+ }
+
+ private void createWidgets(Composite composite) {
composite.setLayout(new GridLayout(2, false));
Label userLabel = new Label(composite, SWT.NONE);
userText = new Text(composite, SWT.SINGLE | SWT.BORDER);
@@ -112,16 +162,17 @@
String aName = ExpressServerUtils.getExpressApplicationName(server);
if( aName != null ) appNameCombo.setText(aName);
if( aName != null ) appNameCombo.setEnabled(false);
- } else {
- Label deployLocationLabel = new Label(composite, SWT.NONE);
- deployProjectCombo = new Combo(composite, SWT.NONE);
- deployLocationLabel.setText("Openshift Project: " );
- String[] projectNames = discoverOpenshiftProjects();
- deployProjectCombo.setItems(projectNames);
- String depLoc = ExpressServerUtils.getExpressDeployProject(server);
- if( depLoc != null ) deployProjectCombo.setText(depLoc);
- if( depLoc != null ) deployProjectCombo.setEnabled(false);
- }
+ }
+// else {
+// Label deployLocationLabel = new Label(composite, SWT.NONE);
+// deployProjectCombo = new Combo(composite, SWT.NONE);
+// deployLocationLabel.setText("Openshift Project: " );
+// String[] projectNames = discoverOpenshiftProjects();
+// deployProjectCombo.setItems(projectNames);
+// String depLoc = ExpressServerUtils.getExpressDeployProject(server);
+// if( depLoc != null ) deployProjectCombo.setText(depLoc);
+// if( depLoc != null ) deployProjectCombo.setEnabled(false);
+// }
Label remoteLabel = new Label(composite, SWT.NONE);
remoteText = new Text(composite, SWT.SINGLE | SWT.BORDER);
@@ -132,34 +183,7 @@
userLabel.setText("Username: ");
passLabel.setText("Password: ");
remoteLabel.setText("Remote: ");
- remoteText.setText(IOpenShiftExpressWizardModel.NEW_PROJECT_REMOTE_NAME_DEFAULT);
- String n = ExpressServerUtils.getExpressUsername(server);
- String[] appNames = null;
- if( n == null ) {
- // We're in a new server wizard
- IUser user = UserModel.getDefault().getRecentUser();
- if( user == null && UserModel.getDefault().getUsers().length > 0 ) {
- user = UserModel.getDefault().getUsers()[0];
- }
- if( user != null )
- try {
- n = user.getRhlogin();
- List<IApplication> allApps = user.getApplications();
- appNames = getAppNamesAsStrings(allApps);
- } catch(Exception e) { /* ignore */ }
- }
- String p = UserModel.getDefault().getPasswordFromSecureStorage(n);
- String remote = ExpressServerUtils.getExpressRemoteName(server);
- if( n != null ) userText.setText(n);
- if( p != null ) passText.setText(p);
- if( remote != null ) remoteText.setText(remote);
-
- if( appNames != null ) {
- appListNames = appNames;
- appNameCombo.setItems(appListNames);
- }
-
if( showVerify ) {
importLink = new Link(composite, SWT.DEFAULT);
importLink.setText("<a>Import this application</a>"); //$NON-NLS-1$
@@ -170,27 +194,7 @@
verifyButton.setText("Verify...");
}
}
-
- private String[] discoverOpenshiftProjects() {
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- ArrayList<String> names = new ArrayList<String>();
- for( int i = 0; i < projects.length; i++ ) {
- if( isOpenshiftProjectWithDeploymentsFolder(projects[i])) {
- names.add(projects[i].getName());
- }
- }
- return (String[]) names.toArray(new String[names.size()]);
- }
-
- private boolean isOpenshiftProjectWithDeploymentsFolder(IProject p) {
- // TODO add other criteria?
- IFolder f = p.getFolder(".openshift");
- if( f != null && f.exists()) {
- return true;
- }
- return false;
- }
-
+
private void addListeners() {
nameModifyListener = new ModifyListener() {
public void modifyText(ModifyEvent e) {
@@ -422,8 +426,10 @@
mode, remote);
wc.setAttribute(IDeployableServer.DEPLOY_DIRECTORY_TYPE, IDeployableServer.DEPLOY_CUSTOM);
wc.setAttribute(IDeployableServer.ZIP_DEPLOYMENTS_PREF, true);
- wc.setAttribute(IDeployableServer.DEPLOY_DIRECTORY, p.getFolder("deployments").getLocation().toString());
- wc.setAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, p.getFolder("deployments").getLocation().toString());
+ if( p != null ) {
+ wc.setAttribute(IDeployableServer.DEPLOY_DIRECTORY, p.getFolder("deployments").getLocation().toString());
+ wc.setAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, p.getFolder("deployments").getLocation().toString());
+ }
} catch(CoreException ce) {
// TODO FIX HANDLE
}
12 years, 8 months
JBoss Tools SVN: r38805 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-16 02:57:07 -0500 (Thu, 16 Feb 2012)
New Revision: 38805
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
Log:
somehow need this.
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2012-02-16 07:55:41 UTC (rev 38804)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2012-02-16 07:57:07 UTC (rev 38805)
@@ -41,7 +41,8 @@
org.eclipse.jface.text;bundle-version="3.7.0",
org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",
org.jboss.ide.eclipse.archives.webtools;bundle-version="2.3.0",
- org.eclipse.equinox.security;bundle-version="1.1.1"
+ org.eclipse.equinox.security;bundle-version="1.1.1",
+ org.jboss.ide.eclipse.as.dmr;bundle-version="2.3.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.jboss.tools.common.databinding,
12 years, 9 months
JBoss Tools SVN: r38804 - in trunk/as/plugins/org.jboss.ide.eclipse.as.dmr: src/org/jboss/ide/eclipse/as/dmr and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-16 02:55:41 -0500 (Thu, 16 Feb 2012)
New Revision: 38804
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.dmr/build.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.dmr/src/org/jboss/ide/eclipse/as/dmr/Activator.java
Log:
No idea wtf happen. Build.properties not exported somehow. Bundle would not start
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.dmr/build.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.dmr/build.properties 2012-02-16 06:05:38 UTC (rev 38803)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.dmr/build.properties 2012-02-16 07:55:41 UTC (rev 38804)
@@ -3,4 +3,6 @@
bin.includes = META-INF/,\
.,\
plugin.xml,\
- jboss-dmr-1.1.1.Final.jar
+ jboss-dmr-1.1.1.Final.jar,\
+ bin/,\
+ build.properties
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.dmr/src/org/jboss/ide/eclipse/as/dmr/Activator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.dmr/src/org/jboss/ide/eclipse/as/dmr/Activator.java 2012-02-16 06:05:38 UTC (rev 38803)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.dmr/src/org/jboss/ide/eclipse/as/dmr/Activator.java 2012-02-16 07:55:41 UTC (rev 38804)
@@ -1,8 +1,47 @@
package org.jboss.ide.eclipse.as.dmr;
import org.eclipse.core.runtime.Plugin;
+import org.osgi.framework.BundleContext;
public class Activator extends Plugin {
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.dmr"; //$NON-NLS-1$
+ // The shared instance
+ private static Activator plugin;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
}
12 years, 9 months
JBoss Tools SVN: r38803 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal: v7 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-16 01:05:38 -0500 (Thu, 16 Feb 2012)
New Revision: 38803
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractLaunchConfigurator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7LaunchConfigProperties.java
Log:
JBIDE-10802
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractLaunchConfigurator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractLaunchConfigurator.java 2012-02-16 05:33:14 UTC (rev 38802)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractLaunchConfigurator.java 2012-02-16 06:05:38 UTC (rev 38803)
@@ -40,7 +40,8 @@
if (!areDefaultsSet(launchConfig)) {
doConfigure(launchConfig, jbossServer, jbossRuntime);
setDefaultsSet(launchConfig);
- } else if( shouldUpdateLaunch(launchConfig)){
+ }
+ if( shouldUpdateLaunch(launchConfig)){
doOverrides(launchConfig, jbossServer, jbossRuntime);
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java 2012-02-16 05:33:14 UTC (rev 38802)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java 2012-02-16 06:05:38 UTC (rev 38803)
@@ -15,11 +15,16 @@
import java.util.Map;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader;
import org.jboss.ide.eclipse.as.core.util.ArgsUtil;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
@@ -262,4 +267,18 @@
return map != null;
}
+ protected ServerBeanLoader getBeanLoader(ILaunchConfigurationWorkingCopy launchConfig) throws CoreException {
+ String serverId = getServerId(launchConfig);
+ if( serverId != null ) {
+ IServer s = ServerCore.findServer(serverId);
+ if( s != null ) {
+ IRuntime rt = s.getRuntime();
+ if( rt != null ) {
+ IPath location = rt.getLocation();
+ return new ServerBeanLoader(location.toFile());
+ }
+ }
+ }
+ return null;
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7LaunchConfigProperties.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7LaunchConfigProperties.java 2012-02-16 05:33:14 UTC (rev 38802)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7LaunchConfigProperties.java 2012-02-16 06:05:38 UTC (rev 38803)
@@ -11,8 +11,14 @@
package org.jboss.ide.eclipse.as.core.server.internal.v7;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType;
+import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader;
import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties;
import org.jboss.ide.eclipse.as.core.util.ArgsUtil;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
@@ -70,7 +76,22 @@
}
}
+ private boolean supportsBindingFlag(ILaunchConfigurationWorkingCopy launchConfig ) throws CoreException {
+ ServerBeanLoader loader = getBeanLoader(launchConfig);
+ if( loader.getServerBean().getType().equals(JBossServerType.AS7)){
+ String v = loader.getFullServerVersion();
+ if( "7.0.2".compareTo(v) >= 0 ) { //$NON-NLS-1$
+ // this is jboss 7.0 or 7.1
+ return false;
+ }
+ }
+ return true;
+ }
+
public void setHost(String host, ILaunchConfigurationWorkingCopy launchConfig) throws CoreException {
+ if( !supportsBindingFlag(launchConfig))
+ return;
+
if (isSet(host)) {
String currentHost = getHost(launchConfig);
if (currentHost == null
12 years, 9 months
JBoss Tools SVN: r38802 - trunk/build/aggregate.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-16 00:33:14 -0500 (Thu, 16 Feb 2012)
New Revision: 38802
Modified:
trunk/build/aggregate/build.xml
Log:
fix error msg (JBIDE-10923)
Modified: trunk/build/aggregate/build.xml
===================================================================
--- trunk/build/aggregate/build.xml 2012-02-16 05:31:14 UTC (rev 38801)
+++ trunk/build/aggregate/build.xml 2012-02-16 05:33:14 UTC (rev 38802)
@@ -451,7 +451,7 @@
<else>
<fail>
--
-Could not find ${output.dir}/target/site, ${output.dir}/target/site_assembly.zip or ${output.dir}/target/repository.zip
+Could not find ${output.dir}/target/site and one of ${output.dir}/target/site_assembly.zip or ${output.dir}/target/repository.zip
--
This script must ONLY be called via the pom.xml in this directory, not run directly.
Cannot adjust an update site w/o first building it!
12 years, 9 months
JBoss Tools SVN: r38801 - trunk/build/aggregate.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-16 00:31:14 -0500 (Thu, 16 Feb 2012)
New Revision: 38801
Modified:
trunk/build/aggregate/build.xml
Log:
JBIDE-10825 support both repository.zip and site_assembly.zip
Modified: trunk/build/aggregate/build.xml
===================================================================
--- trunk/build/aggregate/build.xml 2012-02-16 02:53:06 UTC (rev 38800)
+++ trunk/build/aggregate/build.xml 2012-02-16 05:31:14 UTC (rev 38801)
@@ -29,6 +29,8 @@
<property file="${associate.properties}" />
<echo level="verbose">Loaded associate sites from ${associate.properties}</echo>
<property name="web.content.files" value="index.html, web/*.css, README*, *directory.xml, site.xml, site.properties" />
+
+ <property name="target.zip" value="${output.dir}/target/repository.zip"/>
<target name="init">
<available file="${COMMON_TOOLS}/ant-contrib.jar" type="file" property="ant-contrib.jar.exists" />
@@ -421,34 +423,42 @@
</target>
<target name="unpack.zip">
- <unzip src="${output.dir}/target/site_assembly.zip" dest="${update.site.source.dir}" />
+ <unzip src="${target.zip}" dest="${update.site.source.dir}" />
</target>
<target name="pack.zip">
- <zip destfile="${output.dir}/target/site_assembly.zip" update="true" basedir="${update.site.source.dir}" includes="content.*, ${web.content.files}" />
+ <zip destfile="${target.zip}" update="true" basedir="${update.site.source.dir}" includes="content.*, ${web.content.files}" />
</target>
<target name="check.target">
<if>
- <or>
- <not>
- <available file="${output.dir}/target/site" type="dir" />
- </not>
- <not>
+ <and>
+ <available file="${output.dir}/target/site" type="dir" />
+ <or>
+ <available file="${output.dir}/target/repository.zip" type="file" />
<available file="${output.dir}/target/site_assembly.zip" type="file" />
- </not>
- </or>
+ </or>
+ </and>
<then>
+ <if>
+ <available file="${output.dir}/target/site_assembly.zip" type="file" />
+ <then>
+ <var name="target.zip" unset="true"/>
+ <var name="target.zip" value="${output.dir}/target/site_assembly.zip"/>
+ </then>
+ </if>
+ </then>
+ <else>
<fail>
--
-Could not find ${output.dir}/target/site or ${output.dir}/target/site_assembly.zip
+Could not find ${output.dir}/target/site, ${output.dir}/target/site_assembly.zip or ${output.dir}/target/repository.zip
--
This script must ONLY be called via the pom.xml in this directory, not run directly.
Cannot adjust an update site w/o first building it!
--
To run this build, use Tycho. Try `mvn3 clean install -U -B -fae -q -e`
</fail>
- </then>
+ </else>
</if>
</target>
12 years, 9 months
JBoss Tools SVN: r38800 - trunk/jsf/docs/userguide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-02-15 21:53:06 -0500 (Wed, 15 Feb 2012)
New Revision: 38800
Modified:
trunk/jsf/docs/userguide/en-US/master.xml
Log:
updated with inclusion of browser info for comunity
Modified: trunk/jsf/docs/userguide/en-US/master.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/master.xml 2012-02-16 01:34:49 UTC (rev 38799)
+++ trunk/jsf/docs/userguide/en-US/master.xml 2012-02-16 02:53:06 UTC (rev 38800)
@@ -6,6 +6,7 @@
<!ENTITY Visual_Web_Tools SYSTEM "Visual_Web_Tools.xml">
<!ENTITY springTools SYSTEM "spring_tools.xml">
<!ENTITY editors SYSTEM "editors.xml">
+<!ENTITY browsers SYSTEM "browsers.xml">
<!ENTITY cssPerspective SYSTEM "css_perspective.xml">
<!ENTITY palette SYSTEM "palette.xml">
<!ENTITY richfaces_support SYSTEM "richfaces_support.xml">
@@ -39,6 +40,7 @@
<year>2009</year>
<year>2010</year>
<year>2011</year>
+ <year>2012</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
@@ -58,6 +60,7 @@
&Visual_Web_Tools;
&springTools;
&editors;
+ &browsers;
&palette;
&cssPerspective;
&richfaces_support;
12 years, 9 months