JBoss Tools SVN: r29006 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2011-02-04 10:00:24 -0500 (Fri, 04 Feb 2011)
New Revision: 29006
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java
Log:
https://issues.jboss.org/browse/JBIDE-8235 - fix for trunk
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java 2011-02-04 14:52:52 UTC (rev 29005)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java 2011-02-04 15:00:24 UTC (rev 29006)
@@ -26,6 +26,7 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.Constructor;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -58,6 +59,8 @@
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.model.IProcess;
+import org.eclipse.debug.internal.core.LaunchConfiguration;
+import org.eclipse.debug.internal.core.LaunchConfigurationWorkingCopy;
import org.eclipse.debug.ui.RefreshTab;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
@@ -174,6 +177,51 @@
createFile(externalPropFileName, propFileContentPreSave);
}
+ public class MockLaunchConfigWorkingCopy extends LaunchConfigurationWorkingCopy {
+
+ protected final Map<String, String> tmpAttr;
+
+ public MockLaunchConfigWorkingCopy(LaunchConfiguration original, Map<String, String> tmpAttr) throws CoreException {
+ super(original);
+ this.tmpAttr = tmpAttr;
+ }
+
+ @Override
+ public String getAttribute(String attributeName, String defaultValue) throws CoreException {
+ String res = tmpAttr.get(attributeName);
+ if (res == null) {
+ res = super.getAttribute(attributeName, defaultValue);
+ }
+ return res;
+ }
+ }
+
+ public class MockLaunchConfig extends LaunchConfiguration {
+
+ protected final Map<String, String> tmpAttr = new HashMap<String, String>();
+
+ public MockLaunchConfig(ILaunchConfiguration original) throws CoreException {
+ super(original.getMemento());
+ }
+
+ public void setTmpAttribute(String attributeName, String value) {
+ tmpAttr.put(attributeName, value);
+ }
+
+ @Override
+ public String getAttribute(String attributeName, String defaultValue) throws CoreException {
+ String res = tmpAttr.get(attributeName);
+ if (res == null) {
+ res = super.getAttribute(attributeName, defaultValue);
+ }
+ return res;
+ }
+
+ public ILaunchConfigurationWorkingCopy getWorkingCopy() throws CoreException {
+ return new MockLaunchConfigWorkingCopy(this, tmpAttr);
+ }
+ }
+
/**
* Update launch configuration with attributes required for external process codegen.
*
@@ -182,7 +230,7 @@
* @throws CoreException
*/
public ILaunchConfiguration updateLaunchConfig(ILaunchConfiguration lc) throws CoreException {
- ILaunchConfigurationWorkingCopy lcwc = lc.getWorkingCopy();
+ MockLaunchConfig mlc = new MockLaunchConfig(lc);
String fileName = null;
try {
fileName = getPath2GenBuildXml().toString();
@@ -190,15 +238,15 @@
throw new CoreException(HibernateConsolePlugin.throwableToStatus(e, 666));
}
// setup location of Ant build.xml file
- lcwc.setAttribute(IExternalToolConstants.ATTR_LOCATION, fileName);
+ mlc.setTmpAttribute(IExternalToolConstants.ATTR_LOCATION, fileName);
// setup Ant runner main type
- lcwc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME,
+ mlc.setTmpAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME,
IAntLaunchConstants.MAIN_TYPE_NAME);
// setup ant remote process factory
- lcwc.setAttribute(DebugPlugin.ATTR_PROCESS_FACTORY_ID, "org.eclipse.ant.ui.remoteAntProcessFactory"); //$NON-NLS-1$
+ mlc.setTmpAttribute(DebugPlugin.ATTR_PROCESS_FACTORY_ID, "org.eclipse.ant.ui.remoteAntProcessFactory"); //$NON-NLS-1$
// refresh whole workspace
- //lcwc.setAttribute(RefreshUtil.ATTR_REFRESH_SCOPE, RefreshUtil.MEMENTO_WORKSPACE);
- return lcwc;
+ //mlc.setTmpAttribute(RefreshUtil.ATTR_REFRESH_SCOPE, RefreshUtil.MEMENTO_WORKSPACE);
+ return mlc;
}
public ILaunch getLaunch(ILaunchConfiguration configuration, String mode)
14 years, 10 months
JBoss Tools SVN: r29005 - in trunk/deltacloud/plugins: org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-02-04 09:52:52 -0500 (Fri, 04 Feb 2011)
New Revision: 29005
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/UIUtils.java
Log:
[JBIDE-8093] added field decorations and appropriate error texts
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-02-04 14:41:05 UTC (rev 29004)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-02-04 14:52:52 UTC (rev 29005)
@@ -15,7 +15,6 @@
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.jface.fieldassist.ControlDecoration;
-import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.rse.core.model.IHost;
import org.eclipse.swt.SWT;
@@ -23,12 +22,10 @@
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
@@ -110,7 +107,7 @@
remoteDetailsLoc = new Text(g, SWT.BORDER);
remoteDetailsLoc.setLayoutData(UIUtils.createFormData(autoScanCheck, 5, null, 0, 0, INDENTATION, 100, -5));
remoteDetailsLoc.setText("./.jboss");
- this.remoteDetailsLocDeco = createErrorDecoration(REMOTE_DETAILS_LOC_ERROR, remoteDetailsLoc);
+ this.remoteDetailsLocDeco = UIUtils.createErrorDecoration(REMOTE_DETAILS_LOC_ERROR, remoteDetailsLoc);
autoLocalRuntimeLabel = new Label(g, SWT.NONE);
autoLocalRuntimeLabel.setText("Local Runtime: ");
@@ -131,7 +128,7 @@
autoLocalRuntimeCombo = new Combo(g, SWT.READ_ONLY);
autoLocalRuntimeCombo.setLayoutData(UIUtils.createFormData(remoteDetailsLoc, 5, null, 0, autoLocalRuntimeLabel,
10, autoAddLocalRuntimeButton, -5));
- this.autoLocalRuntimeDeco = createErrorDecoration(SELECT_RUNTIME_ERROR, autoLocalRuntimeCombo);
+ this.autoLocalRuntimeDeco = UIUtils.createErrorDecoration(SELECT_RUNTIME_ERROR, autoLocalRuntimeCombo);
hardCodeServerDetails = new Button(g, SWT.RADIO);
hardCodeServerDetails.setText("Set remote server details manually");
@@ -143,7 +140,7 @@
serverHomeText = new Text(g, SWT.BORDER);
serverHomeText.setLayoutData(UIUtils.createFormData(hardCodeServerDetails, 5, null, 0, serverHome, 10, 100, -5));
serverHomeText.setText("/etc/jboss/jboss-as");
- this.serverHomeDeco = createErrorDecoration(SERVER_HOME_ERROR, serverHomeText);
+ this.serverHomeDeco = UIUtils.createErrorDecoration(SERVER_HOME_ERROR, serverHomeText);
serverConfig = new Label(g, SWT.NONE);
serverConfig.setText("Configuration: ");
@@ -151,7 +148,7 @@
serverConfigText = new Text(g, SWT.BORDER);
serverConfigText.setLayoutData(UIUtils.createFormData(serverHomeText, 5, null, 0, serverHome, 10, 100, -5));
serverConfigText.setText("default");
- this.serverConfigDeco = createErrorDecoration(SERVER_CONFIG_ERROR, serverConfigText);
+ this.serverConfigDeco = UIUtils.createErrorDecoration(SERVER_CONFIG_ERROR, serverConfigText);
localRuntimeLabel = new Label(g, SWT.NONE);
localRuntimeLabel.setText("Local Runtime: ");
@@ -171,7 +168,7 @@
localRuntimeCombo = new Combo(g, SWT.READ_ONLY);
localRuntimeCombo.setLayoutData(UIUtils.createFormData(serverConfigText, 5, null, 0, serverHome, 10,
addLocalRuntimeButton, -5));
- this.localRuntimeDeco = createErrorDecoration(SELECT_RUNTIME_ERROR, localRuntimeCombo);
+ this.localRuntimeDeco = UIUtils.createErrorDecoration(SELECT_RUNTIME_ERROR, localRuntimeCombo);
deployOnlyRadio = new Button(g, SWT.RADIO);
deployOnlyRadio.setText("Use a deploy-only server adapter");
@@ -183,8 +180,11 @@
deployFolderText = new Text(g, SWT.BORDER);
deployFolderText.setText("/path/to/deploy");
deployFolderText.setLayoutData(UIUtils.createFormData(deployOnlyRadio, 5, null, 0, deployFolder, 10, 100, -5));
- this.deployFolderDeco = createErrorDecoration(DEPLOY_FOLDER_NOT_EMPTY, deployFolderText);
+ this.deployFolderDeco = UIUtils.createErrorDecoration(DEPLOY_FOLDER_NOT_EMPTY, deployFolderText);
+ Label dummyLabel = new Label(g, SWT.NONE);
+ dummyLabel.setLayoutData(UIUtils.createFormData(deployOnlyRadio, 5, null, 0, deployFolderText, 10, 100, -5));
+
IEclipsePreferences prefs = new InstanceScope().getNode(DeltaCloudIntegrationPlugin.PLUGIN_ID);
boolean initRSE, initServer;
initRSE = prefs.getBoolean(CREATE_RSE_PREF_KEY, DEFALUT_CREATE_RSE);
@@ -228,17 +228,6 @@
setControl(c2);
}
- private ControlDecoration createErrorDecoration(String errorText, Control control) {
- ControlDecoration decoration = new ControlDecoration(control, SWT.LEFT | SWT.TOP);
- Image errorImage = FieldDecorationRegistry.getDefault()
- .getFieldDecoration(FieldDecorationRegistry.DEC_ERROR).getImage();
- decoration.setImage(errorImage);
- decoration.setDescriptionText(errorText);
- decoration.setShowHover(true);
- decoration.hide();
- return decoration;
- }
-
private void fillRuntimeTypeCombo() {
localRuntimes.clear();
IRuntime[] rts = ServerCore.getRuntimes();
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/UIUtils.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/UIUtils.java 2011-02-04 14:41:05 UTC (rev 29004)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/UIUtils.java 2011-02-04 14:52:52 UTC (rev 29005)
@@ -23,12 +23,16 @@
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.fieldassist.ControlDecoration;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.widgets.Control;
@@ -371,5 +375,19 @@
return data;
}
+ public static ControlDecoration createErrorDecoration(String errorText, Control control) {
+ return createDecoration(errorText, FieldDecorationRegistry.DEC_ERROR, control);
+ }
+
+ public static ControlDecoration createDecoration(String text, String imageKey, Control control) {
+ ControlDecoration decoration = new ControlDecoration(control, SWT.LEFT | SWT.TOP);
+ Image errorImage = FieldDecorationRegistry.getDefault()
+ .getFieldDecoration(imageKey).getImage();
+ decoration.setImage(errorImage);
+ decoration.setDescriptionText(text);
+ decoration.setShowHover(true);
+ decoration.hide();
+ return decoration;
+ }
}
14 years, 10 months
JBoss Tools SVN: r29004 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/mapper.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2011-02-04 09:41:05 -0500 (Fri, 04 Feb 2011)
New Revision: 29004
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/mapper/HBMInfoExtractorTest.java
Log:
https://issues.jboss.org/browse/JBIDE-8147 - try to fix junit tests on server
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/mapper/HBMInfoExtractorTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/mapper/HBMInfoExtractorTest.java 2011-02-04 14:10:25 UTC (rev 29003)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/mapper/HBMInfoExtractorTest.java 2011-02-04 14:41:05 UTC (rev 29004)
@@ -26,7 +26,7 @@
private ConfigurableTestProject testProj = null;
protected void setUp() throws Exception {
- testProj = new ConfigurableTestProject("HBMInfoProj"); //$NON-NLS-1$
+ testProj = new ConfigurableTestProject("HBMInfoProj" + System.currentTimeMillis()); //$NON-NLS-1$
}
protected void tearDown() throws Exception {
14 years, 10 months
JBoss Tools SVN: r29003 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-02-04 09:10:25 -0500 (Fri, 04 Feb 2011)
New Revision: 29003
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
Log:
[JBIDE-8093] added field decorations and appropriate error texts
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-02-04 14:08:44 UTC (rev 29002)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-02-04 14:10:25 UTC (rev 29003)
@@ -293,19 +293,15 @@
deployFolderDeco.show();
}
} else if (autoScanCheck.getSelection()) {
- if (autoLocalRuntimeCombo.getSelectionIndex() < 0) {
- autoLocalRuntimeDeco.show();
- error = SELECT_RUNTIME_ERROR;
- }
if (remoteDetailsLoc.getText().equals("")) {
remoteDetailsLocDeco.show();
error = REMOTE_DETAILS_LOC_ERROR;
}
- } else if (hardCodeServerDetails.getSelection()) {
- if (localRuntimeCombo.getSelectionIndex() < 0) {
- localRuntimeDeco.show();
+ if (autoLocalRuntimeCombo.getSelectionIndex() < 0) {
+ autoLocalRuntimeDeco.show();
error = SELECT_RUNTIME_ERROR;
}
+ } else if (hardCodeServerDetails.getSelection()) {
if (serverHomeText.getText().equals("")) {
serverHomeDeco.show();
error = SERVER_HOME_ERROR;
@@ -314,6 +310,10 @@
serverConfigDeco.show();
error = SERVER_CONFIG_ERROR;
}
+ if (localRuntimeCombo.getSelectionIndex() < 0) {
+ localRuntimeDeco.show();
+ error = SELECT_RUNTIME_ERROR;
+ }
}
}
setErrorMessage(error);
14 years, 10 months
JBoss Tools SVN: r29002 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-02-04 09:08:44 -0500 (Fri, 04 Feb 2011)
New Revision: 29002
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
Log:
[JBIDE-8093] added field decorations and appropriate error texts
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-02-04 13:32:58 UTC (rev 29001)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-02-04 14:08:44 UTC (rev 29002)
@@ -14,6 +14,8 @@
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jface.fieldassist.ControlDecoration;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.rse.core.model.IHost;
import org.eclipse.swt.SWT;
@@ -21,10 +23,12 @@
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
@@ -44,6 +48,12 @@
* @author Rob Stryker
*/
public class RSEandASWizardPage extends WizardPage implements INewInstanceWizardPage {
+ private static final String SELECT_RUNTIME_ERROR = "Please select a local runtime. The created server will be of the same version as the local runtime.";
+ private static final String DEPLOY_FOLDER_NOT_EMPTY = "The deploy folder must not be empty";
+ private final static String REMOTE_DETAILS_LOC_ERROR = "You must fill in a path to fetch the server configuration from";
+ private static final String SERVER_CONFIG_ERROR = "You must select a server configuration";
+ private static final String SERVER_HOME_ERROR = "You must set a server home directory";
+
private final static String CREATE_RSE_PREF_KEY = "org.jboss.tools.deltacloud.integration.wizard.RSEandASWizard.CREATE_RSE_PREF_KEY";
private final static String CREATE_SERVER_PREF_KEY = "org.jboss.tools.deltacloud.integration.wizard.RSEandASWizard.CREATE_SERVER_PREF_KEY";
@@ -52,11 +62,13 @@
private Button createRSE, createServer;
private Group serverDetailsGroup;
- private Button autoScanCheck, hardCodeServerDetails, deployOnlyRadio,
+ private Button autoScanCheck, hardCodeServerDetails, deployOnlyRadio,
addLocalRuntimeButton, autoAddLocalRuntimeButton;
+ private ControlDecoration deployFolderDeco, autoLocalRuntimeDeco, serverHomeDeco, remoteDetailsLocDeco,
+ localRuntimeDeco, serverConfigDeco;
private Text remoteDetailsLoc, serverHomeText, serverConfigText, deployFolderText;
private Label serverHome, serverConfig, localRuntimeLabel, autoLocalRuntimeLabel, deployFolder;
- private Combo autoLocalRuntimeCombo,localRuntimeCombo;
+ private Combo autoLocalRuntimeCombo, localRuntimeCombo;
private IHost initialHost;
private ArrayList<IRuntime> localRuntimes = new ArrayList<IRuntime>();
@@ -66,7 +78,7 @@
setTitle("Create RSE Connection and Server");
setDescription("Here you can choose to create a matching RSE connection and a Server adapter");
}
-
+
public RSEandASWizardPage(IHost host) {
this();
this.initialHost = host;
@@ -85,24 +97,26 @@
Group g = new Group(c2, SWT.SHADOW_IN);
serverDetailsGroup = g;
g.setLayout(new FormLayout());
- g.setLayoutData(UIUtils.createFormData(createServer,5,null,0,0,5,100,-5));
+ g.setLayoutData(UIUtils.createFormData(createServer, 5, null, 0, 0, 5, 100, -5));
g.setText("Server Details");
-
+
final int INDENTATION = 40;
-
+
autoScanCheck = new Button(g, SWT.RADIO);
autoScanCheck.setText("Determine server details from this remote file:");
- autoScanCheck.setLayoutData(UIUtils.createFormData(0,5,null,0,0,5,null,0));
+ autoScanCheck.setLayoutData(UIUtils.createFormData(0, 5, null, 0, 0, 5, null, 0));
autoScanCheck.setSelection(true);
-
+
remoteDetailsLoc = new Text(g, SWT.BORDER);
- remoteDetailsLoc.setLayoutData(UIUtils.createFormData(autoScanCheck,5,null,0,0,INDENTATION,100,-5));
+ remoteDetailsLoc.setLayoutData(UIUtils.createFormData(autoScanCheck, 5, null, 0, 0, INDENTATION, 100, -5));
remoteDetailsLoc.setText("./.jboss");
-
+ this.remoteDetailsLocDeco = createErrorDecoration(REMOTE_DETAILS_LOC_ERROR, remoteDetailsLoc);
+
autoLocalRuntimeLabel = new Label(g, SWT.NONE);
autoLocalRuntimeLabel.setText("Local Runtime: ");
- autoLocalRuntimeLabel.setLayoutData(UIUtils.createFormData(remoteDetailsLoc, 7, null, 0, 0, INDENTATION, null, 0 ));
-
+ autoLocalRuntimeLabel.setLayoutData(UIUtils.createFormData(remoteDetailsLoc, 7, null, 0, 0, INDENTATION, null,
+ 0));
+
autoAddLocalRuntimeButton = new Button(g, SWT.DEFAULT);
autoAddLocalRuntimeButton.setText("Configure Runtimes...");
autoAddLocalRuntimeButton.setLayoutData(UIUtils.createFormData(remoteDetailsLoc, 7, null, 0, null, 0, 100, -5));
@@ -110,35 +124,39 @@
public void widgetSelected(SelectionEvent e) {
configureRuntimesPressed();
}
+
public void widgetDefaultSelected(SelectionEvent e) {
}
});
autoLocalRuntimeCombo = new Combo(g, SWT.READ_ONLY);
- autoLocalRuntimeCombo.setLayoutData(UIUtils.createFormData(remoteDetailsLoc, 5, null, 0, autoLocalRuntimeLabel, 5, autoAddLocalRuntimeButton, -5));
-
-
+ autoLocalRuntimeCombo.setLayoutData(UIUtils.createFormData(remoteDetailsLoc, 5, null, 0, autoLocalRuntimeLabel,
+ 10, autoAddLocalRuntimeButton, -5));
+ this.autoLocalRuntimeDeco = createErrorDecoration(SELECT_RUNTIME_ERROR, autoLocalRuntimeCombo);
+
hardCodeServerDetails = new Button(g, SWT.RADIO);
hardCodeServerDetails.setText("Set remote server details manually");
- hardCodeServerDetails.setLayoutData(UIUtils.createFormData(autoLocalRuntimeCombo,5,null,0,0,5,null,0));
+ hardCodeServerDetails.setLayoutData(UIUtils.createFormData(autoLocalRuntimeCombo, 5, null, 0, 0, 10, null, 0));
serverHome = new Label(g, SWT.NONE);
serverHome.setText("JBoss Server Home: ");
- serverHome.setLayoutData(UIUtils.createFormData(hardCodeServerDetails, 7, null, 0, 0, INDENTATION, null, 0 ));
+ serverHome.setLayoutData(UIUtils.createFormData(hardCodeServerDetails, 7, null, 0, 0, INDENTATION, null, 0));
serverHomeText = new Text(g, SWT.BORDER);
- serverHomeText.setLayoutData(UIUtils.createFormData(hardCodeServerDetails, 5, null, 0, serverHome, 5, 100, -5));
+ serverHomeText.setLayoutData(UIUtils.createFormData(hardCodeServerDetails, 5, null, 0, serverHome, 10, 100, -5));
serverHomeText.setText("/etc/jboss/jboss-as");
+ this.serverHomeDeco = createErrorDecoration(SERVER_HOME_ERROR, serverHomeText);
serverConfig = new Label(g, SWT.NONE);
serverConfig.setText("Configuration: ");
- serverConfig.setLayoutData(UIUtils.createFormData(serverHomeText, 7, null, 0, 0, INDENTATION, null, 0 ));
+ serverConfig.setLayoutData(UIUtils.createFormData(serverHomeText, 7, null, 0, 0, INDENTATION, null, 0));
serverConfigText = new Text(g, SWT.BORDER);
- serverConfigText.setLayoutData(UIUtils.createFormData(serverHomeText, 5, null, 0, serverHome, 5, 100, -5));
+ serverConfigText.setLayoutData(UIUtils.createFormData(serverHomeText, 5, null, 0, serverHome, 10, 100, -5));
serverConfigText.setText("default");
-
+ this.serverConfigDeco = createErrorDecoration(SERVER_CONFIG_ERROR, serverConfigText);
+
localRuntimeLabel = new Label(g, SWT.NONE);
localRuntimeLabel.setText("Local Runtime: ");
- localRuntimeLabel.setLayoutData(UIUtils.createFormData(serverConfigText, 7, null, 0, 0, INDENTATION, null, 0 ));
-
+ localRuntimeLabel.setLayoutData(UIUtils.createFormData(serverConfigText, 7, null, 0, 0, INDENTATION, null, 0));
+
addLocalRuntimeButton = new Button(g, SWT.DEFAULT);
addLocalRuntimeButton.setText("Configure Runtimes...");
addLocalRuntimeButton.setLayoutData(UIUtils.createFormData(serverConfigText, 7, null, 0, null, 0, 100, -5));
@@ -146,32 +164,34 @@
public void widgetSelected(SelectionEvent e) {
configureRuntimesPressed();
}
+
public void widgetDefaultSelected(SelectionEvent e) {
}
});
localRuntimeCombo = new Combo(g, SWT.READ_ONLY);
- localRuntimeCombo.setLayoutData(UIUtils.createFormData(serverConfigText, 5, null, 0, serverHome, 5, addLocalRuntimeButton, -5));
-
-
+ localRuntimeCombo.setLayoutData(UIUtils.createFormData(serverConfigText, 5, null, 0, serverHome, 10,
+ addLocalRuntimeButton, -5));
+ this.localRuntimeDeco = createErrorDecoration(SELECT_RUNTIME_ERROR, localRuntimeCombo);
+
deployOnlyRadio = new Button(g, SWT.RADIO);
deployOnlyRadio.setText("Use a deploy-only server adapter");
- deployOnlyRadio.setLayoutData(UIUtils.createFormData(localRuntimeCombo,5,null,0,0,5,null,0));
-
+ deployOnlyRadio.setLayoutData(UIUtils.createFormData(localRuntimeCombo, 5, null, 0, 0, 5, null, 0));
+
deployFolder = new Label(g, SWT.NONE);
deployFolder.setText("Deploy Folder: ");
- deployFolder.setLayoutData(UIUtils.createFormData(deployOnlyRadio, 7, null, 0, 0, INDENTATION, null, 0 ));
+ deployFolder.setLayoutData(UIUtils.createFormData(deployOnlyRadio, 7, null, 0, 0, INDENTATION, null, 0));
deployFolderText = new Text(g, SWT.BORDER);
deployFolderText.setText("/path/to/deploy");
- deployFolderText.setLayoutData(UIUtils.createFormData(deployOnlyRadio, 5, null, 0, deployFolder, 5, 100, -5));
-
-
+ deployFolderText.setLayoutData(UIUtils.createFormData(deployOnlyRadio, 5, null, 0, deployFolder, 10, 100, -5));
+ this.deployFolderDeco = createErrorDecoration(DEPLOY_FOLDER_NOT_EMPTY, deployFolderText);
+
IEclipsePreferences prefs = new InstanceScope().getNode(DeltaCloudIntegrationPlugin.PLUGIN_ID);
boolean initRSE, initServer;
initRSE = prefs.getBoolean(CREATE_RSE_PREF_KEY, DEFALUT_CREATE_RSE);
initServer = prefs.getBoolean(CREATE_SERVER_PREF_KEY, DETAULT_CREATE_SERVERADAPTER);
createRSE.setSelection(initRSE);
createServer.setSelection(initServer);
- if( initialHost != null ) {
+ if (initialHost != null) {
createRSE.setEnabled(false);
createRSE.setSelection(true);
createServer.setSelection(true);
@@ -201,21 +221,32 @@
deployOnlyRadio.addSelectionListener(listener);
remoteDetailsLoc.addModifyListener(modListener);
serverHomeText.addModifyListener(modListener);
- serverConfigText.addModifyListener(modListener);
+ serverConfigText.addModifyListener(modListener);
deployFolderText.addModifyListener(modListener);
autoLocalRuntimeCombo.addModifyListener(modListener);
localRuntimeCombo.addModifyListener(modListener);
setControl(c2);
}
+ private ControlDecoration createErrorDecoration(String errorText, Control control) {
+ ControlDecoration decoration = new ControlDecoration(control, SWT.LEFT | SWT.TOP);
+ Image errorImage = FieldDecorationRegistry.getDefault()
+ .getFieldDecoration(FieldDecorationRegistry.DEC_ERROR).getImage();
+ decoration.setImage(errorImage);
+ decoration.setDescriptionText(errorText);
+ decoration.setShowHover(true);
+ decoration.hide();
+ return decoration;
+ }
+
private void fillRuntimeTypeCombo() {
localRuntimes.clear();
IRuntime[] rts = ServerCore.getRuntimes();
ArrayList<String> names = new ArrayList<String>();
- for( int i = 0; i < rts.length; i++ ) {
- if( rts[i].getRuntimeType() == null )
+ for (int i = 0; i < rts.length; i++) {
+ if (rts[i].getRuntimeType() == null)
continue;
- if( rts[i].getRuntimeType().getId().startsWith("org.jboss.")
+ if (rts[i].getRuntimeType().getId().startsWith("org.jboss.")
&& !rts[i].getRuntimeType().getId().equals(IJBossToolingConstants.DEPLOY_ONLY_RUNTIME)) {
localRuntimes.add(rts[i]);
names.add(rts[i].getName());
@@ -224,12 +255,12 @@
localRuntimeCombo.setItems((String[]) names.toArray(new String[names.size()]));
autoLocalRuntimeCombo.setItems((String[]) names.toArray(new String[names.size()]));
}
-
+
protected void configureRuntimesPressed() {
ServerUIUtil.showNewRuntimeWizard(addLocalRuntimeButton.getShell(), null, null);
fillRuntimeTypeCombo();
}
-
+
private void handleSelection(Widget w) {
if (w == createRSE) {
if (!createRSE.getSelection()) {
@@ -240,41 +271,60 @@
createServer.setEnabled(true);
}
}
- if( w == createServer ) {
+ if (w == createServer) {
refreshServerWidgets();
}
verifyPageComplete();
}
private void verifyPageComplete() {
- boolean complete = true;
String error = null;
- if( createServer.getSelection()) {
- if( deployOnlyRadio.getSelection()) {
- complete = !deployFolderText.getText().equals("");
- if( !complete )
- error = "The deploy folder must not be empty";
- } else if( autoScanCheck.getSelection()) {
- int index = autoLocalRuntimeCombo.getSelectionIndex();
- complete = index != -1 && !remoteDetailsLoc.getText().equals("");
- if( !complete )
- error = "Please select a local runtime. The created server will be of the same version as the local runtime.";
- } else if( hardCodeServerDetails.getSelection()) {
- int index = localRuntimeCombo.getSelectionIndex();
- complete = index != -1 && !serverHomeText.getText().equals("") && !serverConfigText.getText().equals("");
- if( !complete )
- error = "Please select a local runtime. The created server will be of the same version as the local runtime.";
+ deployFolderDeco.hide();
+ autoLocalRuntimeDeco.hide();
+ remoteDetailsLocDeco.hide();
+ localRuntimeDeco.hide();
+ serverHomeDeco.hide();
+ serverConfigDeco.hide();
+
+ if (createServer.getSelection()) {
+ if (deployOnlyRadio.getSelection()) {
+ if (deployFolderText.getText().equals("")) {
+ error = DEPLOY_FOLDER_NOT_EMPTY;
+ deployFolderDeco.show();
+ }
+ } else if (autoScanCheck.getSelection()) {
+ if (autoLocalRuntimeCombo.getSelectionIndex() < 0) {
+ autoLocalRuntimeDeco.show();
+ error = SELECT_RUNTIME_ERROR;
+ }
+ if (remoteDetailsLoc.getText().equals("")) {
+ remoteDetailsLocDeco.show();
+ error = REMOTE_DETAILS_LOC_ERROR;
+ }
+ } else if (hardCodeServerDetails.getSelection()) {
+ if (localRuntimeCombo.getSelectionIndex() < 0) {
+ localRuntimeDeco.show();
+ error = SELECT_RUNTIME_ERROR;
+ }
+ if (serverHomeText.getText().equals("")) {
+ serverHomeDeco.show();
+ error = SERVER_HOME_ERROR;
+ }
+ if (serverConfigText.getText().equals("")) {
+ serverConfigDeco.show();
+ error = SERVER_CONFIG_ERROR;
+ }
}
}
setErrorMessage(error);
- setPageComplete(complete);
+ setPageComplete(error == null);
}
-
+
private void refreshServerWidgets() {
- if( initialHost != null ) {
+ if (initialHost != null) {
createRSE.setEnabled(false);
}
-
+
boolean enabled = createServer.getSelection();
serverDetailsGroup.setEnabled(enabled);
autoScanCheck.setEnabled(enabled);
@@ -292,7 +342,7 @@
localRuntimeLabel.setEnabled(enabled);
localRuntimeCombo.setEnabled(enabled);
}
-
+
public ChainedJob getPerformFinishJob(final DeltaCloudInstance instance) {
IEclipsePreferences prefs = new InstanceScope().getNode(DeltaCloudIntegrationPlugin.PLUGIN_ID);
prefs.putBoolean(CREATE_RSE_PREF_KEY, createRSE.getSelection());
@@ -303,32 +353,32 @@
// ignore
}
- if( !createRSE.getSelection())
+ if (!createRSE.getSelection())
return null;
-
- CreateRSEFromInstanceJob j =
- new CreateRSEFromInstanceJob(instance, INewInstanceWizardPage.NEW_INSTANCE_FAMILY);
- if( createServer.getSelection()) {
+ CreateRSEFromInstanceJob j =
+ new CreateRSEFromInstanceJob(instance, INewInstanceWizardPage.NEW_INSTANCE_FAMILY);
+
+ if (createServer.getSelection()) {
String[] data = null;
String type = null;
- if( deployOnlyRadio.getSelection()) {
+ if (deployOnlyRadio.getSelection()) {
type = CreateServerFromRSEJob.CREATE_DEPLOY_ONLY_SERVER;
- data = new String[]{deployFolderText.getText()};
- } else if( autoScanCheck.getSelection()) {
+ data = new String[] { deployFolderText.getText() };
+ } else if (autoScanCheck.getSelection()) {
type = CreateServerFromRSEJob.CHECK_SERVER_FOR_DETAILS;
int index = autoLocalRuntimeCombo.getSelectionIndex();
String rtId = localRuntimes.get(index).getId();
- data = new String[]{remoteDetailsLoc.getText(), rtId};
- } else if( hardCodeServerDetails.getSelection()) {
+ data = new String[] { remoteDetailsLoc.getText(), rtId };
+ } else if (hardCodeServerDetails.getSelection()) {
type = CreateServerFromRSEJob.SET_DETAILS_NOW;
int index = localRuntimeCombo.getSelectionIndex();
String rtId = localRuntimes.get(index).getId();
- data = new String[]{serverHomeText.getText(), serverConfigText.getText(), rtId};
+ data = new String[] { serverHomeText.getText(), serverConfigText.getText(), rtId };
}
- if( type != null && data != null ) {
+ if (type != null && data != null) {
CreateServerFromRSEJob job2 = new CreateServerFromRSEJob(type, data, instance);
- if( initialHost != null ) {
+ if (initialHost != null) {
job2.setHost(initialHost);
return job2;
}
@@ -337,5 +387,5 @@
}
return j;
}
-
+
}
14 years, 10 months
JBoss Tools SVN: r29001 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-02-04 08:32:58 -0500 (Fri, 04 Feb 2011)
New Revision: 29001
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java
Log:
JBIDE-8328
https://issues.jboss.org/browse/JBIDE-8328
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java 2011-02-04 11:42:06 UTC (rev 29000)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java 2011-02-04 13:32:58 UTC (rev 29001)
@@ -17,6 +17,9 @@
import java.util.ListIterator;
import org.eclipse.core.resources.IProject;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.search.IJavaSearchConstants;
import org.eclipse.jface.fieldassist.ContentProposalAdapter;
import org.eclipse.jface.fieldassist.IContentProposal;
@@ -32,7 +35,9 @@
import org.jboss.tools.common.model.ui.attribute.IAttributeContentProposalProvider;
import org.jboss.tools.common.model.ui.attribute.IValueFilter;
import org.jboss.tools.common.model.ui.attribute.editor.JavaHyperlinkCueLabelProvider;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.ModelFeatureFactory;
+import org.jboss.tools.common.util.EclipseJavaUtil;
public class JavaClassContentAssistProvider implements
IAttributeContentProposalProvider {
@@ -227,12 +232,39 @@
proposals = (IContentProposal[]) list.toArray(new IContentProposal[list.size()]);
// Sort the proposals alphabetically
Arrays.sort(proposals, fComparator);
+
+ restoreDefaultPackage(proposals);
+
} else {
proposals = new IContentProposal[0];
}
return proposals;
}
+ private void restoreDefaultPackage(IContentProposal[] proposals) {
+ for (int i = 0; i < proposals.length; i++) {
+ IContentProposal p = proposals[i];
+ String content = p.getContent();
+ if(content == null || content.indexOf('.') >= 0) continue;
+ String label = p.getLabel();
+ if(label != null && label.indexOf("- null") >= 0 && p instanceof TypeContentProposal) {
+ String qn = "java.lang." + content;
+ IJavaProject jp = EclipseResourceUtil.getJavaProject(fProject);
+ IType t = null;
+ try {
+ t = EclipseJavaUtil.findType(jp, qn);
+ } catch (JavaModelException e) {
+ e.printStackTrace();
+ }
+ int k = label.indexOf("- null");
+ String pack = t != null ? "java.lang" : "(default)";
+ label = label.substring(0, k + 2) + pack;
+ TypeContentProposal p1 = new TypeContentProposal(label, content, p.getDescription(), ((TypeContentProposal)p).getImage());
+ proposals[i] = p1;
+ }
+ }
+ }
+
/**
* @param currentContent
* @return
14 years, 10 months
JBoss Tools SVN: r29000 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2011-02-04 06:42:06 -0500 (Fri, 04 Feb 2011)
New Revision: 29000
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java
Log:
https://issues.jboss.org/browse/JBIDE-8231
Invalid console configuration will be shown as <None>
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java 2011-02-04 08:02:41 UTC (rev 28999)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java 2011-02-04 11:42:06 UTC (rev 29000)
@@ -58,6 +58,7 @@
import org.hibernate.cfg.reveng.ReverseEngineeringStrategy;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.ImageConstants;
+import org.hibernate.console.KnownConfigurations;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.utils.DialogSelectionHelper;
@@ -457,7 +458,12 @@
if (attributes == null) {
return;
}
- consoleConfigurationName.setText(attributes.getConsoleConfigurationName());
+ if (attributes.getConsoleConfigurationName() == null
+ || !KnownConfigurations.getInstance().isKnownConfiguration(attributes.getConsoleConfigurationName())){
+ consoleConfigurationName.setText(NULL_CONFIG);
+ } else {
+ consoleConfigurationName.setText(attributes.getConsoleConfigurationName());
+ }
preferRawCompositeIds.setSelection(attributes.isPreferBasicCompositeIds());
autoManyToMany.setSelection( attributes.detectManyToMany() );
autoVersioning.setSelection( attributes.detectOptimisticLock() );
14 years, 10 months
JBoss Tools SVN: r28999 - trunk/as/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-02-04 03:02:41 -0500 (Fri, 04 Feb 2011)
New Revision: 28999
Modified:
trunk/as/docs/reference/en-US/modules.xml
trunk/as/docs/reference/en-US/perspective.xml
trunk/as/docs/reference/en-US/quick_start.xml
trunk/as/docs/reference/en-US/runtimes_servers.xml
trunk/as/docs/reference/en-US/webtools.xml
Log:
Fix typos
Modified: trunk/as/docs/reference/en-US/modules.xml
===================================================================
--- trunk/as/docs/reference/en-US/modules.xml 2011-02-04 05:13:24 UTC (rev 28998)
+++ trunk/as/docs/reference/en-US/modules.xml 2011-02-04 08:02:41 UTC (rev 28999)
@@ -4,7 +4,7 @@
<para>In this chapter it will be described how to deploy modules onto the server.</para>
<para>
- First of all it is necessary to say that deploying to a server is mostly painless. There are several ways to do it provided by WTP, and some additional methods provided by JBoss Tools. These methods are described further in this chapter.
+ First of all it is necessary to say that deploying to a server is mostly painless. There are several ways to do it provided by WTP and some additional methods provided by JBoss Tools. These methods are described further in this chapter.
</para>
<section>
@@ -37,7 +37,7 @@
This page of the wizard also allows to undeploy modules from the server. For that choose proper module(s) from the right and click the <guibutton> < Remove</guibutton>. The modules will be completely undeployed after restarting your server or republishing.
</para>
<para>
- Generally, for the JBoss AS Server Adapters, publishing using this method will force a default, best-guess, packaging configuration for your project. This best-guess does not publish incrementally, but instead repackages your entire project into a <filename>.war</filename>, <filename>.jar</filename>, or <filename>.ear</filename> as appropriate, and then copies that file into the proper deploy directory. For quicker smarter deployment, you will need to create archives using the Project Archives view (see <xref linkend="Project_archivesView"/>) and customize packaging yourself.
+ Generally, for the JBoss AS Server Adapters, publishing using this method will force a default, best-guess, packaging configuration for your project. This best-guess does not publish incrementally, but instead repackages your entire project into a <filename>.war</filename>, <filename>.jar</filename>, or <filename>.ear</filename> as appropriate and then copies that file into the proper deploy directory. For quicker smarter deployment, you will need to create archives using the Project Archives view (see <xref linkend="Project_archivesView"/>) and customize packaging yourself.
</para>
Modified: trunk/as/docs/reference/en-US/perspective.xml
===================================================================
--- trunk/as/docs/reference/en-US/perspective.xml 2011-02-04 05:13:24 UTC (rev 28998)
+++ trunk/as/docs/reference/en-US/perspective.xml 2011-02-04 08:02:41 UTC (rev 28999)
@@ -220,7 +220,7 @@
<para>Stop</para>
</entry>
<entry>
- <para>this will stop the server</para>
+ <para>This will stop the server</para>
</entry>
</row>
@@ -249,7 +249,7 @@
<para>Add and Remove Projects</para>
</entry>
<entry>
- <para>This option will publish a new project to the server (if its type is supported)</para>
+ <para>This option will publish a new project to the server (if it's type is supported)</para>
</entry>
</row>
@@ -279,7 +279,7 @@
Under the server element in the <guilabel>Servers</guilabel> view, you can see modules that are currently deployed to the server and some server extensions that provide additional information on the server.
</para>
- <para>The context menu for any module allows you to remove it from the server, and force a full or incremental republish upon it.</para>
+ <para>The context menu for any module allows you to remove it from the server and force a full or incremental republish upon it.</para>
<figure>
<title>Modules Action</title>
@@ -379,7 +379,7 @@
</mediaobject>
</figure>
<para>
- On this preference page you can add a fileset to any server type or to all servers at once. To do this you should select the server type in the combo box and click the <guibutton>Add fileset...</guibutton> button. In the opened <guilabel>New File Filter wizard</guilabel> follow the steps described in <xref linkend="filefilterWiz"/>, and finally click the <guibutton>Apply</guibutton> button on the preference page.
+ On this preference page you can add a fileset to any server type or to all servers at once. To do this you should select the server type in the combo box and click the <guibutton>Add fileset...</guibutton> button. In the opened <guilabel>New File Filter wizard</guilabel> follow the steps described in <xref linkend="filefilterWiz"/> and finally click the <guibutton>Apply</guibutton> button on the preference page.
</para>
<para>The defined file filter will be automatically added to new servers during their creation.</para>
@@ -400,7 +400,7 @@
</note>
<para>
- The <guilabel>XML Configuration</guilabel> category itself contains only a list of categories. <guilabel>Ports</guilabel> are provided by default, and display many of the most commonly used ports in the <productname>JBoss Server</productname>.
+ The <guilabel>XML Configuration</guilabel> category itself contains only a list of categories. <guilabel>Ports</guilabel> are provided by default and display many of the most commonly used ports in the <productname>JBoss Server</productname>.
</para>
<figure>
@@ -555,7 +555,7 @@
</para>
<para>
- The <guilabel>Server Log</guilabel> view shows relevant information to your server's startup, shutdown, and publish processes. This allows you to keep an eye on what's going on (such as automatic incremental deployment if you have it enabled).
+ The <guilabel>Server Log</guilabel> view shows relevant information to your server's startup, shutdown and publish processes. This allows you to keep an eye on what's going on (such as automatic incremental deployment if you have it enabled).
</para>
<figure>
@@ -710,7 +710,7 @@
</figure>
- <para>The first tab shows the Jboss server arguments</para>
+ <para>The first tab shows the JBoss server arguments</para>
<para>
See the <ulink url="http://docs.jboss.org/jbossas/guides/installguide/r1/en/html/start-stop.html">AS Installation Guide </ulink> to find the parameters that can be specified for <productname>JBoss Server</productname>.
</para>
@@ -729,7 +729,7 @@
</note>
<para>
- On the second tab you find the main class used for launching JBoss AS (the default is <code>org.jboss.Main</code>). this value can be changed if necessary.
+ On the second tab you find the main class used for launching JBoss AS (the default is <code>org.jboss.Main</code>). This value can be changed if necessary.
</para>
<para>
@@ -855,11 +855,11 @@
</note>
<para>
- <filename>JAR</filename> is the standard archive type, and does very little configuration, leaving most of the work up to you. You can customize the name, add folders, filesets, and inner JARs to it.
+ <filename>JAR</filename> is the standard archive type and does very little configuration, leaving most of the work up to you. You can customize the name, add folders, filesets and inner JARs to it.
</para>
<para>
- The other types, for the most part, simply start off with a default setting, usually the JAR with some specific children based on an expected structure of the project. For example, if the project is a Dynamic Web Project, and you create a <filename>WAR</filename> archive, the archive will be created with a few filesets relevant to the known structure of the project.
+ The other types, for the most part, simply start off with a default setting, usually the JAR with some specific children based on an expected structure of the project. For example, if the project is a Dynamic Web Project and you create a <filename>WAR</filename> archive, the archive will be created with a few filesets relevant to the known structure of the project.
</para>
<para>
@@ -936,10 +936,10 @@
<section id="CreatingaFileSet">
<title>Creating a FileSet</title>
<para>
- To create a new fileset, right click on an available target location such as an archive, a nested archive, or a folder within an archive, and select the <guimenuitem>New Fileset</guimenuitem> option.
+ To create a new fileset, right click on an available target location such as an archive, a nested archive, or a folder within an archive and select the <guimenuitem>New Fileset</guimenuitem> option.
</para>
<para>
- The <guilabel>New Fileset</guilabel> wizard requires a destination (where the files will be located), and a root directory (or where the files are coming from). The source can be anywhere in the workspace or from the filesystem at large.
+ The <guilabel>New Fileset</guilabel> wizard requires a destination (where the files will be located) and a root directory (or where the files are coming from). The source can be anywhere in the workspace or from the filesystem at large.
</para>
<figure>
@@ -1043,7 +1043,7 @@
</entry>
<entry>
- <para>This action is enabled only on top-level archives, and initiates a full build on that archive</para>
+ <para>This action is enabled only on top-level archives and initiates a full build on that archive</para>
</entry>
</row>
Modified: trunk/as/docs/reference/en-US/quick_start.xml
===================================================================
--- trunk/as/docs/reference/en-US/quick_start.xml 2011-02-04 05:13:24 UTC (rev 28998)
+++ trunk/as/docs/reference/en-US/quick_start.xml 2011-02-04 08:02:41 UTC (rev 28999)
@@ -31,11 +31,11 @@
</entry>
<entry>
<para>
- Using WTP, the JBoss AS plugin allows you to work with the server in run or debug mode. You can easily install runtimes and servers, copy the existing runtime configuration or configure it up to your needs.
+ Using WTP the JBoss AS plugin allows you to work with the server in run or debug mode. You can easily install runtimes and servers, copy the existing runtime configuration or configure it up to your needs.
</para>
</entry>
<entry>
- <link linkend="runtimes_servers">runtimes and servers</link>
+ <link linkend="runtimes_servers">Runtimes and servers</link>
</entry>
</row>
@@ -45,7 +45,7 @@
</entry>
<entry>
<para>
- It allows for easy management of an installed JBoss Server and includes the standard Console and Properties views, and the specially added Project archives and Servers views.
+ It provides easy management of an installed JBoss Server and includes the standard Console and Properties views and the specially added Project archives and Servers views.
</para>
</entry>
<entry>
@@ -61,7 +61,7 @@
<para>Provides a number of ways, using WTP and JBoss Tools, to deploy either a project or a single file on the server.</para>
</entry>
<entry>
- <link linkend="modules">deploying modules</link>
+ <link linkend="modules">Deploying modules</link>
</entry>
</row>
@@ -95,7 +95,7 @@
<title>Starting JBoss Server</title>
<para>
- Starting <productname>JBoss Server</productname> is quite simple. You can control the server behavior with the help of a special toolbar in the <guilabel>Servers</guilabel> view where you can <guibutton>start</guibutton> it in a regular or debug mode, <guibutton>stop</guibutton> or <guibutton>restart</guibutton> it, and <guibutton>publish</guibutton> to the server.
+ Starting <productname>JBoss Server</productname> is quite simple. You can control the server behavior with the help of a special toolbar in the <guilabel>Servers</guilabel> view where you can <guibutton>start</guibutton> it in a regular or debug mode, <guibutton>stop</guibutton> or <guibutton>restart</guibutton> it and <guibutton>publish</guibutton> to the server.
</para>
<figure>
Modified: trunk/as/docs/reference/en-US/runtimes_servers.xml
===================================================================
--- trunk/as/docs/reference/en-US/runtimes_servers.xml 2011-02-04 05:13:24 UTC (rev 28998)
+++ trunk/as/docs/reference/en-US/runtimes_servers.xml 2011-02-04 08:02:41 UTC (rev 28999)
@@ -18,7 +18,7 @@
First of all it is necessary to mention that the JBoss AS plugin makes use of WTP. This includes starting and stopping servers in run or debug mode. It also includes targeting WTP projects, such as Dynamic Web Projects, to certain server runtimes in order to ensure that the proper JARs from a specific server are added to the project's classpath properly.
</para>
<para>
- In order to get started creating, running, and debugging J2EE applications, we should create our <property>runtime</property> and <property>server</property> instances.
+ In order to get started creating, running and debugging J2EE applications, we should create our <property>runtime</property> and <property>server</property> instances.
</para>
<section>
@@ -32,7 +32,7 @@
</listitem>
<listitem>
<para>
- For <property>JBoss server</property> at least, it provides the necessary information to allow the server to be started and stopped, and provides information on which JARs to run and which configuration to use.
+ For <property>JBoss server</property> at least, it provides the necessary information to allow the server to be started and stopped and provides information on which JARs to run and which configuration to use.
</para>
</listitem>
</itemizedlist>
@@ -41,7 +41,7 @@
<para>
You can install runtimes into Eclipse by selecting <menuchoice><guimenuitem>Window</guimenuitem>
<guimenuitem>Preferences</guimenuitem>
- </menuchoice> menu, and then selecting <menuchoice><guimenuitem>Server</guimenuitem>
+ </menuchoice> menu and then selecting <menuchoice><guimenuitem>Server</guimenuitem>
<guimenuitem>Runtime Environments</guimenuitem>
</menuchoice> from the categories available on the left.
</para>
@@ -88,7 +88,7 @@
</note>
<para>
- You will also note a Deploy-Only Runtime type. This type does not provide a classpath for WTP projects. It is used solely by its server type for the purpose of setting up a deploy directory for users who do not wish to make use of starting, stopping, or debugging their projects inside Eclipse.
+ You will also note a Deploy-Only Runtime type. This type does not provide a classpath for WTP projects. It is used solely by it's server type for the purpose of setting up a deploy directory for users who do not wish to make use of starting, stopping, or debugging their projects inside Eclipse.
</para>
<figure id="add_runtime_figure">
@@ -100,7 +100,7 @@
</mediaobject>
</figure>
- <para>The following table describes all the available options of the currant wizard page.</para>
+ <para>The following table describes all the available options of the current wizard page.</para>
<table>
<title>Server Runtime Wizard Parameters</title>
<tgroup cols="2">
@@ -173,14 +173,14 @@
</table>
<para>
- As a result of having each runtime represent a specific configuration rather than the server installation as a whole, it is very likely you will create several different runtimes to test each of your configurations. So it becomes important to ensure your runtimes, and later your servers, are given descriptive names that help you to remember which is which.
+ As a result of having each runtime represent a specific configuration rather than the server installation as a whole, it is very likely you will create several different runtimes to test each of your configurations. So it becomes important to ensure your runtimes and later your servers, are given descriptive names that help you to remember which is which.
</para>
<para>Click the <guibutton>Finish</guibutton> button to see your new runtime in the list.</para>
<note>
<title>Note:</title>
<para>
- If you edit the configuration of a runtime, the changes don't affect the settings of the servers that currently use the runtime. To apply the changes to them also, you should double right click the server, select <menuchoice><guimenuitem>Overview</guimenuitem>
+ If you edit the configuration of a runtime, the changes don't affect the settings of the servers that currently use the runtime. To apply the changes to them also, you should double left click on the server, select <menuchoice><guimenuitem>Overview</guimenuitem>
<guimenuitem>Runtime Environment</guimenuitem>
</menuchoice>, make sure that necessary configuration is chosen, click the <guibutton>Finish</guibutton> button and then <guibutton>Save</guibutton> button.
</para>
@@ -271,7 +271,7 @@
</mediaobject>
</figure>
<para>
- Change the name, click the <guibutton>Browse</guibutton> button, and select your configuration location or leave as it is if you want it to be located together with other runtime configurations.
+ Change the name, click the <guibutton>Browse</guibutton> button and select your configuration location or leave as it is if you want it to be located together with other runtime configurations.
</para>
<figure>
<title>Copy the existing configuration</title>
@@ -301,7 +301,7 @@
<section>
<title>Servers</title>
<para>
- WTP servers are Eclipse-representations of a back end server installation. They are used to start or stop servers, deploy to servers, or debug code that will run on the server. They keep track of the modules (JARs, WARs, etc) you deploy to the server, and also allow you to undeploy those modules (see <xref linkend="run_on_server_wizard"/>).
+ WTP servers are Eclipse-representations of a back end server installation. They are used to start or stop servers, deploy to servers, or debug code that will run on the server. They keep track of the modules (JARs, WARs, etc) you deploy to the server and also allow you to undeploy those modules (see <xref linkend="run_on_server_wizard"/>).
</para>
<para>
Servers can be started or stopped with different <link linkend="com_line_arg">command-line arguments</link>. They are often backed by a runtime object representing that server's location.
@@ -322,14 +322,14 @@
</mediaobject>
</figure>
<para>
- A server object keeps track of things like command line arguments when starting or stopping, and the runtimes keep track of the location of the installation. Thus, each server instance must be backed by an appropriate runtime.
+ A server object keeps track of things like command line arguments when starting or stopping and the runtimes keep track of the location of the installation. Thus, each server instance must be backed by an appropriate runtime.
</para>
<para>
The <guilabel>New server wizard</guilabel> allows you to name the server via the <guilabel>Server name</guilabel> field, or you can use a generated default name .If it is necessary to restore the default name, click the <guibutton>Reset default</guibutton> button (<inlinemediaobject> <imageobject><imagedata fileref="images/runtimes_servers/runtimes_servers_4d.png"/></imageobject></inlinemediaobject>).
</para>
<para>
- You can select the appropriate runtime you from the <guilabel>Server runtime environment</guilabel> combobox. If there is no runtime that matches your needs just press the <guilabel>Add...</guilabel> link nearby to bring up the wizard for creating a new runtime (see <xref linkend="add_runtime_figure"/>). To configure an existing runtimes you should go to server preferences by pressing the <guilabel>Configure runtime environments...</guilabel> link.
+ You can select the appropriate runtime from the <guilabel>Server runtime environment</guilabel> combo box. If there is no runtime that matches your needs just press the <guilabel>Add...</guilabel> link nearby to bring up the wizard for creating a new runtime (see <xref linkend="add_runtime_figure"/>). To configure an existing runtimes you should go to server preferences by pressing the <guilabel>Configure runtime environments...</guilabel> link.
</para>
<para>If the server you want to create does not have any installed runtime yet, the combo box and the links are absent.</para>
@@ -344,7 +344,7 @@
</figure>
<para>
- In this case the next page of the wizard which has the same form as in <link linkend="add_runtime_figure">the previous section</link>, and will ask you to create the associated runtime.
+ In this case the next page of the wizard which has the same form as in <link linkend="add_runtime_figure">the previous section</link> and will ask you to create the associated runtime.
</para>
<para>
Either way, after targeting your server to a runtime, the final screen in this wizard presents a summary of the selected options, giving you a chance to verify that you have selected the appropriate runtime.
Modified: trunk/as/docs/reference/en-US/webtools.xml
===================================================================
--- trunk/as/docs/reference/en-US/webtools.xml 2011-02-04 05:13:24 UTC (rev 28998)
+++ trunk/as/docs/reference/en-US/webtools.xml 2011-02-04 08:02:41 UTC (rev 28999)
@@ -2,7 +2,7 @@
<chapter id="webtools">
<title>Projects</title>
<para>
- The most popular of the projects we deal with are the J2EE ones, such as Dynamic Web Project, EJB Project, or EAR project. <productname>JBoss Tools</productname> web projects include Struts, JSF and Seam projects. These are referred to as faceted projects. This chapter will cover facets, which are used to provide provide a consistent structure and packaging features to any type of project.
+ The most popular of the projects we deal with are the J2EE ones, such as Dynamic Web Project, EJB Project, or EAR project. <productname>JBoss Tools</productname> web projects include Struts, JSF and Seam projects. These are referred to as faceted projects. This chapter will cover facets, which are used to provide a consistent structure and packaging features to any type of project.
</para>
<section>
@@ -16,7 +16,7 @@
</para>
<para>
- However, the benefit of this is that the structure of your projects is then known, and packaging it up <emphasis>should</emphasis> be trivial. If your project is non-standard, or you feel too confined by such rigid structural requirements, you can still choose to package your project using the Archives plugin (see <xref linkend="Project_archivesView"/>).
+ However, the benefit of this is that the structure of your projects is then known and packaging it up <emphasis>should</emphasis> be trivial. If your project is non-standard, or you feel too confined by such rigid structural requirements, you can still choose to package your project using the Archives plugin (see <xref linkend="Project_archivesView"/>).
</para>
</section>
@@ -42,7 +42,7 @@
<para>Click the <guibutton>Next</guibutton> button and you will see a Dynamic Web Project page like on the figure below.</para>
<para>
- The first page of most WTP projects allows you to target a specific runtime, which represents a server's library location. It will also provide you the ability to add this project to an EAR project, and select a preselected default set of facets, called a configuration, rather than manually select each required facet.
+ The first page of most WTP projects allows you to target a specific runtime, which represents a server's library location. It will also provide you the ability to add this project to an EAR project and select a preselected default set of facets, called a configuration, rather than manually select each required facet.
</para>
<para>
Selecting the runtime allows the project to install the proper classpaths to the project so it knows what code to compile against.
14 years, 10 months
JBoss Tools SVN: r28998 - trunk/hibernatetools/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-02-04 00:13:24 -0500 (Fri, 04 Feb 2011)
New Revision: 28998
Modified:
trunk/hibernatetools/docs/reference/en-US/Book_Info.xml
trunk/hibernatetools/docs/reference/en-US/codegen.xml
Log:
Fixed issue with & character using &amp;
Modified: trunk/hibernatetools/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/hibernatetools/docs/reference/en-US/Book_Info.xml 2011-02-04 02:17:41 UTC (rev 28997)
+++ trunk/hibernatetools/docs/reference/en-US/Book_Info.xml 2011-02-04 05:13:24 UTC (rev 28998)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.0</productnumber>
<edition>4.0.0</edition>
- <pubsnumber>14</pubsnumber>
+ <pubsnumber>16</pubsnumber>
<abstract>
<para>
The Hibernate Tools Reference Guide explains how to use the Hibernate Tools to perform reverse engineering, code generation, visualization and interaction with Hibernate.
Modified: trunk/hibernatetools/docs/reference/en-US/codegen.xml
===================================================================
--- trunk/hibernatetools/docs/reference/en-US/codegen.xml 2011-02-04 02:17:41 UTC (rev 28997)
+++ trunk/hibernatetools/docs/reference/en-US/codegen.xml 2011-02-04 05:13:24 UTC (rev 28998)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
<chapter id="codegen">
<title>Controlling POJO code generation</title>
@@ -462,7 +463,7 @@
<note>
<title>Note:</title>
- <para>I) To escape the & symbol we put &amp;. You could use <code> <![CDATA[]]></code> instead.</para>
+ <para>I) To escape the & symbol we put &amp;. You could use <code> <![CDATA[]]></code> instead.</para>
<para>
II) Note that we are referring to <code>firstName</code> directly and this is the parameter name not the actual field name. If you want to refer the field you have to use <code>this.firstName</code> instead.
</para>
14 years, 10 months
JBoss Tools SVN: r28997 - trunk/documentation/guides/Beginners_Guide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-02-03 21:17:41 -0500 (Thu, 03 Feb 2011)
New Revision: 28997
Modified:
trunk/documentation/guides/Beginners_Guide/en-US/Book_Info.xml
Log:
General Documentation Updates
Modified: trunk/documentation/guides/Beginners_Guide/en-US/Book_Info.xml
===================================================================
--- trunk/documentation/guides/Beginners_Guide/en-US/Book_Info.xml 2011-02-04 02:15:46 UTC (rev 28996)
+++ trunk/documentation/guides/Beginners_Guide/en-US/Book_Info.xml 2011-02-04 02:17:41 UTC (rev 28997)
@@ -9,7 +9,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.0</productnumber>
<edition>4.0.0</edition>
- <pubsnumber>11</pubsnumber>
+ <pubsnumber>12</pubsnumber>
<abstract>
<para>
The Beginners Guide brings all concepts pertaining to the <application>JBoss Developer Studio</application> back to basics. It is intended for individuals who may be
14 years, 10 months