Author: rob.stryker(a)jboss.com Date: 2011-06-09 02:33:26 -0400 (Thu, 09 Jun 2011) New Revision: 31943 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java Log: JBIDE-9085 - as7 should now show custom options and not just non-editable fields. These classes really need to be freakin rewritten. God! Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2011-06-09 05:05:53 UTC (rev 31942) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2011-06-09 06:33:26 UTC (rev 31943) @@ -393,6 +393,8 @@ jbs == null ? "" : jbs.getDeployFolder()); //$NON-NLS-1$ String newTemp = getHelper().getAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, jbs == null ? "" : jbs.getTempDeployFolder()); //$NON-NLS-1$ + newDir = ServerUtil.makeRelative(page.getServer().getRuntime(), new Path(newDir)).toString(); + newTemp = ServerUtil.makeRelative(page.getServer().getRuntime(), new Path(newTemp)).toString(); deployText.removeModifyListener(deployListener); deployText.setText(newDir); deployText.addModifyListener(deployListener); @@ -546,12 +548,22 @@ IDeploymentPageCallback cb = callbackMappings.get(mode); loc = cb.getServerLocation(page.getServer()); config = cb.getServerConfigName(page.getServer()); - newDir = new Path(loc) - .append(config) - .append(IJBossRuntimeResourceConstants.DEPLOY).toString(); - newTemp = new Path(loc).append(config) - .append(IJBossToolingConstants.TMP) - .append(IJBossToolingConstants.JBOSSTOOLS_TMP).toString(); + if( ServerUtil.isJBoss7(page.getServer().getServerType())) { + // fast hack, UGH! + newDir = new Path(IJBossRuntimeResourceConstants.AS7_STANDALONE) + .append(IJBossRuntimeResourceConstants.AS7_DEPLOYMENTS) + .makeRelative().toString(); + newTemp = new Path(IJBossRuntimeResourceConstants.AS7_STANDALONE) + .append(IJBossRuntimeResourceConstants.FOLDER_TMP) + .makeRelative().toString(); + } else { + newDir = new Path(loc) + .append(config) + .append(IJBossRuntimeResourceConstants.DEPLOY).toString(); + newTemp = new Path(loc).append(config) + .append(IJBossToolingConstants.TMP) + .append(IJBossToolingConstants.JBOSSTOOLS_TMP).toString(); + } if( mode.equals(LocalPublishMethod.LOCAL_PUBLISH_METHOD)) new File(newTemp).mkdirs(); } @@ -580,14 +592,14 @@ } private String getDeployDir() { - if( page.getServer().getRuntime() == null || ServerUtil.isJBoss7(page.getServer().getOriginal())) + if( page.getServer().getRuntime() == null ) return "";//$NON-NLS-1$ return ModuleDeploymentPage.makeRelative(getServer().getDeployFolder(), page.getServer().getRuntime()); } private String getTempDeployDir() { - if( page.getServer().getRuntime() == null || ServerUtil.isJBoss7(page.getServer().getOriginal())) + if( page.getServer().getRuntime() == null) return "";//$NON-NLS-1$ return ModuleDeploymentPage.makeRelative(getServer().getTempDeployFolder(),