January 2011 - jbosstools-commits

JBoss Tools SVN: r28213 - in branches/jbosstools-3.2.0.CR1/as/plugins: org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2011-01-13 18:12:35 -0500 (Thu, 13 Jan 2011) New Revision: 28213 Modified: branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java Log: JBIDE-8105 error checking and default fix for cr1 Modified: branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java =================================================================== --- branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java 2011-01-13 23:11:14 UTC (rev 28212) +++ branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java 2011-01-13 23:12:35 UTC (rev 28213) @@ -52,7 +52,9 @@ method.getFileService().upload(file, remotePath.removeLastSegments(1).toString(), remotePath.lastSegment(), true, null, null, monitor); } catch( SystemMessageException sme ) { - System.err.println("failed to copy to " + remotePath.toString()); //$NON-NLS-1$ + IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID, + "failed to copy to " + remotePath.toString(), sme); + return new IStatus[]{s}; } return new IStatus[]{}; } @@ -63,7 +65,9 @@ try { method.getFileService().delete(remotePath.removeLastSegments(1).toString(), remotePath.lastSegment(), monitor); } catch( SystemMessageException sme ) { - System.err.println("failed to delete " + remotePath.toString()); //$NON-NLS-1$ + IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID, + "failed to delete " + remotePath.toString(), sme); + return new IStatus[]{s}; } return new IStatus[]{}; } @@ -82,7 +86,9 @@ toMake.lastSegment(), ProgressMonitorUtil.submon(monitor, 30)); } } catch( SystemMessageException sme ) { - System.err.println("failed to make folder " + toMake.toString()); //$NON-NLS-1$ + IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID, + "failed to create folder " + toMake.toString(), sme); + return new IStatus[]{s}; } createdFolders.add(toMake); monitor.done(); @@ -98,6 +104,9 @@ } method.getFileServiceSubSystem().setLastModified(rf, new Date().getTime(), null); } catch(SystemMessageException sme) { + IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID, + "failed to touch remote resource " + file.toString(), sme); + return new IStatus[]{s}; } return new IStatus[]{}; } Modified: branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java =================================================================== --- branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-01-13 23:11:14 UTC (rev 28212) +++ branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-01-13 23:12:35 UTC (rev 28213) @@ -69,11 +69,11 @@ // if no value is set, default to metadata type = JBossServer.DEPLOY_SERVER; } - // TODO error here, or sensible default? + // This should *NOT* happen, so if it does, we will default to server location if( type.equals(JBossServer.DEPLOY_METADATA)) { - return JBossServerCorePlugin.getServerStateLocation(server). - append(IJBossServerConstants.DEPLOY).makeAbsolute().toString(); - } else if( type.equals(JBossServer.DEPLOY_SERVER)) { + type = JBossServer.DEPLOY_SERVER; + } + if( type.equals(JBossServer.DEPLOY_SERVER)) { String loc = IConstants.SERVER; String config = getRSEConfigName(server); IPath p = new Path(loc).append(config) Modified: branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java =================================================================== --- branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-01-13 23:11:14 UTC (rev 28212) +++ branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-01-13 23:12:35 UTC (rev 28213) @@ -55,12 +55,15 @@ import org.eclipse.ui.progress.IProgressService; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServerWorkingCopy; +import org.eclipse.wst.server.ui.internal.command.ServerCommand; +import org.jboss.ide.eclipse.as.core.server.IDeployableServer; 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.IConstants; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod; import org.jboss.ide.eclipse.as.rse.core.RSEUtils; +import org.jboss.ide.eclipse.as.ui.Messages; import org.jboss.ide.eclipse.as.ui.UIUtil; import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI; import org.jboss.ide.eclipse.as.ui.editor.ServerModeSection; @@ -109,56 +112,148 @@ ServerConverter.getJBossServer(cServer) : ServerConverter.getJBossServer(cServer.getOriginal()); if( jbs != null ) { - - Label serverHomeLabel = new Label(this, SWT.NONE); - serverHomeLabel.setText("Remote Server Home: "); - rseBrowse = new Button(this, SWT.DEFAULT); - rseBrowse.setText("Browse..."); - rseBrowse.setLayoutData(UIUtil.createFormData2(child, 5, null, 0, null, 0, 100, -5)); - rseBrowse.addSelectionListener(new SelectionListener(){ - public void widgetSelected(SelectionEvent e) { - browseClicked(); - } - public void widgetDefaultSelected(SelectionEvent e) { - browseClicked(); - } - }); - rseServerHome = new Text(this, SWT.SINGLE | SWT.BORDER); - serverHomeLabel.setLayoutData(UIUtil.createFormData2(child, 7, null, 0, 0, 10, null, 0)); - rseServerHome.setLayoutData(UIUtil.createFormData2(child, 5, null, 0, serverHomeLabel, 5, rseBrowse, -5)); - rseServerHome.setText(callback.getServer().getAttribute(RSEUtils.RSE_SERVER_HOME_DIR, - getRuntime() == null ? "" : getRuntime().getRuntime().getLocation().toString())); - rseServerHome.addModifyListener(new ModifyListener(){ - public void modifyText(ModifyEvent e) { - serverHomeChanged(); - }}); - - Label serverConfigLabel = new Label(this, SWT.NONE); - serverConfigLabel.setText("Remote Server Configuration: "); - rseServerConfig= new Text(this, SWT.SINGLE | SWT.BORDER); - serverConfigLabel.setLayoutData(UIUtil.createFormData2(rseServerHome, 7, null, 0, 0, 10, null, 0)); - rseServerConfig.setText(callback.getServer().getAttribute(RSEUtils.RSE_SERVER_CONFIG, - getRuntime() == null ? "" : getRuntime().getJBossConfiguration())); - rseServerConfig.addModifyListener(new ModifyListener(){ - public void modifyText(ModifyEvent e) { - serverConfigChanged(); - }}); - callback.getServer().addPropertyChangeListener(this); - - rseTest = new Button(this, SWT.NONE); - rseTest.setText("Test..."); - rseTest.setLayoutData(UIUtil.createFormData2(rseServerHome, 5, null, 0, null, 0, 100, -5)); - rseServerConfig.setLayoutData(UIUtil.createFormData2(rseServerHome, 5, null, 0, serverConfigLabel, 5, rseTest, -5)); - rseTest.addSelectionListener(new SelectionListener(){ - public void widgetSelected(SelectionEvent e) { - testPressed(); - } - public void widgetDefaultSelected(SelectionEvent e) { - } - }); + handleJBossServer(child); + } else { + handleDeployOnlyServer(child); } } + private IDeployableServer getServer() { + return (IDeployableServer) callback.getServer().loadAdapter( + IDeployableServer.class, new NullProgressMonitor()); + } + + private Text deployText, tempDeployText; + private Button deployButton, tempDeployButton; + private ModifyListener deployListener, tempDeployListener; + + private void handleJBossServer(Composite composite) { + Label serverHomeLabel = new Label(this, SWT.NONE); + serverHomeLabel.setText("Remote Server Home: "); + rseBrowse = new Button(this, SWT.DEFAULT); + rseBrowse.setText("Browse..."); + rseBrowse.setLayoutData(UIUtil.createFormData2(composite, 5, null, + 0, null, 0, 100, -5)); + rseBrowse.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + browseClicked2(); + } + + public void widgetDefaultSelected(SelectionEvent e) { + browseClicked2(); + } + }); + rseServerHome = new Text(this, SWT.SINGLE | SWT.BORDER); + serverHomeLabel.setLayoutData(UIUtil.createFormData2(composite, 7, + null, 0, 0, 10, null, 0)); + rseServerHome.setLayoutData(UIUtil.createFormData2(composite, 5, + null, 0, serverHomeLabel, 5, rseBrowse, -5)); + rseServerHome.setText(callback.getServer().getAttribute( + RSEUtils.RSE_SERVER_HOME_DIR, + getRuntime() == null ? "" : getRuntime().getRuntime() + .getLocation().toString())); + rseServerHome.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + serverHomeChanged(); + } + }); + + Label serverConfigLabel = new Label(this, SWT.NONE); + serverConfigLabel.setText("Remote Server Configuration: "); + rseServerConfig = new Text(this, SWT.SINGLE | SWT.BORDER); + serverConfigLabel.setLayoutData(UIUtil.createFormData2( + rseServerHome, 7, null, 0, 0, 10, null, 0)); + rseServerConfig.setText(callback.getServer().getAttribute( + RSEUtils.RSE_SERVER_CONFIG, + getRuntime() == null ? "" : getRuntime() + .getJBossConfiguration())); + rseServerConfig.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + serverConfigChanged(); + } + }); + callback.getServer().addPropertyChangeListener(this); + + rseTest = new Button(this, SWT.NONE); + rseTest.setText("Test..."); + rseTest.setLayoutData(UIUtil.createFormData2(rseServerHome, 5, + null, 0, null, 0, 100, -5)); + rseServerConfig.setLayoutData(UIUtil.createFormData2(rseServerHome, + 5, null, 0, serverConfigLabel, 5, rseTest, -5)); + rseTest.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + testPressed(); + } + public void widgetDefaultSelected(SelectionEvent e) { + } + }); + } + + + + private void handleDeployOnlyServer(Composite composite) { + Label label = new Label(this, SWT.NONE); + label.setText(Messages.swf_DeployDirectory); + deployText = new Text(this, SWT.BORDER); + deployText.setText(getServer().getDeployFolder()); + deployListener = new ModifyListener() { + public void modifyText(ModifyEvent e) { + callback.execute(new SetDeployDirCommand()); + } + }; + deployText.addModifyListener(deployListener); + + deployButton = new Button(this, SWT.PUSH); + deployButton.setText(Messages.browse); + label.setLayoutData(UIUtil.createFormData2(composite, 7, null, 0, 0, 10, null, 0)); + deployButton.setLayoutData(UIUtil.createFormData2(composite, 5, null, 0, null, 0, 100, -5)); + deployText.setLayoutData(UIUtil.createFormData2(composite, 5, null, 0, label, 5, deployButton, -5)); + + deployButton.addSelectionListener(new SelectionListener() { + public void widgetDefaultSelected(SelectionEvent e) { + } + + public void widgetSelected(SelectionEvent e) { + } + }); + + Label tempDeployLabel = new Label(this, SWT.NONE); + tempDeployLabel.setText(Messages.swf_TempDeployDirectory); + tempDeployText = new Text(this, SWT.BORDER); + tempDeployText.setText(getServer().getTempDeployFolder()); + tempDeployListener = new ModifyListener() { + public void modifyText(ModifyEvent e) { + callback.execute(new SetTempDeployDirCommand()); + } + }; + tempDeployText.addModifyListener(tempDeployListener); + + tempDeployButton = new Button(this, SWT.PUSH); + tempDeployButton.setText(Messages.browse); + + tempDeployLabel.setLayoutData(UIUtil.createFormData2(deployText, 7, null, 0, 0, 10, null, 0)); + tempDeployButton.setLayoutData(UIUtil.createFormData2(deployText, 5, null, 0, null, 0, 100, -5)); + tempDeployText.setLayoutData(UIUtil.createFormData2(deployText, 5, null, 0, tempDeployLabel, 5, deployButton, -5)); + + tempDeployButton.addSelectionListener(new SelectionListener() { + public void widgetDefaultSelected(SelectionEvent e) { + } + + public void widgetSelected(SelectionEvent e) { + } + }); + } + private void updateDeployOnlyWidgets() { + String newDir = callback.getServer().getAttribute(IDeployableServer.DEPLOY_DIRECTORY, ""); + String newTemp = callback.getServer().getAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, ""); + deployText.removeModifyListener(deployListener); + deployText.setText(newDir); + deployText.addModifyListener(deployListener); + tempDeployText.removeModifyListener(tempDeployListener); + tempDeployText.setText(newTemp); + tempDeployText.addModifyListener(tempDeployListener); + } + private void testPressed(){ rseTest.setEnabled(false); IWorkbench wb = PlatformUI.getWorkbench(); @@ -298,17 +393,25 @@ } } - protected void browseClicked() { + protected void browseClicked2() { + String browseVal = browseClicked3(); + if (browseVal != null) { + rseServerHome.setText(browseVal); + serverHomeChanged(); + } + } + + protected String browseClicked3() { SystemRemoteFileDialog d = new SystemRemoteFileDialog( rseBrowse.getShell(), "Browse remote system", combo.getHost()); if( d.open() == Dialog.OK) { Object o = d.getOutputObject(); if( o instanceof IRemoteFile ) { String path = ((IRemoteFile)o).getAbsolutePath(); - rseServerHome.setText(path); - serverHomeChanged(); + return path; } } + return null; } protected IJBossServerRuntime getRuntime() { @@ -492,6 +595,59 @@ RSECorePlugin.getTheSystemRegistry().removeSystemModelChangeListener(this); } } + + public class SetDeployDirCommand extends ServerCommand { + private String oldDir; + private String newDir; + private Text text; + private ModifyListener listener; + + public SetDeployDirCommand() { + super(callback.getServer(), Messages.EditorSetDeployLabel); + this.text = deployText; + this.newDir = deployText.getText(); + this.listener = deployListener; + this.oldDir = callback.getServer().getAttribute( + IDeployableServer.DEPLOY_DIRECTORY, ""); //$NON-NLS-1$ + } + + public void execute() { + callback.getServer().setAttribute( + IDeployableServer.DEPLOY_DIRECTORY, newDir); + updateDeployOnlyWidgets(); + } + + public void undo() { + callback.getServer().setAttribute( + IDeployableServer.DEPLOY_DIRECTORY, oldDir); + updateDeployOnlyWidgets(); + } + } + + public class SetTempDeployDirCommand extends ServerCommand { + private String oldDir; + private String newDir; + private Text text; + private ModifyListener listener; + + public SetTempDeployDirCommand() { + super(callback.getServer(), Messages.EditorSetTempDeployLabel); + text = tempDeployText; + newDir = tempDeployText.getText(); + listener = tempDeployListener; + oldDir = callback.getServer().getAttribute( + IDeployableServer.TEMP_DEPLOY_DIRECTORY, ""); //$NON-NLS-1$ + } + + public void execute() { + callback.getServer().setAttribute( + IDeployableServer.TEMP_DEPLOY_DIRECTORY, newDir); + } + + public void undo() { + callback.getServer().setAttribute( + IDeployableServer.TEMP_DEPLOY_DIRECTORY, oldDir); + } + } } - } Modified: branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java =================================================================== --- branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2011-01-13 23:11:14 UTC (rev 28212) +++ branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2011-01-13 23:12:35 UTC (rev 28213) @@ -141,6 +141,15 @@ callback.execute(new ChangeServerPropertyCommand( callback.getServer(), IDeployableServer.SERVER_MODE, ui.getPublishType().getId(), "Change server mode")); + String deployType = null; + if( ui.getPublishType().getId().equals(LocalPublishMethod.LOCAL_PUBLISH_METHOD)) { + deployType = IDeployableServer.DEPLOY_METADATA; + } else { + deployType = IDeployableServer.DEPLOY_SERVER; + } + callback.execute(new ChangeServerPropertyCommand( + callback.getServer(), IDeployableServer.DEPLOY_DIRECTORY_TYPE, + deployType, "Change server's deploy location")); } } else { // null selection

15 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r28212 - branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2011-01-13 18:11:14 -0500 (Thu, 13 Jan 2011) New Revision: 28212 Modified: branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java Log: JBIDE-7915 cr1 branch patch from snjezana Modified: branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java =================================================================== --- branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-01-13 23:05:01 UTC (rev 28211) +++ branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-01-13 23:11:14 UTC (rev 28212) @@ -229,7 +229,7 @@ String root = home; IPath root2 = new Path(root); try { - IHostFile file = service.getFile(root2.removeLastSegments(1).toOSString(), root2.lastSegment(), new NullProgressMonitor()); + IHostFile file = service.getFile(root2.removeLastSegments(1).toPortableString(), root2.lastSegment(), new NullProgressMonitor()); if( file == null || !file.exists()) { pm.done(); return getTestFailStatus("Server's Home folder " + root2 + " not found on " + service.getName() + " for " + host.getName()); @@ -237,7 +237,7 @@ pm.worked(300); root2 = root2.append(IConstants.SERVER).append(config); - file = service.getFile(root2.removeLastSegments(1).toOSString(), root2.lastSegment(), new NullProgressMonitor()); + file = service.getFile(root2.removeLastSegments(1).toPortableString(), root2.lastSegment(), new NullProgressMonitor()); if( file == null || !file.exists()) { pm.done(); return getTestFailStatus("Server's config folder " + root2 + " does not exist");

15 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r28211 - branches/jbosstools-3.2.0.CR1/build/target-platform.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-01-13 18:05:01 -0500 (Thu, 13 Jan 2011) New Revision: 28211 Modified: branches/jbosstools-3.2.0.CR1/build/target-platform/jbds.target branches/jbosstools-3.2.0.CR1/build/target-platform/jbds.target.p2mirror.xml branches/jbosstools-3.2.0.CR1/build/target-platform/multiple.target branches/jbosstools-3.2.0.CR1/build/target-platform/multiple.target.p2mirror.xml branches/jbosstools-3.2.0.CR1/build/target-platform/unified.target branches/jbosstools-3.2.0.CR1/build/target-platform/unified.target.p2mirror.xml Log: merge changes from trunk into branch Modified: branches/jbosstools-3.2.0.CR1/build/target-platform/jbds.target =================================================================== --- branches/jbosstools-3.2.0.CR1/build/target-platform/jbds.target 2011-01-13 23:01:51 UTC (rev 28210) +++ branches/jbosstools-3.2.0.CR1/build/target-platform/jbds.target 2011-01-13 23:05:01 UTC (rev 28211) @@ -130,7 +130,6 @@ <unit version="3.6.1.r361_v20100727-7b7mFL-FET3dhESDgE5_bkJ" id="org.eclipse.pde.feature.group"/>  - <unit version="4.3.1.v201009092123-794F9x8s73533H3I6A56" id="org.eclipse.tptp.trace.feature.group"/> <unit version="4.5.0.v201005032111-2-37w312116191612" id="org.eclipse.tptp.platform.commons.logging.feature.group"/> <unit version="4.7.1.v201009092123-8X8ZFXUFLWUl6knOxRCm9t" id="org.eclipse.tptp.platform.core.feature.group"/> <unit version="4.3.1.v201009092123-797908s73533D4H6D56" id="org.eclipse.tptp.platform.instrumentation.ui.feature.group"/> Modified: branches/jbosstools-3.2.0.CR1/build/target-platform/jbds.target.p2mirror.xml =================================================================== --- branches/jbosstools-3.2.0.CR1/build/target-platform/jbds.target.p2mirror.xml 2011-01-13 23:01:51 UTC (rev 28210) +++ branches/jbosstools-3.2.0.CR1/build/target-platform/jbds.target.p2mirror.xml 2011-01-13 23:05:01 UTC (rev 28211) @@ -128,7 +128,6 @@ <iu version="" id="org.eclipse.uml2.feature.group"/> <iu version="" id="org.eclipse.uml2.doc.feature.group"/> <iu version="" id="org.eclipse.pde.feature.group"/> -<iu version="" id="org.eclipse.tptp.trace.feature.group"/> <iu version="" id="org.eclipse.tptp.platform.commons.logging.feature.group"/> <iu version="" id="org.eclipse.tptp.platform.core.feature.group"/> <iu version="" id="org.eclipse.tptp.platform.instrumentation.ui.feature.group"/> Modified: branches/jbosstools-3.2.0.CR1/build/target-platform/multiple.target =================================================================== --- branches/jbosstools-3.2.0.CR1/build/target-platform/multiple.target 2011-01-13 23:01:51 UTC (rev 28210) +++ branches/jbosstools-3.2.0.CR1/build/target-platform/multiple.target 2011-01-13 23:05:01 UTC (rev 28211) @@ -54,7 +54,6 @@ <repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/> </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> - <unit id="org.eclipse.tptp.trace.feature.group" version="4.3.1.v201009092123-794F9x8s73533H3I6A56"/> <unit id="org.eclipse.tptp.platform.profile.server.feature.group" version="4.5.1.v201009092123-7H7F2AkF7B77c7dEGDG"/> <unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.1.v201009092123-797908s73533D4H6D56"/> <unit id="org.eclipse.tptp.platform.core.feature.group" version="4.7.1.v201009092123-8X8ZFXUFLWUl6knOxRCm9t"/> Modified: branches/jbosstools-3.2.0.CR1/build/target-platform/multiple.target.p2mirror.xml =================================================================== --- branches/jbosstools-3.2.0.CR1/build/target-platform/multiple.target.p2mirror.xml 2011-01-13 23:01:51 UTC (rev 28210) +++ branches/jbosstools-3.2.0.CR1/build/target-platform/multiple.target.p2mirror.xml 2011-01-13 23:05:01 UTC (rev 28211) @@ -57,7 +57,6 @@ <iu id="org.jdom.feature.feature.group" version=""/> <iu id="org.mozilla.xulrunner.feature.feature.group" version=""/> <iu id="org.mozilla.xpcom.feature.feature.group" version=""/> -<iu id="org.eclipse.tptp.trace.feature.group" version=""/> <iu id="org.eclipse.tptp.platform.profile.server.feature.group" version=""/> <iu id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version=""/> <iu id="org.eclipse.tptp.platform.core.feature.group" version=""/> Modified: branches/jbosstools-3.2.0.CR1/build/target-platform/unified.target =================================================================== --- branches/jbosstools-3.2.0.CR1/build/target-platform/unified.target 2011-01-13 23:01:51 UTC (rev 28210) +++ branches/jbosstools-3.2.0.CR1/build/target-platform/unified.target 2011-01-13 23:05:01 UTC (rev 28211) @@ -54,7 +54,6 @@ <repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/> </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> - <unit id="org.eclipse.tptp.trace.feature.group" version="4.3.1.v201009092123-794F9x8s73533H3I6A56"/> <unit id="org.eclipse.tptp.platform.profile.server.feature.group" version="4.5.1.v201009092123-7H7F2AkF7B77c7dEGDG"/> <unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.1.v201009092123-797908s73533D4H6D56"/> <unit id="org.eclipse.tptp.platform.core.feature.group" version="4.7.1.v201009092123-8X8ZFXUFLWUl6knOxRCm9t"/> Modified: branches/jbosstools-3.2.0.CR1/build/target-platform/unified.target.p2mirror.xml =================================================================== --- branches/jbosstools-3.2.0.CR1/build/target-platform/unified.target.p2mirror.xml 2011-01-13 23:01:51 UTC (rev 28210) +++ branches/jbosstools-3.2.0.CR1/build/target-platform/unified.target.p2mirror.xml 2011-01-13 23:05:01 UTC (rev 28211) @@ -57,7 +57,6 @@ <iu id="org.jdom.feature.feature.group" version=""/> <iu id="org.mozilla.xulrunner.feature.feature.group" version=""/> <iu id="org.mozilla.xpcom.feature.feature.group" version=""/> -<iu id="org.eclipse.tptp.trace.feature.group" version=""/> <iu id="org.eclipse.tptp.platform.profile.server.feature.group" version=""/> <iu id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version=""/> <iu id="org.eclipse.tptp.platform.core.feature.group" version=""/>

15 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r28210 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2011-01-13 18:01:51 -0500 (Thu, 13 Jan 2011) New Revision: 28210 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java Log: JBIDE-7915 - trunk Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-01-13 22:49:09 UTC (rev 28209) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-01-13 23:01:51 UTC (rev 28210) @@ -324,7 +324,7 @@ String root = home; IPath root2 = new Path(root); try { - IHostFile file = service.getFile(root2.removeLastSegments(1).toOSString(), root2.lastSegment(), new NullProgressMonitor()); + IHostFile file = service.getFile(root2.removeLastSegments(1).toPortableString(), root2.lastSegment(), new NullProgressMonitor()); if( file == null || !file.exists()) { pm.done(); return getTestFailStatus("Server's Home folder " + root2 + " not found on " + service.getName() + " for " + host.getName()); @@ -332,7 +332,7 @@ pm.worked(300); root2 = root2.append(IConstants.SERVER).append(config); - file = service.getFile(root2.removeLastSegments(1).toOSString(), root2.lastSegment(), new NullProgressMonitor()); + file = service.getFile(root2.removeLastSegments(1).toPortableString(), root2.lastSegment(), new NullProgressMonitor()); if( file == null || !file.exists()) { pm.done(); return getTestFailStatus("Server's config folder " + root2 + " does not exist");

15 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r28209 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2011-01-13 17:49:09 -0500 (Thu, 13 Jan 2011) New Revision: 28209 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java Log: JBIDE-8105 and error logging Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java 2011-01-13 22:26:29 UTC (rev 28208) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java 2011-01-13 22:49:09 UTC (rev 28209) @@ -52,7 +52,9 @@ method.getFileService().upload(file, remotePath.removeLastSegments(1).toString(), remotePath.lastSegment(), true, null, null, monitor); } catch( SystemMessageException sme ) { - System.err.println("failed to copy to " + remotePath.toString()); //$NON-NLS-1$ + IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID, + "failed to copy to " + remotePath.toString(), sme); + return new IStatus[]{s}; } return new IStatus[]{}; } @@ -63,7 +65,9 @@ try { method.getFileService().delete(remotePath.removeLastSegments(1).toString(), remotePath.lastSegment(), monitor); } catch( SystemMessageException sme ) { - System.err.println("failed to delete " + remotePath.toString()); //$NON-NLS-1$ + IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID, + "failed to delete " + remotePath.toString(), sme); + return new IStatus[]{s}; } return new IStatus[]{}; } @@ -82,7 +86,9 @@ toMake.lastSegment(), ProgressMonitorUtil.submon(monitor, 30)); } } catch( SystemMessageException sme ) { - System.err.println("failed to make folder " + toMake.toString()); //$NON-NLS-1$ + IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID, + "failed to create folder " + toMake.toString(), sme); + return new IStatus[]{s}; } createdFolders.add(toMake); monitor.done(); @@ -98,6 +104,9 @@ } method.getFileServiceSubSystem().setLastModified(rf, new Date().getTime(), null); } catch(SystemMessageException sme) { + IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID, + "failed to touch remote resource " + file.toString(), sme); + return new IStatus[]{s}; } return new IStatus[]{}; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-01-13 22:26:29 UTC (rev 28208) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-01-13 22:49:09 UTC (rev 28209) @@ -69,11 +69,11 @@ // if no value is set, default to metadata type = JBossServer.DEPLOY_SERVER; } - // TODO error here, or sensible default? + // This should *NOT* happen, so if it does, we will default to server location if( type.equals(JBossServer.DEPLOY_METADATA)) { - return JBossServerCorePlugin.getServerStateLocation(server). - append(IJBossServerConstants.DEPLOY).makeAbsolute().toString(); - } else if( type.equals(JBossServer.DEPLOY_SERVER)) { + type = JBossServer.DEPLOY_SERVER; + } + if( type.equals(JBossServer.DEPLOY_SERVER)) { String loc = IConstants.SERVER; String config = getRSEConfigName(server); IPath p = new Path(loc).append(config) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-01-13 22:26:29 UTC (rev 28208) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-01-13 22:49:09 UTC (rev 28209) @@ -55,12 +55,15 @@ import org.eclipse.ui.progress.IProgressService; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServerWorkingCopy; +import org.eclipse.wst.server.ui.internal.command.ServerCommand; +import org.jboss.ide.eclipse.as.core.server.IDeployableServer; 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.IConstants; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod; import org.jboss.ide.eclipse.as.rse.core.RSEUtils; +import org.jboss.ide.eclipse.as.ui.Messages; import org.jboss.ide.eclipse.as.ui.UIUtil; import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI; import org.jboss.ide.eclipse.as.ui.editor.ServerModeSection; @@ -109,56 +112,148 @@ ServerConverter.getJBossServer(cServer) : ServerConverter.getJBossServer(cServer.getOriginal()); if( jbs != null ) { - - Label serverHomeLabel = new Label(this, SWT.NONE); - serverHomeLabel.setText("Remote Server Home: "); - rseBrowse = new Button(this, SWT.DEFAULT); - rseBrowse.setText("Browse..."); - rseBrowse.setLayoutData(UIUtil.createFormData2(child, 5, null, 0, null, 0, 100, -5)); - rseBrowse.addSelectionListener(new SelectionListener(){ - public void widgetSelected(SelectionEvent e) { - browseClicked(); - } - public void widgetDefaultSelected(SelectionEvent e) { - browseClicked(); - } - }); - rseServerHome = new Text(this, SWT.SINGLE | SWT.BORDER); - serverHomeLabel.setLayoutData(UIUtil.createFormData2(child, 7, null, 0, 0, 10, null, 0)); - rseServerHome.setLayoutData(UIUtil.createFormData2(child, 5, null, 0, serverHomeLabel, 5, rseBrowse, -5)); - rseServerHome.setText(callback.getServer().getAttribute(RSEUtils.RSE_SERVER_HOME_DIR, - getRuntime() == null ? "" : getRuntime().getRuntime().getLocation().toString())); - rseServerHome.addModifyListener(new ModifyListener(){ - public void modifyText(ModifyEvent e) { - serverHomeChanged(); - }}); - - Label serverConfigLabel = new Label(this, SWT.NONE); - serverConfigLabel.setText("Remote Server Configuration: "); - rseServerConfig= new Text(this, SWT.SINGLE | SWT.BORDER); - serverConfigLabel.setLayoutData(UIUtil.createFormData2(rseServerHome, 7, null, 0, 0, 10, null, 0)); - rseServerConfig.setText(callback.getServer().getAttribute(RSEUtils.RSE_SERVER_CONFIG, - getRuntime() == null ? "" : getRuntime().getJBossConfiguration())); - rseServerConfig.addModifyListener(new ModifyListener(){ - public void modifyText(ModifyEvent e) { - serverConfigChanged(); - }}); - callback.getServer().addPropertyChangeListener(this); - - rseTest = new Button(this, SWT.NONE); - rseTest.setText("Test..."); - rseTest.setLayoutData(UIUtil.createFormData2(rseServerHome, 5, null, 0, null, 0, 100, -5)); - rseServerConfig.setLayoutData(UIUtil.createFormData2(rseServerHome, 5, null, 0, serverConfigLabel, 5, rseTest, -5)); - rseTest.addSelectionListener(new SelectionListener(){ - public void widgetSelected(SelectionEvent e) { - testPressed(); - } - public void widgetDefaultSelected(SelectionEvent e) { - } - }); + handleJBossServer(child); + } else { + handleDeployOnlyServer(child); } } + private IDeployableServer getServer() { + return (IDeployableServer) callback.getServer().loadAdapter( + IDeployableServer.class, new NullProgressMonitor()); + } + + private Text deployText, tempDeployText; + private Button deployButton, tempDeployButton; + private ModifyListener deployListener, tempDeployListener; + + private void handleJBossServer(Composite composite) { + Label serverHomeLabel = new Label(this, SWT.NONE); + serverHomeLabel.setText("Remote Server Home: "); + rseBrowse = new Button(this, SWT.DEFAULT); + rseBrowse.setText("Browse..."); + rseBrowse.setLayoutData(UIUtil.createFormData2(composite, 5, null, + 0, null, 0, 100, -5)); + rseBrowse.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + browseClicked2(); + } + + public void widgetDefaultSelected(SelectionEvent e) { + browseClicked2(); + } + }); + rseServerHome = new Text(this, SWT.SINGLE | SWT.BORDER); + serverHomeLabel.setLayoutData(UIUtil.createFormData2(composite, 7, + null, 0, 0, 10, null, 0)); + rseServerHome.setLayoutData(UIUtil.createFormData2(composite, 5, + null, 0, serverHomeLabel, 5, rseBrowse, -5)); + rseServerHome.setText(callback.getServer().getAttribute( + RSEUtils.RSE_SERVER_HOME_DIR, + getRuntime() == null ? "" : getRuntime().getRuntime() + .getLocation().toString())); + rseServerHome.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + serverHomeChanged(); + } + }); + + Label serverConfigLabel = new Label(this, SWT.NONE); + serverConfigLabel.setText("Remote Server Configuration: "); + rseServerConfig = new Text(this, SWT.SINGLE | SWT.BORDER); + serverConfigLabel.setLayoutData(UIUtil.createFormData2( + rseServerHome, 7, null, 0, 0, 10, null, 0)); + rseServerConfig.setText(callback.getServer().getAttribute( + RSEUtils.RSE_SERVER_CONFIG, + getRuntime() == null ? "" : getRuntime() + .getJBossConfiguration())); + rseServerConfig.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + serverConfigChanged(); + } + }); + callback.getServer().addPropertyChangeListener(this); + + rseTest = new Button(this, SWT.NONE); + rseTest.setText("Test..."); + rseTest.setLayoutData(UIUtil.createFormData2(rseServerHome, 5, + null, 0, null, 0, 100, -5)); + rseServerConfig.setLayoutData(UIUtil.createFormData2(rseServerHome, + 5, null, 0, serverConfigLabel, 5, rseTest, -5)); + rseTest.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + testPressed(); + } + public void widgetDefaultSelected(SelectionEvent e) { + } + }); + } + + + + private void handleDeployOnlyServer(Composite composite) { + Label label = new Label(this, SWT.NONE); + label.setText(Messages.swf_DeployDirectory); + deployText = new Text(this, SWT.BORDER); + deployText.setText(getServer().getDeployFolder()); + deployListener = new ModifyListener() { + public void modifyText(ModifyEvent e) { + callback.execute(new SetDeployDirCommand()); + } + }; + deployText.addModifyListener(deployListener); + + deployButton = new Button(this, SWT.PUSH); + deployButton.setText(Messages.browse); + label.setLayoutData(UIUtil.createFormData2(composite, 7, null, 0, 0, 10, null, 0)); + deployButton.setLayoutData(UIUtil.createFormData2(composite, 5, null, 0, null, 0, 100, -5)); + deployText.setLayoutData(UIUtil.createFormData2(composite, 5, null, 0, label, 5, deployButton, -5)); + + deployButton.addSelectionListener(new SelectionListener() { + public void widgetDefaultSelected(SelectionEvent e) { + } + + public void widgetSelected(SelectionEvent e) { + } + }); + + Label tempDeployLabel = new Label(this, SWT.NONE); + tempDeployLabel.setText(Messages.swf_TempDeployDirectory); + tempDeployText = new Text(this, SWT.BORDER); + tempDeployText.setText(getServer().getTempDeployFolder()); + tempDeployListener = new ModifyListener() { + public void modifyText(ModifyEvent e) { + callback.execute(new SetTempDeployDirCommand()); + } + }; + tempDeployText.addModifyListener(tempDeployListener); + + tempDeployButton = new Button(this, SWT.PUSH); + tempDeployButton.setText(Messages.browse); + + tempDeployLabel.setLayoutData(UIUtil.createFormData2(deployText, 7, null, 0, 0, 10, null, 0)); + tempDeployButton.setLayoutData(UIUtil.createFormData2(deployText, 5, null, 0, null, 0, 100, -5)); + tempDeployText.setLayoutData(UIUtil.createFormData2(deployText, 5, null, 0, tempDeployLabel, 5, deployButton, -5)); + + tempDeployButton.addSelectionListener(new SelectionListener() { + public void widgetDefaultSelected(SelectionEvent e) { + } + + public void widgetSelected(SelectionEvent e) { + } + }); + } + private void updateDeployOnlyWidgets() { + String newDir = callback.getServer().getAttribute(IDeployableServer.DEPLOY_DIRECTORY, ""); + String newTemp = callback.getServer().getAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, ""); + deployText.removeModifyListener(deployListener); + deployText.setText(newDir); + deployText.addModifyListener(deployListener); + tempDeployText.removeModifyListener(tempDeployListener); + tempDeployText.setText(newTemp); + tempDeployText.addModifyListener(tempDeployListener); + } + private void testPressed(){ rseTest.setEnabled(false); IWorkbench wb = PlatformUI.getWorkbench(); @@ -298,17 +393,25 @@ } } - protected void browseClicked() { + protected void browseClicked2() { + String browseVal = browseClicked3(); + if (browseVal != null) { + rseServerHome.setText(browseVal); + serverHomeChanged(); + } + } + + protected String browseClicked3() { SystemRemoteFileDialog d = new SystemRemoteFileDialog( rseBrowse.getShell(), "Browse remote system", combo.getHost()); if( d.open() == Dialog.OK) { Object o = d.getOutputObject(); if( o instanceof IRemoteFile ) { String path = ((IRemoteFile)o).getAbsolutePath(); - rseServerHome.setText(path); - serverHomeChanged(); + return path; } } + return null; } protected IJBossServerRuntime getRuntime() { @@ -492,6 +595,59 @@ RSECorePlugin.getTheSystemRegistry().removeSystemModelChangeListener(this); } } + + public class SetDeployDirCommand extends ServerCommand { + private String oldDir; + private String newDir; + private Text text; + private ModifyListener listener; + + public SetDeployDirCommand() { + super(callback.getServer(), Messages.EditorSetDeployLabel); + this.text = deployText; + this.newDir = deployText.getText(); + this.listener = deployListener; + this.oldDir = callback.getServer().getAttribute( + IDeployableServer.DEPLOY_DIRECTORY, ""); //$NON-NLS-1$ + } + + public void execute() { + callback.getServer().setAttribute( + IDeployableServer.DEPLOY_DIRECTORY, newDir); + updateDeployOnlyWidgets(); + } + + public void undo() { + callback.getServer().setAttribute( + IDeployableServer.DEPLOY_DIRECTORY, oldDir); + updateDeployOnlyWidgets(); + } + } + + public class SetTempDeployDirCommand extends ServerCommand { + private String oldDir; + private String newDir; + private Text text; + private ModifyListener listener; + + public SetTempDeployDirCommand() { + super(callback.getServer(), Messages.EditorSetTempDeployLabel); + text = tempDeployText; + newDir = tempDeployText.getText(); + listener = tempDeployListener; + oldDir = callback.getServer().getAttribute( + IDeployableServer.TEMP_DEPLOY_DIRECTORY, ""); //$NON-NLS-1$ + } + + public void execute() { + callback.getServer().setAttribute( + IDeployableServer.TEMP_DEPLOY_DIRECTORY, newDir); + } + + public void undo() { + callback.getServer().setAttribute( + IDeployableServer.TEMP_DEPLOY_DIRECTORY, oldDir); + } + } } - } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2011-01-13 22:26:29 UTC (rev 28208) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2011-01-13 22:49:09 UTC (rev 28209) @@ -141,6 +141,15 @@ callback.execute(new ChangeServerPropertyCommand( callback.getServer(), IDeployableServer.SERVER_MODE, ui.getPublishType().getId(), "Change server mode")); + String deployType = null; + if( ui.getPublishType().getId().equals(LocalPublishMethod.LOCAL_PUBLISH_METHOD)) { + deployType = IDeployableServer.DEPLOY_METADATA; + } else { + deployType = IDeployableServer.DEPLOY_SERVER; + } + callback.execute(new ChangeServerPropertyCommand( + callback.getServer(), IDeployableServer.DEPLOY_DIRECTORY_TYPE, + deployType, "Change server's deploy location")); } } else { // null selection

15 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r28208 - branches/jbosstools-3.2.0.CR1/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2011-01-13 17:26:29 -0500 (Thu, 13 Jan 2011) New Revision: 28208 Modified: branches/jbosstools-3.2.0.CR1/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java Log: JBIDE-8025 New Project Example wizard page is too narrow. Modified: branches/jbosstools-3.2.0.CR1/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java =================================================================== --- branches/jbosstools-3.2.0.CR1/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java 2011-01-13 22:26:21 UTC (rev 28207) +++ branches/jbosstools-3.2.0.CR1/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java 2011-01-13 22:26:29 UTC (rev 28208) @@ -75,6 +75,7 @@ */ public class NewProjectExamplesWizardPage extends WizardPage { + private static final int DEFAULT_HEIGHT = 350; private static final int DEFAULT_WIDTH = 600; private IStructuredSelection selection; private Button showQuickFixButton; @@ -309,13 +310,21 @@ private void configureSizeAndLocation() { Shell shell = getContainer().getShell(); - Point size = new Point(DEFAULT_WIDTH,shell.getSize().y); + Point size = new Point(DEFAULT_WIDTH, getHeight()); shell.setSize(size); Point location = getInitialLocation(size, shell); shell.setBounds(getConstrainedShellBounds(new Rectangle(location.x, location.y, size.x, size.y))); } + private int getHeight() { + GC gc = new GC(getControl()); + int height = Dialog.convertVerticalDLUsToPixels(gc + .getFontMetrics(), DEFAULT_HEIGHT); + gc.dispose(); + return height; + } + private Rectangle getConstrainedShellBounds(Rectangle preferredSize) { Rectangle result = new Rectangle(preferredSize.x, preferredSize.y, preferredSize.width, preferredSize.height);

15 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r28207 - trunk/build/hudson-jobs.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-01-13 17:26:21 -0500 (Thu, 13 Jan 2011) New Revision: 28207 Modified: trunk/build/hudson-jobs/pom-publisher.xml Log: update defaults Modified: trunk/build/hudson-jobs/pom-publisher.xml =================================================================== --- trunk/build/hudson-jobs/pom-publisher.xml 2011-01-13 22:21:34 UTC (rev 28206) +++ trunk/build/hudson-jobs/pom-publisher.xml 2011-01-13 22:26:21 UTC (rev 28207) @@ -62,17 +62,18 @@ <buildURL>https://svn.jboss.org/repos/jbosstools/trunk/build</buildURL> <branchOrTag>branches/jbosstools-3.2.0.CR1</branchOrTag>  - <componentJobNamePrefix>jbosstools-</componentJobNamePrefix> + <componentJobNamePrefix>jbosstools-3.2_trunk.component--</componentJobNamePrefix> <components>TESTING</components>  <componentJobNameSuffix>_trunk</componentJobNameSuffix> - <componentJobNameSuffix2>_stable_build</componentJobNameSuffix2> +  + <componentJobNameSuffix2>_stable_branch</componentJobNameSuffix2>  <!-- <properties>

15 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r28206 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2011-01-13 17:21:34 -0500 (Thu, 13 Jan 2011) New Revision: 28206 Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java Log: JBIDE-8025 New Project Example wizard page is too narrow. Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java 2011-01-13 22:16:26 UTC (rev 28205) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java 2011-01-13 22:21:34 UTC (rev 28206) @@ -75,6 +75,7 @@ */ public class NewProjectExamplesWizardPage extends WizardPage { + private static final int DEFAULT_HEIGHT = 350; private static final int DEFAULT_WIDTH = 600; private IStructuredSelection selection; private Button showQuickFixButton; @@ -309,13 +310,21 @@ private void configureSizeAndLocation() { Shell shell = getContainer().getShell(); - Point size = new Point(DEFAULT_WIDTH,shell.getSize().y); + Point size = new Point(DEFAULT_WIDTH, getHeight()); shell.setSize(size); Point location = getInitialLocation(size, shell); shell.setBounds(getConstrainedShellBounds(new Rectangle(location.x, location.y, size.x, size.y))); } + private int getHeight() { + GC gc = new GC(getControl()); + int height = Dialog.convertVerticalDLUsToPixels(gc + .getFontMetrics(), DEFAULT_HEIGHT); + gc.dispose(); + return height; + } + private Rectangle getConstrainedShellBounds(Rectangle preferredSize) { Rectangle result = new Rectangle(preferredSize.x, preferredSize.y, preferredSize.width, preferredSize.height);

15 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r28205 - in trunk/documentation/guides/GettingStartedGuide/en-US: images/manage and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: mcaspers Date: 2011-01-13 17:16:26 -0500 (Thu, 13 Jan 2011) New Revision: 28205 Modified: trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/eap5runtime.png trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/manage_1.png trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/manage_11.png trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/manage_15.png trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/manage_16.png trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/manage_17.png trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/manage_3.png trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/manage_4.png trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/manage_6.png trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/manage_8.png trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/manage_9.png trunk/documentation/guides/GettingStartedGuide/en-US/manage.xml Log: Updates for JBDS 4.0 Modified: trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml 2011-01-13 21:54:50 UTC (rev 28204) +++ trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml 2011-01-13 22:16:26 UTC (rev 28205) @@ -858,21 +858,12 @@ <section id="Upgrading"> <?dbhtml filename="Upgrading.html"?> <title>Upgrading</title> - <para>As opposed to upgrading your JBDS from 2.0 to 2.1 using the update site, - to upgrade your JBDS from 2.1 to 3.0 you have to uninstall your 2.1 version and install the new one - because of some platform change.</para> - + <title>Tip</title> + <para>It is possible to run JBDS 3.0x and 4.0 side by side, as long as they have been installed into separate directories.</para> + </note> + </section> <section id="Uninstalling"> @@ -901,7 +892,7 @@ <caption>Usage plug-in pop-up</caption> </mediaobject> <para> - Once enabled, the plug-in will remain active until turned off. To turn the active plug-in off, navigate to <menuchoice><guimenuitem>Window</guimenuitem><guimenuitem>Preferences</guimenuitem><guimenuitem>JBoss Tools</guimenuitem><guimenuitem>Usage Reporting Preferences</guimenuitem></menuchoice>. + Once enabled, the plug-in will remain active until turned off. To turn the active plug-in off, navigate to <menuchoice><guimenuitem>Window</guimenuitem><guimenuitem>Preferences</guimenuitem><guimenuitem>JBoss Tools</guimenuitem><guimenuitem>Usage Reporting</guimenuitem></menuchoice>. </para> <para> The gathered data allows JBoss to see how the tools are being used and where they are being used geographically. Currently we are looking into the operating systems being used, screen resolution and how often the tooling environment is started. In the future geographic information will assist in focussing translation resources to areas where the developer environment is most used. Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/eap5runtime.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/manage_1.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/manage_11.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/manage_15.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/manage_16.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/manage_17.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/manage_3.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/manage_4.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/manage_6.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/manage_8.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/manage/manage_9.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/manage.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/manage.xml 2011-01-13 21:54:50 UTC (rev 28204) +++ trunk/documentation/guides/GettingStartedGuide/en-US/manage.xml 2011-01-13 22:16:26 UTC (rev 28205) @@ -1,98 +1,99 @@ <?xml version="1.0" encoding="UTF-8"?> <chapter id="manage"> - <?dbhtml filename="manage.html"?> - <chapterinfo> - <keywordset> - <keyword>JBoss Developer Studio</keyword> - <keyword>Eclipse</keyword> - <keyword>Deploy</keyword> - <keyword>Deployment</keyword> - <keyword>JBoss</keyword> - </keywordset> - </chapterinfo> + <?dbhtml filename="manage.html"?> + <chapterinfo> + <keywordset> + <keyword>JBoss Developer Studio</keyword> + <keyword>Eclipse</keyword> + <keyword>Deploy</keyword> + <keyword>Deployment</keyword> + <keyword>JBoss</keyword> + </keywordset> + </chapterinfo> - <title>Manage JBoss AS from JBoss Developer Studio</title> + <title>Manage JBoss AS from JBoss Developer Studio</title> - <para>In this chapter we'll focus more on how to operate the <property>JBoss + <para>In this chapter we'll focus more on how to operate the <property>JBoss AS</property> from <property>JBoss Developer Studio</property>.</para> - <para><property>JBoss Developer Studio 3.0.0.GA</property> is shipped with <property>JBoss EAP 5 - </property>. When you followed the default installation of <property>JBoss - Developer Studio</property>, you should already have a JBoss EAP 5 Server installed and - defined. To run JBoss AS you need preinstalled JDK 6.</para> - <note> - <title>Note:</title> - <para>You can leave <property>JDK 1.5</property> configuration for <property>JBDS</property> and set <property>JDK 6</property> as <property>JRE</property> only for <property>JBoss EAP Server</property>. For this you need on <emphasis><property>Windows > Preferences</property></emphasis> menu click <emphasis><property>Server > Runtime Enviroments</property></emphasis>. On the opened preference page you should select <property>JBoss EAP Runtime</property> and click <property>Edit</property>. In <property>Edit Server Runtime Enviroment</property> dialog you can configure <property>Jave Runtime Enviroment</property> by clicking <property>JRE</property> button. </para> - </note> + <para> + <property>JBoss Developer Studio 4.0.0.GA</property> is shipped with <property>JBoss EAP 5.1</property>. When you followed the default installation of <property>JBoss + Developer Studio</property>, you should already have a JBoss EAP 5.1 Server installed and defined. To run JBoss AS you need you will need to have JDK 6 installed.</para> + <note> + <title>Note:</title> + <para>You can leave <property>JDK 1.5</property> configuration for <property>JBDS</property> and set <property>JDK 6</property> as <property>JRE</property> only for <property>JBoss EAP Server</property>. For this you need on <emphasis><property>Windows > Preferences</property> + </emphasis> menu click <menuchoice><guimenuitem>Server</guimenuitem><guimenuitem>Runtime Environments</guimenuitem></menuchoice>. On the opened preference page you should select <property>JBoss EAP Runtime</property> and click <property>Edit</property>. In <property>Edit Server Runtime Environment</property> dialog you can configure <property>Jave Runtime Environment</property> by clicking <property>JRE</property> button. </para> + </note> - <section id="JBossbundled"> - <?dbhtml filename="JBossbundled.html"?> - <title>How to Manage the JBoss AS Bundled in JBDS</title> - <para>This section covers the basics of working with the <property>JBoss Server</property> + <section id="JBossbundled"> + <?dbhtml filename="JBossbundled.html"?> + <title>How to Manage the JBoss AS Bundled in JBDS</title> + <para>This section covers the basics of working with the <property>JBoss Server</property> supported directly by <property>JBDS</property> via bundled AS plug-in. The server points to - the JBoss Enterprise Application Platform 5.0 Runtime shipped with <property>JBDS</property>.</para> + the JBoss Enterprise Application Platform 5.1 Runtime shipped with <property>JBDS</property>.</para> - <figure> - <title>JBoss EAP 5.0 Runtime</title> - <mediaobject> - <imageobject> - <imagedata fileref="images/manage/eap5runtime.png"/> - </imageobject> - </mediaobject> - </figure> - - <para>To read more about AS plug-in, refer to the Server Manager guide.</para> - <section id="StartingServer"> - <?dbhtml filename="StartingServer.html"?> - <title>Starting JBoss Server</title> - <para>Starting <property>JBoss Server</property> is quite simple. <property>JBoss - Developer Studio</property> allows you to control its behaviour with the help of + <figure> + <title>JBoss EAP 5.1 Runtime</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/manage/eap5runtime.png"/> + </imageobject> + </mediaobject> + </figure> + + <para>To read more about AS plug-in, refer to the Server Manager guide.</para> + <section id="StartingServer"> + <?dbhtml filename="StartingServer.html"?> + <title>Starting JBoss Server</title> + <para>Starting <property>JBoss Server</property> is quite simple. <property>JBoss + Developer Studio</property> allows you to control its behavior with the help of a special toolbar, where you could start it in a regular or debug mode, stop it or restart it.</para> - <itemizedlist> - <listitem> - <para>To launch the server click the green-with-white-arrow icon on the + <itemizedlist> + <listitem> + <para>To launch the server click the green-with-white-arrow icon on the <property>Servers</property> or right click server name in this view and select <emphasis> <property>Start</property> - </emphasis>. If this view is not open, select <emphasis> + </emphasis>. If this view is not open, select <emphasis> <property>Window > Show View > Other > Server > Servers</property> - </emphasis></para> - </listitem> - </itemizedlist> - <figure> - <title>Starting from Icon</title> - <mediaobject> - <imageobject> - <imagedata fileref="images/manage/manage_1.png"/> - </imageobject> - </mediaobject> - </figure> + </emphasis> + </para> + </listitem> + </itemizedlist> + <figure> + <title>Starting from Icon</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/manage/manage_1.png"/> + </imageobject> + </mediaobject> + </figure> - <para>While launching, server output is written to the <property>Console + <para>While launching, server output is written to the <property>Console view</property>:</para> - <figure> - <title>Console Output</title> - <mediaobject> - <imageobject> - <imagedata fileref="images/manage/manage_3.png"/> - </imageobject> - </mediaobject> - </figure> - <para>When the server is started you should see <emphasis> + <figure> + <title>Console Output</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/manage/manage_3.png"/> + </imageobject> + </mediaobject> + </figure> + <para>When the server is started you should see <emphasis> <property>Started</property> - </emphasis> in the square brackets right next its name in <property>Servers</property>.</para> + </emphasis> in the square brackets right next its name in <property>Servers</property>.</para> - <figure> - <title>Server is Started</title> - <mediaobject> - <imageobject> - <imagedata fileref="images/manage/manage_4.png"/> - </imageobject> - </mediaobject> - </figure> + <figure> + <title>Server is Started</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/manage/manage_4.png"/> + </imageobject> + </mediaobject> + </figure>  - </section> + </section> - <section id="StoppingJBoss"> - <?dbhtml filename="StoppingJBoss.html"?> - <title>Stopping JBoss Server</title> - <para>To stop the server, click the <emphasis> + <section id="StoppingJBoss"> + <?dbhtml filename="StoppingJBoss.html"?> + <title>Stopping JBoss Server</title> + <para>To stop the server, click the <emphasis> <property>Stop</property> - </emphasis> icon in <property>Servers</property> or right click the server + </emphasis> icon in <property>Servers</property> or right click the server name and press <emphasis> - <property>Stop</property>. </emphasis></para> + <property>Stop</property>. </emphasis> + </para> - <figure> - <title>Stopping Server</title> - <mediaobject> - <imageobject> - <imagedata fileref="images/manage/manage_6.png"/> - </imageobject> - </mediaobject> - </figure> - <para>When the server is stopped you will see <emphasis> + <figure> + <title>Stopping Server</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/manage/manage_6.png"/> + </imageobject> + </mediaobject> + </figure> + <para>When the server is stopped you will see <emphasis> <property>Stopped</property> - </emphasis> in the square brackets next to its name.</para> - </section> - <section id="ServerPreferences"> - <?dbhtml filename="ServerPreferences.html"?> - <title>Server Container Preferences</title> - <para>You can control how <property>JBoss Developer Studio</property> interacts with + </emphasis> in the square brackets next to its name.</para> + </section> + <section id="ServerPreferences"> + <?dbhtml filename="ServerPreferences.html"?> + <title>Server Container Preferences</title> + <para>You can control how <property>JBoss Developer Studio</property> interacts with server containers in the <property>Server editor</property>. Double-click the server to open it in the editor.</para> - <figure> - <title>Server Overview</title> - <mediaobject> - <imageobject> - <imagedata fileref="images/manage/manage_8.png"/> - </imageobject> - </mediaobject> - </figure> + <figure> + <title>Server Overview</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/manage/manage_8.png"/> + </imageobject> + </mediaobject> + </figure> - <para>Here you can specify some common settings: host name, server name, runtime as well + <para>Here you can specify some common settings: host name, server name, runtime as well as settings related to the publishing, timeouts and server ports.</para> - </section> - </section> + </section> + </section> - <section id="JBossInstances"> - <?dbhtml filename="JBossInstances.html"?> - <title>How to Use Your Own JBoss AS Instance with JBDS</title> - <para>Although <property>JBoss Developer Studio</property> works closely with + <section id="JBossInstances"> + <?dbhtml filename="JBossInstances.html"?> + <title>How to Use Your Own JBoss AS Instance with JBDS</title> + <para>Although <property>JBoss Developer Studio</property> works closely with <property>JBoss EAP 5</property> we do not ultimately tie you to any particular server for deployment. There are some servers that Studio supports directly (via the bundled Eclipse WTP plug-ins). In this section we discuss how to manage self-installed JBoss AS. Suppose you want to deploy the application to <property>JBoss 4.2.3 server</property>. First of all you need to install it.</para> - <section id="JBossInstalling"> - <?dbhtml filename="JBossInstalling.html"?> - <title>JBoss AS Installation</title> - <itemizedlist> - <listitem> - <para>Download the binary package of JBoss AS, e.g. <property>JBoss 4.2.3</property> and save - it on your computer: <ulink url="http://labs.jboss.com/jbossas/downloads" - >http://labs.jboss.com/jbossas/downloads</ulink></para> - </listitem> - </itemizedlist> - <para>It does not matter where on your system you install JBoss server.</para> + <section id="JBossInstalling"> + <?dbhtml filename="JBossInstalling.html"?> + <title>JBoss AS Installation</title> + <itemizedlist> + <listitem> + <para>Download the binary package of JBoss AS, e.g. <property>JBoss 4.2.3</property> and save + it on your computer: <ulink url="http://labs.jboss.com/jbossas/downloads">http://labs.jboss.com/jbossas/downloads</ulink> + </para> + </listitem> + </itemizedlist> + <para>It does not matter where on your system you install JBoss server.</para> - <note> - <title>Note:</title> - <para>The installation of JBoss server into a directory that has a name containing + <note> + <title>Note:</title> + <para>The installation of JBoss server into a directory that has a name containing spaces provokes problems in some situations with Sun-based VMs. Try to avoid using installation folders that have spaces in their names.</para> - </note> + </note> - <para>There is no requirement for root access to run JBoss Server on UNIX/Linux systems + <para>There is no requirement for root access to run JBoss Server on UNIX/Linux systems because none of the default ports are within the 0-1023 privileged port range.</para> - <itemizedlist> - <listitem> - <para>After you have the binary archive you want to install, use the JDK jar + <itemizedlist> + <listitem> + <para>After you have the binary archive you want to install, use the JDK jar tool (or any other ZIP extraction tool) to extract the jboss-4.2.3.GA.zip archive contents into a location of your choice. The jboss-4.2.3.GA.tgz archive is a gzipped tar file that requires a gnutar compatible tar which can handle the long pathnames in the archive. The extraction process will create a jboss-4.2.3.GA directory. </para> - </listitem> - </itemizedlist> - </section> + </listitem> + </itemizedlist> + </section> - <section id="AddingJBossServer"> - <?dbhtml filename="AddingJBossServer.html"?> - <title>Adding and Configuring JBoss Server</title> - <para>Now we should add just installed server into server manager in <property>JBoss + <section id="AddingJBossServer"> + <?dbhtml filename="AddingJBossServer.html"?> + <title>Adding and Configuring JBoss Server</title> + <para>Now we should add just installed server into server manager in <property>JBoss Developer Studio</property>.</para> - <itemizedlist> - <listitem> - <para>Open the <property>Servers</property> by selecting <emphasis> - <property>Window > Show View > Other > Server - > Servers</property> - </emphasis></para> - </listitem> - <listitem> - <para>Right click anywhere in this view and select <emphasis> - <property>New Server</property> - </emphasis></para> - </listitem> - <listitem> - <para>Select <emphasis> + <itemizedlist> + <listitem> + <para>Select <property>Servers</property> by selecting <menuchoice><guimenuitem>Window</guimenuitem><guimenuitem>Show View</guimenuitem><guimenuitem>Other</guimenuitem><guimenuitem>Server</guimenuitem><guimenuitem>Servers</guimenuitem></menuchoice>. + </emphasis> + </para> + </listitem> + <listitem> + <para>Right click anywhere in this view and select <menuchoice><guimenuitem>New</guimenuitem><guimenuitem>Server</guimenuitem></menuchoice>. + </emphasis> + </para> + </listitem> + <listitem> + <para>Select <emphasis> <property>JBoss Community > JBoss 4.2 Server</property> - </emphasis></para> - </listitem> - </itemizedlist> - <figure> - <title>Selecting Server Name and Server Type</title> - <mediaobject> - <imageobject> - <imagedata fileref="images/manage/manage_9.png"/> - </imageobject> - </mediaobject> - </figure> + </emphasis> + </para> + </listitem> + </itemizedlist> + <figure> + <title>Selecting Server Name and Server Type</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/manage/manage_9.png"/> + </imageobject> + </mediaobject> + </figure> - <note> - <title>Note:</title> + <note> + <title>Note:</title> - <para>Now in the <property>New Server wizard</property> there is a separation + <para>Now in the <property>New Server wizard</property> there is a separation between the .org servers (the <emphasis> <property>JBoss Community</property> - </emphasis> category) and product server that comes bundled with JBoss EAP (the + </emphasis> category) and product server that comes bundled with JBoss EAP (the <emphasis> - <property>JBoss Enterprise Middleware</property></emphasis> category).</para> - </note> + <property>JBoss Enterprise Middleware</property> + </emphasis> category).</para> + </note> - <itemizedlist> - <listitem> - <para>To create a new runtime, which Jboss AS 4.2 matches to, click <emphasis> + <itemizedlist> + <listitem> + <para>To create a new runtime, which Jboss AS 4.2 matches to, click <emphasis> <property>Next</property> - </emphasis></para> - </listitem> - </itemizedlist> + </emphasis> + </para> + </listitem> + </itemizedlist> - <itemizedlist> - <listitem> - <para>In the next step make <property>JBoss Developer Studio</property> to know + <itemizedlist> + <listitem> + <para>In the next step make <property>JBoss Developer Studio</property> to know where you have installed the Server and define JRE.</para> - </listitem> - </itemizedlist> - <figure> - <title>Defining JBoss Runtime</title> - <mediaobject> - <imageobject> - <imagedata fileref="images/manage/manage_11.png"/> - </imageobject> - </mediaobject> - </figure> - <note> - <title>Note:</title> - <para>When adding a new server you will need to specify what JRE to use. It is + </listitem> + </itemizedlist> + <figure> + <title>Defining JBoss Runtime</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/manage/manage_11.png"/> + </imageobject> + </mediaobject> + </figure> + <note> + <title>Note:</title> + <para>When adding a new server you will need to specify what JRE to use. It is important to set this value to a full JDK, not JRE. Again, you need a full JDK to run Web applications, JRE will not be enough.</para> - </note> + </note> - <itemizedlist> - <listitem> - <para>In the next dialog verify the specified information and if something is + <itemizedlist> + <listitem> + <para>In the next dialog verify the specified information and if something is unfair go back and correct it</para> - </listitem> - </itemizedlist> - <figure> - <title>JBoss Runtime Summary</title> - <mediaobject> - <imageobject> - <imagedata fileref="images/manage/manage_15.png"/> - </imageobject> - </mediaobject> - </figure> - <itemizedlist> - <listitem> - <para>In the last wizard's dialog modify the projects that are + </listitem> + </itemizedlist> + <figure> + <title>JBoss Runtime Summary</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/manage/manage_15.png"/> + </imageobject> + </mediaobject> + </figure> + <itemizedlist> + <listitem> + <para>In the last wizard's dialog modify the projects that are configured on the server and click <emphasis> <property>Finish</property> - </emphasis>.</para> - </listitem> - </itemizedlist> - <figure> - <title>Configuring Projects</title> - <mediaobject> - <imageobject> - <imagedata fileref="images/manage/manage_16.png"/> - </imageobject> - </mediaobject> - </figure> - <para>A new <property>JBoss Server</property> should now appear in the <property>Servers</property> view.</para> - <figure> - <title>New JBoss Server</title> - <mediaobject> - <imageobject> - <imagedata fileref="images/manage/manage_17.png"/> - </imageobject> - </mediaobject> - </figure> - <para>Now, we are ready to create the first web application.</para> - </section> + </emphasis>.</para> + </listitem> + </itemizedlist> + <figure> + <title>Configuring Projects</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/manage/manage_16.png"/> + </imageobject> + </mediaobject> + </figure> + <para>A new <property>JBoss Server</property> should now appear in the <property>Servers</property> view.</para> + <figure> + <title>New JBoss Server</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/manage/manage_17.png"/> + </imageobject> + </mediaobject> + </figure> + <para>Now, we are ready to create the first web application.</para> + </section> - </section> + </section> </chapter>

15 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r28204 - trunk/build/hudson-jobs.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-01-13 16:54:50 -0500 (Thu, 13 Jan 2011) New Revision: 28204 Modified: trunk/build/hudson-jobs/config.xml Log: add downstream job node to config.xml Modified: trunk/build/hudson-jobs/config.xml =================================================================== --- trunk/build/hudson-jobs/config.xml 2011-01-13 21:41:58 UTC (rev 28203) +++ trunk/build/hudson-jobs/config.xml 2011-01-13 21:54:50 UTC (rev 28204) @@ -1,11 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project> +<?xml version="1.0" encoding="UTF-8"?><project> <actions/> <description>Nightly build using Tycho, monitoring SVN every 6 hrs for changes. -<h2><a style="color:#FF9933" href="http://download.jboss.org/jbosstools/builds/cascade/trunk.html">Build Job Cascade & Results</a></h2> - -</description> +<h2><a style="color:#FF9933" href="http://download.jboss.org/jbosstools/builds/cascade/trunk.html">Build Job Cascade &amp; Results</a></h2></description> <logRotator> <daysToKeep>5</daysToKeep> @@ -52,8 +49,8 @@ </hudson.model.StringParameterDefinition> </parameterDefinitions> </hudson.model.ParametersDefinitionProperty> + <hudson.plugins.descriptionsetter.JobByDescription/> <hudson.plugins.disk__usage.DiskUsageProperty/> - <hudson.plugins.descriptionsetter.JobByDescription/> <hudson.plugins.jira.JiraProjectProperty> <siteName>http://opensource.atlassian.com/projects/hibernate/</siteName> </hudson.plugins.jira.JiraProjectProperty> @@ -62,12 +59,12 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM_-ModuleLocation> - <remote>http://svn.jboss.org/repos/jbosstools/trunk/TESTING</remote> + <remote>http://anonsvn.jboss.org/repos/jbosstools/trunk/TESTING</remote> <local>sources</local> </hudson.scm.SubversionSCM_-ModuleLocation> <hudson.scm.SubversionSCM_-ModuleLocation> - <remote>http://svn.jboss.org/repos/jbosstools/trunk/build</remote> + <remote>http://anonsvn.jboss.org/repos/jbosstools/trunk/build</remote> </hudson.scm.SubversionSCM_-ModuleLocation> </locations> <useUpdate>true</useUpdate> @@ -91,56 +88,79 @@ <jdk>java16_default</jdk> <triggers class="vector"> <hudson.triggers.SCMTrigger> - <spec>20 3,9,15,21 * * * </spec> + <spec>12 2,8,14,20 * * * </spec> </hudson.triggers.SCMTrigger> </triggers> <concurrentBuild>false</concurrentBuild> <builders> <hudson.tasks.Maven> + <targets>${MAVEN_FLAGS}</targets> + <mavenName>maven-3.0</mavenName> + + <jvmOptions>-Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m</jvmOptions> + <pom>${WORKSPACE}/build/parent/pom.xml</pom> + <usePrivateRepository>false</usePrivateRepository> + </hudson.tasks.Maven> + <hudson.tasks.Maven> <targets>${MAVEN_FLAGS} -DJOB_NAME=${JOB_NAME} -DBUILD_ID=${BUILD_ID} -DBUILD_NUMBER=${BUILD_NUMBER}</targets> <mavenName>maven-3.0</mavenName> <jvmOptions>-Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m</jvmOptions> <usePrivateRepository>true</usePrivateRepository> </hudson.tasks.Maven> + <hudson.tasks.Ant> + <targets>collect.test.results.for.hudson</targets> + <antName>ant-1.7.x</antName> + <buildFile>${WORKSPACE}/build/build.xml</buildFile> + + </hudson.tasks.Ant> <hudson.tasks.Shell> <command># script here: http://anonsvn.jboss.org/repos/jbosstools/trunk/build/publish.sh . ${WORKSPACE}/build/publish.sh</command> </hudson.tasks.Shell> </builders> - <publishers> <hudson.tasks.ArtifactArchiver> <artifacts>**/*Update*.zip</artifacts> + <excludes>**/target/**</excludes> <latestOnly>true</latestOnly> <zip>false</zip> </hudson.tasks.ArtifactArchiver> - <hudson.tasks.junit.JUnitResultArchiver> <testResults>**/TEST-*.xml</testResults> <keepLongStdio>false</keepLongStdio> + <testDataPublishers/> </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.BuildTrigger> + <childProjects>jbosstools-3.2_trunk.aggregate</childProjects> + <threshold> + <name>UNSTABLE</name> + <ordinal>1</ordinal> + + <color>YELLOW</color> + </threshold> + </hudson.tasks.BuildTrigger> <hudson.tasks.Mailer> <recipients/> <notifyEveryBuild>false</notifyEveryBuild> + <dontNotifyOnModules>false</dontNotifyOnModules> - <dontNotifyOnModules>false</dontNotifyOnModules> <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>true</sendToIndividuals> </hudson.tasks.Mailer> + <hudson.plugins.emotional__hudson.EmotionalHudsonPublisher/> </publishers> <buildWrappers> - <hudson.plugins.build__timeout.BuildTimeoutWrapper> <timeoutMinutes>120</timeoutMinutes> + <failBuild>false</failBuild> </hudson.plugins.build__timeout.BuildTimeoutWrapper> <hudson.plugins.xvnc.Xvnc> <takeScreenshot>false</takeScreenshot> </hudson.plugins.xvnc.Xvnc> - </buildWrappers> -</project> \ No newline at end of file +</project>

15 years, 2 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits January 2011