Author: rob.stryker(a)jboss.com
Date: 2009-05-06 05:24:45 -0400 (Wed, 06 May 2009)
New Revision: 15061
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
Log:
JBIDE-3896 - partial rollback. Many of the changes were good for organization adn I'll
leave them in. Future UI to be determined.
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java 2009-05-06
08:45:55 UTC (rev 15060)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java 2009-05-06
09:24:45 UTC (rev 15061)
@@ -24,13 +24,18 @@
public static String PROPERTY_VM_TYPE_ID = "PROPERTY_VM_TYPE_ID";
//$NON-NLS-1$
public static String PROPERTY_CONFIGURATION_NAME =
"org.jboss.ide.eclipse.as.core.runtime.configurationName"; //$NON-NLS-1$
-
+ public static String
PROPERTY_CONFIG_LOCATION="org.jboss.ide.eclipse.as.core.runtime.configurationLocation";
//$NON-NLS-1$
+
public IRuntime getRuntime();
public IVMInstall getVM();
public void setVM(IVMInstall install);
+
public String getJBossConfiguration();
public void setJBossConfiguration(String config);
+ public String getConfigLocation();
+ public void setConfigLocation(String configLocation);
+
// for startup
public String getDefaultRunArgs();
public String getDefaultRunVMArgs();
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2009-05-06
08:45:55 UTC (rev 15060)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2009-05-06
09:24:45 UTC (rev 15061)
@@ -144,16 +144,10 @@
return JBossServerCorePlugin.getServerStateLocation(getServer()).
append(IJBossServerConstants.DEPLOY).makeAbsolute().toString();
} else if( type.equals(DEPLOY_SERVER)) {
- if( !getAttribute(USE_METADATA_CONFIG, false)) {
- String config = jbsrt.getJBossConfiguration();
- IPath p = new Path(IJBossServerConstants.SERVER).append(config)
- .append(IJBossServerConstants.DEPLOY).makeRelative();
- return ServerUtil.makeGlobal(jbsrt, p).toString();
- } else {
- IPath dest = JBossServerCorePlugin.getServerStateLocation(getServer());
- dest = dest.append(IJBossServerConstants.CONFIG_IN_METADATA);
- return dest.toOSString();
- }
+ String config = jbsrt.getJBossConfiguration();
+ IPath p = new Path(IJBossServerConstants.SERVER).append(config)
+ .append(IJBossServerConstants.DEPLOY).makeRelative();
+ return ServerUtil.makeGlobal(jbsrt, p).toString();
}
return null;
}
@@ -172,16 +166,11 @@
return JBossServerCorePlugin.getServerStateLocation(getServer()).
append(IJBossServerConstants.TEMP_DEPLOY).makeAbsolute().toString();
} else if( type.equals(DEPLOY_SERVER)) {
- if( !getAttribute(USE_METADATA_CONFIG, false)) {
- String config = jbsrt.getJBossConfiguration();
- IPath p = new Path(IJBossServerConstants.SERVER)
- .append(config).append(IJBossServerConstants.TMP)
- .append(IJBossServerConstants.JBOSSTOOLS_TMP).makeRelative();
- return ServerUtil.makeGlobal(jbsrt, p).toString();
- } else {
- return JBossServerCorePlugin.getServerStateLocation(getServer()).
- append(IJBossServerConstants.TEMP_DEPLOY).makeAbsolute().toString();
- }
+ String config = jbsrt.getJBossConfiguration();
+ IPath p = new Path(IJBossServerConstants.SERVER)
+ .append(config).append(IJBossServerConstants.TMP)
+ .append(IJBossServerConstants.JBOSSTOOLS_TMP).makeRelative();
+ return ServerUtil.makeGlobal(jbsrt, p).toString();
}
return null;
}
@@ -211,10 +200,6 @@
}
return null;
}
-
- public boolean isMetadataConfig() {
- return getAttribute(USE_METADATA_CONFIG, false);
- }
protected String getRuntimeConfigDirectory() {
IJBossServerRuntime runtime = (IJBossServerRuntime)
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2009-05-06
08:45:55 UTC (rev 15060)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2009-05-06
09:24:45 UTC (rev 15061)
@@ -148,4 +148,12 @@
protected String getVMInstallTypeId() {
return getAttribute(PROPERTY_VM_TYPE_ID, (String)null);
}
+
+ public String getConfigLocation() {
+ return getAttribute(PROPERTY_CONFIG_LOCATION, (String)null);
+ }
+
+ public void setConfigLocation(String configLocation) {
+ setAttribute(PROPERTY_CONFIG_LOCATION, configLocation);
+ }
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2009-05-06
08:45:55 UTC (rev 15060)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2009-05-06
09:24:45 UTC (rev 15061)
@@ -125,19 +125,8 @@
String config = runtime.getJBossConfiguration();
args = ArgsUtil.setArg(args,
IJBossRuntimeConstants.STARTUP_ARG_CONFIG_SHORT,
- IJBossRuntimeConstants.STARTUP_ARG_CONFIG_LONG, config);
-
- if( jbs.isMetadataConfig()) {
- try {
- IPath dest = JBossServerCorePlugin.getServerStateLocation(jbs.getServer());
- dest = dest.append(IJBossServerConstants.CONFIG_IN_METADATA);
- args = ArgsUtil.setArg(args, null,
- IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.JBOSS_SERVER_HOME_URL,
- dest.toFile().toURL().toString());
- } catch( MalformedURLException murle) {}
- }
+ IJBossRuntimeConstants.STARTUP_ARG_CONFIG_LONG, config);
-
vmArgs= ArgsUtil.setArg(vmArgs, null,
IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.ENDORSED_DIRS,
runtime.getRuntime().getLocation().append(
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2009-05-06
08:45:55 UTC (rev 15060)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2009-05-06
09:24:45 UTC (rev 15061)
@@ -53,7 +53,6 @@
/*
* Property keys stored in the server object
*/
- public static final String USE_METADATA_CONFIG =
"IJBossServerConstants.useMetadataConfig"; //$NON-NLS-1$
public static final String STARTUP_POLLER_KEY =
"org.jboss.ide.eclipse.as.core.server.attributes.startupPollerKey";
//$NON-NLS-1$
public static final String SHUTDOWN_POLLER_KEY =
"org.jboss.ide.eclipse.as.core.server.attributes.shutdownPollerKey";
//$NON-NLS-1$
public static final String SERVER_USERNAME =
"org.jboss.ide.eclipse.as.core.server.userName"; //$NON-NLS-1$
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2009-05-06
08:45:55 UTC (rev 15060)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2009-05-06
09:24:45 UTC (rev 15061)
@@ -52,28 +52,28 @@
return p;
}
- public static void cloneConfigToMetadata(IServer server, IProgressMonitor monitor) {
- IPath dest = JBossServerCorePlugin.getServerStateLocation(server);
- dest = dest.append(IJBossServerConstants.CONFIG_IN_METADATA);
- IRuntime rt = server.getRuntime();
- IJBossServerRuntime jbsrt =
(IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, new
NullProgressMonitor());
- IPath src =
rt.getLocation().append(IJBossServerConstants.SERVER).append(jbsrt.getJBossConfiguration());
- dest.toFile().mkdirs();
-
- File[] subFiles = src.toFile().listFiles();
- dest.toFile().mkdirs();
- String[] excluded = IJBossServerConstants.JBOSS_TEMPORARY_FOLDERS;
- for (int i = 0; i < subFiles.length; i++) {
- boolean found = false;
- for( int j = 0; j < excluded.length; j++)
- if( subFiles[i].getName().equals(excluded[j]))
- found = true;
- if( !found ) {
- File newDest = new File(dest.toFile(), subFiles[i].getName());
- FileUtil.fileSafeCopy(subFiles[i], newDest, null);
- }
- }
- }
+// public static void cloneConfigToMetadata(IServer server, IProgressMonitor monitor) {
+// IPath dest = JBossServerCorePlugin.getServerStateLocation(server);
+// dest = dest.append(IJBossServerConstants.CONFIG_IN_METADATA);
+// IRuntime rt = server.getRuntime();
+// IJBossServerRuntime jbsrt =
(IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, new
NullProgressMonitor());
+// IPath src =
rt.getLocation().append(IJBossServerConstants.SERVER).append(jbsrt.getJBossConfiguration());
+// dest.toFile().mkdirs();
+//
+// File[] subFiles = src.toFile().listFiles();
+// dest.toFile().mkdirs();
+// String[] excluded = IJBossServerConstants.JBOSS_TEMPORARY_FOLDERS;
+// for (int i = 0; i < subFiles.length; i++) {
+// boolean found = false;
+// for( int j = 0; j < excluded.length; j++)
+// if( subFiles[i].getName().equals(excluded[j]))
+// found = true;
+// if( !found ) {
+// File newDest = new File(dest.toFile(), subFiles[i].getName());
+// FileUtil.fileSafeCopy(subFiles[i], newDest, null);
+// }
+// }
+// }
public static void createStandardFolders(IServer server) {
// create metadata area
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-05-06
08:45:55 UTC (rev 15060)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-05-06
09:24:45 UTC (rev 15061)
@@ -66,6 +66,7 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.JBossServerType;
import org.jboss.ide.eclipse.as.core.util.ServerBeanLoader;
import org.jboss.ide.eclipse.as.ui.IPreferenceKeys;
@@ -89,7 +90,7 @@
private int jreComboIndex;
private Button homeDirButton, jreButton;
private Composite nameComposite, homeDirComposite, jreComposite,
- configComposite;
+ configComposite, cloneComposite;
private String name, homeDir, config;
// jre fields
@@ -112,7 +113,7 @@
createHomeComposite(main);
createJREComposite(main);
createConfigurationComposite(main);
-
+ createCloneComposite(main);
fillWidgets();
// make modifications to parent
@@ -141,15 +142,15 @@
TaskModel.TASK_RUNTIME);
String id = rt.getRuntimeType().getId();
String imageKey = JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO;
- if (id.equals("org.jboss.ide.eclipse.as.runtime.32"))
+ if (id.equals(IJBossToolingConstants.AS_32))
imageKey = JBossServerUISharedImages.WIZBAN_JBOSS32_LOGO;
- else if (id.equals("org.jboss.ide.eclipse.as.runtime.40"))
+ else if (id.equals(IJBossToolingConstants.AS_40))
imageKey = JBossServerUISharedImages.WIZBAN_JBOSS40_LOGO;
- else if (id.equals("org.jboss.ide.eclipse.as.runtime.42"))
+ else if (id.equals(IJBossToolingConstants.AS_42))
imageKey = JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO;
- else if (id.equals("org.jboss.ide.eclipse.as.runtime.50"))
+ else if (id.equals(IJBossToolingConstants.AS_50))
imageKey = JBossServerUISharedImages.WIZBAN_JBOSS50_LOGO;
- else if( id.equals("org.jboss.ide.eclipse.as.runtime.eap.43"))
+ else if (id.equals(IJBossToolingConstants.EAP_43))
imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO;
return JBossServerUISharedImages.getImageDescriptor(imageKey);
}
@@ -160,8 +161,8 @@
IJBossServerRuntime rt = getRuntime();
if (rt != null) {
originalName = rt.getRuntime().getName();
- nameText.setText(rt.getRuntime().getName());
- name = rt.getRuntime().getName();
+ nameText.setText(originalName);
+ name = originalName;
Preferences prefs = JBossServerUIPlugin.getDefault().getPluginPreferences();
String value = prefs.getString(IPreferenceKeys.RUNTIME_HOME_PREF_KEY_PREFIX +
rt.getRuntime().getRuntimeType().getId());
homeDir = (value != null && value.length() != 0) ? value :
rt.getRuntime().getLocation().toOSString();
@@ -423,7 +424,47 @@
});
}
+
+ private void createCloneComposite(Composite main) {
+ IJBossServerRuntime rt = getRuntime();
+ if (rt != null) {
+ cloneComposite = new Composite(main, SWT.NONE);
+ FormData cData = new FormData();
+ cData.left = new FormAttachment(0, 5);
+ cData.right = new FormAttachment(100, -5);
+ cData.top = new FormAttachment(configComposite, 5);
+ cData.bottom = new FormAttachment(100, -5);
+ cloneComposite.setLayoutData(cData);
+
+ cloneComposite.setLayout(new FormLayout());
+ Button cloneButton = new Button(cloneComposite, SWT.CHECK);
+ cloneButton.setSelection(false);
+ cloneButton.setText("Clone this configuration");
+ cData = new FormData();
+ cData.left = new FormAttachment(0, 5);
+ cData.right = new FormAttachment(100, -5);
+ cData.top = new FormAttachment(0, 5);
+ cData.bottom = new FormAttachment(100, -5);
+ cloneButton.setLayoutData(cData);
+
+ Button intoConfigButton = new Button(cloneComposite, SWT.RADIO);
+ Button intoLocationButton = new Button(cloneComposite, SWT.RADIO);
+ Text newConfigName = new Text(cloneComposite, SWT.DEFAULT);
+ Text newLocation = new Text(cloneComposite, SWT.DEFAULT);
+
+
+ intoConfigButton.setText("new configuration name");
+ intoLocationButton.setText("arbitrary location");
+
+
+
+
+ } else {
+ // TODO Display something useful in edit-runtime wizard
+ }
+ }
+
private void updatePage() {
updateErrorMessage();
if (!isHomeValid()) {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-05-06
08:45:55 UTC (rev 15060)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-05-06
09:24:45 UTC (rev 15061)
@@ -30,14 +30,11 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
@@ -47,11 +44,9 @@
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.core.TaskModel;
-import org.eclipse.wst.server.core.internal.ServerWorkingCopy;
import org.eclipse.wst.server.ui.wizard.IWizardHandle;
import org.eclipse.wst.server.ui.wizard.WizardFragment;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
@@ -74,8 +69,6 @@
private Composite nameComposite;
private Group runtimeGroup;
private Text nameText;
- private Button cloneButton;
- private boolean shouldClone;
public Composite createComposite(Composite parent, IWizardHandle handle) {
this.handle = handle;
@@ -231,21 +224,6 @@
configValLabel = new Label(runtimeGroup, SWT.NONE);
d = new GridData(SWT.BEGINNING, SWT.CENTER, true, false);
configValLabel.setLayoutData(d);
-
- cloneButton = new Button(runtimeGroup, SWT.CHECK);
- cloneButton.setText(Messages.swf_CloneConfiguration);
- d = new GridData(SWT.BEGINNING, SWT.CENTER, true, false);
- d.horizontalSpan = 2;
- cloneButton.setLayoutData(d);
-
- cloneButton.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
- public void widgetSelected(SelectionEvent e) {
- shouldClone = cloneButton.getSelection();
- }
- });
}
private void updateErrorMessage() {
@@ -286,7 +264,6 @@
JBossServer jbs = (JBossServer)serverWC.loadAdapter(JBossServer.class, new
NullProgressMonitor());
jbs.setUsername("admin");
jbs.setPassword("admin");
- ((ServerWorkingCopy)serverWC).setAttribute(IJBossServerConstants.USE_METADATA_CONFIG,
shouldClone);
jbs.setDeployLocationType(isAS5() ? IDeployableServer.DEPLOY_SERVER :
IDeployableServer.DEPLOY_METADATA);
serverWC.setRuntime((IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME));
serverWC.setName(name);
@@ -295,8 +272,6 @@
IServer saved = serverWC.save(false, new NullProgressMonitor());
getTaskModel().putObject(TaskModel.TASK_SERVER, saved);
ServerUtil.createStandardFolders(saved);
- if( shouldClone)
- ServerUtil.cloneConfigToMetadata(saved, monitor);
}
private IJBossServerRuntime getRuntime() {