Author: rob.stryker(a)jboss.com Date: 2010-01-05 19:23:22 -0500 (Tue, 05 Jan 2010) New Revision: 19656 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/plugin.properties trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java Log: JBIDE-5505 - cleanup for deploy only server Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2010-01-05 23:15:33 UTC (rev 19655) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2010-01-06 00:23:22 UTC (rev 19656) @@ -1,6 +1,7 @@ pluginName=JBoss WTP Server Tools Core Plugin providerName=JBoss Community enterpriseProviderName=JBoss Enterprise Middleware +basicProviderName=Basic # Version Delegates jboss.version.32.name=JBoss AS 3.2 @@ -31,8 +32,11 @@ jboss.eap.version.50.description=JBoss Enterprise Application Platform (EAP) 5.0 jboss.eap.version.50.runtime.name=JBoss Enterprise Application Platform 5.0 Runtime -deploy.runtime.name=JBoss Deploy-Only Runtime +deploy.runtime.name=Local Deployer Runtime deploy.runtime.description=A runtime provided to allow a deploy-only server the ability to deploy certain project types. +deploy.server.name=Local Deployer +deploy.server.description=A server which only provides a deploy folder for publishing. + Bundle-Vendor.0 = JBoss by Red Hat Bundle-Name.0 = JBoss AS Core Plug-in \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2010-01-05 23:15:33 UTC (rev 19655) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2010-01-06 00:23:22 UTC (rev 19656) @@ -132,10 +132,10 @@ <serverType behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior" class="org.jboss.ide.eclipse.as.core.server.internal.DeployableServer" - description="A server which only provides a deploy folder for publishing." + description="%deploy.server.description" hasConfiguration="false" id="org.jboss.ide.eclipse.as.systemCopyServer" - name="JBoss Deploy-Only Server" + name="%deploy.server.name" runtime="false" runtimeTypeId="org.jboss.ide.eclipse.as.runtime.stripped" supportsRemoteHosts="true"/> @@ -388,7 +388,7 @@ description="%deploy.runtime.description" id="org.jboss.ide.eclipse.as.runtime.stripped" name="%deploy.runtime.name" - vendor="%providerName" + vendor="%basicProviderName" version="1.0"> <moduleType types="jst.web" Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/plugin.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/plugin.properties 2010-01-05 23:15:33 UTC (rev 19655) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/plugin.properties 2010-01-06 00:23:22 UTC (rev 19656) @@ -1,2 +1,8 @@ +ssh.server.description=A server which simply scp&apos;s files to a destination host and location +ssh.server.name=SCP Remote Deployer +ssh.runtime.description=A runtime to allow SCP servers to support every module type. +ssh.runtime.name=SCP Remote Deployer Runtime + +basic.vendor=Basic Bundle-Vendor.0=JBoss by Red Hat -Bundle-Name.0=JBoss SSH Server Plugin \ No newline at end of file +Bundle-Name.0=JBoss SCP Server Plugin \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/plugin.xml 2010-01-05 23:15:33 UTC (rev 19655) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/plugin.xml 2010-01-06 00:23:22 UTC (rev 19656) @@ -6,9 +6,9 @@ <serverType behaviourClass="org.jboss.ide.eclipse.as.ssh.server.SSHServerBehaviourDelegate" class="org.jboss.ide.eclipse.as.ssh.server.SSHServerDelegate" - description="A server which simply scp&apos;s files to a destination host and location" + description="%ssh.server.description" id="org.jboss.ide.eclipse.as.ssh.server.remoteServerType" - name="SCP Remote Server" + name="%ssh.server.name" runtime="false" runtimeTypeId="org.jboss.ide.eclipse.as.ssh.server.remoteServerRuntimeType" supportsRemoteHosts="true"> @@ -24,10 +24,10 @@ <extension point="org.eclipse.wst.server.core.runtimeTypes"> <runtimeType - vendor="JBoss Community" + vendor="%basic.vendor" class="org.jboss.ide.eclipse.as.ssh.server.SSHServerRuntime" - description="A runtime to allow SSH servers to support every module type. " - name="SSH Runtime" + description="%ssh.runtime.description" + name="%ssh.runtime.name" id="org.jboss.ide.eclipse.as.ssh.server.remoteServerRuntimeType" version="1.0"> <moduleType Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2010-01-05 23:15:33 UTC (rev 19655) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2010-01-06 00:23:22 UTC (rev 19656) @@ -45,7 +45,7 @@ swf_DeployDirectory=Deploy Directory swf_TempDeployDirectory=Temporary Deploy Directory swf_CloneConfiguration=Copy this configuration into workspace metadata -sswf_Title=Create a new System Copy Server +sswf_Title=Create a new Local Deployer Server sswf_BaseName=Local Deployer credentials_warning=Your server is responding to JMX inquiries with a Security Exception.\nYou can try entering new credentials below, or you can double-click\non your server and verify that the host, JNDI port, username, and password are accurate.\nYou can also click "ignore" below to begin working with your server,\nbut deploying to and stopping the server may not function properly. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java 2010-01-05 23:15:33 UTC (rev 19655) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java 2010-01-06 00:23:22 UTC (rev 19656) @@ -49,6 +49,8 @@ import org.eclipse.wst.server.core.internal.ServerWorkingCopy; import org.eclipse.wst.server.ui.wizard.IWizardHandle; import org.eclipse.wst.server.ui.wizard.WizardFragment; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer; import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; @@ -63,10 +65,10 @@ private IWizardHandle handle; - private Label deployLabel, tempDeployLabel, nameLabel; - private Text deployText, tempDeployText, nameText; - private Button browse, tempBrowse; - private String name, deployLoc, tempDeployLoc; + private Label deployLabel, nameLabel; + private Text deployText, nameText; + private Button browse; + private String name, deployLoc; public StrippedServerWizardFragment() { } @@ -85,13 +87,7 @@ browse = new Button(main, SWT.PUSH); deployLabel.setText(Messages.swf_DeployDirectory); browse.setText(Messages.browse); - - tempDeployLabel = new Label(main, SWT.NONE); - tempDeployText = new Text(main, SWT.BORDER); - tempBrowse = new Button(main, SWT.PUSH); - tempDeployLabel.setText(Messages.swf_TempDeployDirectory); - tempBrowse.setText(Messages.browse); - + FormData namelData = new FormData(); namelData.top = new FormAttachment(0,5); namelData.left = new FormAttachment(0,5); @@ -118,25 +114,7 @@ bData.right = new FormAttachment(100,-5); bData.top = new FormAttachment(nameText,5); browse.setLayoutData(bData); - - FormData templData = new FormData(); - templData.top = new FormAttachment(deployText,5); - templData.left = new FormAttachment(0,5); - tempDeployLabel.setLayoutData(templData); - - FormData temptData = new FormData(); - temptData.top = new FormAttachment(deployText,5); - temptData.left = new FormAttachment(tempDeployLabel,5); - temptData.right = new FormAttachment(tempBrowse, -5); - tempDeployText.setLayoutData(temptData); - - FormData tempbData = new FormData(); - tempbData.right = new FormAttachment(100,-5); - tempbData.top = new FormAttachment(deployText,5); - tempBrowse.setLayoutData(tempbData); - - ModifyListener ml = new ModifyListener() { public void modifyText(ModifyEvent e) { textChanged(); @@ -155,21 +133,8 @@ } }); - tempBrowse.addSelectionListener(new SelectionListener() { - public void widgetDefaultSelected(SelectionEvent e) { - } - public void widgetSelected(SelectionEvent e) { - DirectoryDialog d = new DirectoryDialog(new Shell()); - d.setFilterPath(tempDeployText.getText()); - String x = d.open(); - if( x != null ) - tempDeployText.setText(x); - } - }); - deployText.addModifyListener(ml); - tempDeployText.addModifyListener(ml); nameText.addModifyListener(ml); nameText.setText(getDefaultNameText()); handle.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.WIZBAN_JBOSS_LOGO)); @@ -180,7 +145,6 @@ IStatus status = checkErrors(); if( status.isOK() ) { deployLoc = deployText.getText(); - tempDeployLoc = tempDeployText.getText(); name = nameText.getText(); handle.setMessage("", IStatus.OK); //$NON-NLS-1$ handle.update(); @@ -197,15 +161,10 @@ if( !f.exists() || !f.isDirectory() ) { return new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK, Messages.StrippedServerWizardFragment_DeployFolderDoesNotExistStatusMessage, null); } - f = new File(tempDeployText.getText()); - if( !f.exists() || !f.isDirectory() ) { - return new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK, Messages.StrippedServerWizardFragment_TemporaryDeployFolderDoesNotExistStatusMessage, null); - } return new Status(IStatus.OK, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK, "", null); //$NON-NLS-1$ } public void enter() { - //handle.setTitle("Create a new System Copy Server"); handle.setTitle(Messages.sswf_Title); IServer s = (IServer) getTaskModel().getObject(TaskModel.TASK_SERVER); IServerWorkingCopy swc; @@ -234,7 +193,8 @@ swcInternal = (ServerWorkingCopy)swc; swcInternal.setName(name); swcInternal.setAttribute(DeployableServer.DEPLOY_DIRECTORY, deployLoc); - swcInternal.setAttribute(DeployableServer.TEMP_DEPLOY_DIRECTORY, tempDeployLoc); + String tempFolder = JBossServerCorePlugin.getServerStateLocation(s).append(IJBossServerConstants.TEMP_DEPLOY).makeAbsolute().toString(); + swcInternal.setAttribute(DeployableServer.TEMP_DEPLOY_DIRECTORY, tempFolder); getTaskModel().putObject(TaskModel.TASK_SERVER, swcInternal); } }