[jbosstools-commits] JBoss Tools SVN: r39186 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core and 6 other directories.

Author: rob.stryker(a)jboss.com Date: 2012-02-28 23:14:20 -0500 (Tue, 28 Feb 2012) New Revision: 39186 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS7ExtendedProperties.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossExtendedProperties.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetActionProvider.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetDialog.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/ConfigNameResolver.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.java Log: JBIDE-11059 - cosmetic change to trunk for default fileset location. Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetActionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetActionProvider.java 2012-02-29 01:25:55 UTC (rev 39185) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetActionProvider.java 2012-02-29 04:14:20 UTC (rev 39186) @@ -17,7 +17,6 @@ import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; @@ -51,9 +50,8 @@ import org.jboss.ide.eclipse.archives.webtools.filesets.FilesetContentProvider.PathWrapper; import org.jboss.ide.eclipse.archives.webtools.filesets.FilesetContentProvider.ServerWrapper; 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.extendedproperties.JBossExtendedProperties; import org.jboss.ide.eclipse.as.core.util.FileUtil; -import org.jboss.ide.eclipse.as.core.util.IConstants; import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; public class FilesetActionProvider extends CommonActionProvider implements IDoubleClickListener { @@ -196,23 +194,11 @@ IDeployableServer server = (IDeployableServer) iserver .loadAdapter(IDeployableServer.class, new NullProgressMonitor()); - String location = null; - if (server != null && server.getServer().getRuntime() != null ) { - IJBossServerRuntime runtime = (IJBossServerRuntime) - server.getServer().getRuntime().loadAdapter(IJBossServerRuntime.class, null); - if( runtime != null ) { - location = IConstants.SERVER + IPath.SEPARATOR + runtime.getJBossConfiguration(); - } - } - if( location == null && iserver.getRuntime() != null) - location = iserver.getRuntime().getLocation().toOSString(); - else if( location == null && iserver.getRuntime() == null ) { - // use workspace location as default if no runtime - location = ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString(); - } + JBossExtendedProperties o = (JBossExtendedProperties)iserver.loadAdapter(JBossExtendedProperties.class, new NullProgressMonitor()); + String defaultFolder = o == null ? "" : o.getNewFilesetDefaultRootFolder(); //$NON-NLS-1$ - if (location != null) { - FilesetDialog d = new FilesetDialog(new Shell(), location, iserver); + if (defaultFolder != null) { + FilesetDialog d = new FilesetDialog(new Shell(), defaultFolder, iserver); if (d.open() == Window.OK) { Fileset fs = d.getFileset(); wrapper.addFileset(fs); Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetDialog.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetDialog.java 2012-02-29 01:25:55 UTC (rev 39185) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetDialog.java 2012-02-29 04:14:20 UTC (rev 39186) @@ -49,7 +49,6 @@ this.fileset = new Fileset(); this.fileset.setFolder(defaultLocation); this.fileset.setServer(server); - this.fileset.setFolder("server/${jboss_config}/"); //$NON-NLS-1$ this.fileset.setIncludesPattern("**/*.xml"); //$NON-NLS-1$ this.server = server; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2012-02-29 01:25:55 UTC (rev 39185) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2012-02-29 04:14:20 UTC (rev 39186) @@ -38,6 +38,7 @@ org.jboss.ide.eclipse.as.core.server, org.jboss.ide.eclipse.as.core.server.bean, org.jboss.ide.eclipse.as.core.server.internal, + org.jboss.ide.eclipse.as.core.server.internal.extendedproperties, org.jboss.ide.eclipse.as.core.server.internal.launch, org.jboss.ide.eclipse.as.core.server.internal.launch.configuration, org.jboss.ide.eclipse.as.core.server.internal.v7, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/ConfigNameResolver.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/ConfigNameResolver.java 2012-02-29 01:25:55 UTC (rev 39185) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/ConfigNameResolver.java 2012-02-29 04:14:20 UTC (rev 39186) @@ -78,11 +78,11 @@ return null; } - private String getVariablePattern(String var) { + public static String getVariablePattern(String var) { return "${" + var + "}"; //$NON-NLS-1$ //$NON-NLS-2$ } - private String getVariablePattern(String var, String serverOrRuntimeName) { + public static String getVariablePattern(String var, String serverOrRuntimeName) { return "${" + var + ":" + serverOrRuntimeName + "}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java 2012-02-29 04:14:20 UTC (rev 39186) @@ -0,0 +1,59 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.core.server.internal; + +import org.eclipse.core.runtime.IAdapterFactory; +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossAS7ExtendedProperties; +import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossExtendedProperties; +import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; + +public class ExtendedServerPropertiesAdapterFactory implements IAdapterFactory { + + @Override + public Object getAdapter(Object adaptableObject, Class adapterType) { + if( adaptableObject instanceof IServer ) { + String typeId = ((IServer)adaptableObject).getServerType().getId(); + if( IJBossToolingConstants.SERVER_AS_32.equals(typeId)) + return new JBossExtendedProperties((IServer)adaptableObject); + if( IJBossToolingConstants.SERVER_AS_40.equals(typeId)) + return new JBossExtendedProperties((IServer)adaptableObject); + if( IJBossToolingConstants.SERVER_AS_42.equals(typeId)) + return new JBossExtendedProperties((IServer)adaptableObject); + if( IJBossToolingConstants.SERVER_AS_50.equals(typeId)) + return new JBossExtendedProperties((IServer)adaptableObject); + if( IJBossToolingConstants.SERVER_AS_51.equals(typeId)) + return new JBossExtendedProperties((IServer)adaptableObject); + if( IJBossToolingConstants.SERVER_AS_60.equals(typeId)) + return new JBossExtendedProperties((IServer)adaptableObject); + if( IJBossToolingConstants.SERVER_EAP_43.equals(typeId)) + return new JBossExtendedProperties((IServer)adaptableObject); + if( IJBossToolingConstants.SERVER_EAP_50.equals(typeId)) + return new JBossExtendedProperties((IServer)adaptableObject); + + if( IJBossToolingConstants.SERVER_AS_70.equals(typeId)) + return new JBossAS7ExtendedProperties((IServer)adaptableObject); + if( IJBossToolingConstants.SERVER_AS_71.equals(typeId)) + return new JBossAS7ExtendedProperties((IServer)adaptableObject); + if( IJBossToolingConstants.SERVER_EAP_60.equals(typeId)) + return new JBossAS7ExtendedProperties((IServer)adaptableObject); + + // NEW_SERVER_ADAPTER + } + return null; + } + + @Override + public Class[] getAdapterList() { + return new Class[]{ JBossExtendedProperties.class}; + } + +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2012-02-29 01:25:55 UTC (rev 39185) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2012-02-29 04:14:20 UTC (rev 39186) @@ -50,6 +50,7 @@ import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod; 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.extendedproperties.JBossExtendedProperties; import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader; import org.jboss.ide.eclipse.as.core.util.ExpressionResolverUtil; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; @@ -103,6 +104,9 @@ } public String getDeployFolder(String type) { + if( type.equals(DEPLOY_SERVER)) { + return getExtendedProperties().getServerDeployLocation(); + } return getDeployFolder(this, type); } @@ -111,35 +115,41 @@ * deeply introspect the value for specific deployment location * constants. * + * Only Custom and Metadata are supported for this method + * Server paths will not be returned here (server/default/deploy etc) + * * @param jbs * @param type * @return */ public static String getDeployFolder(JBossServer jbs, String type) { - IServer server = jbs.getServer(); - IJBossServerRuntime jbsrt = RuntimeUtils.getJBossServerRuntime(server); + String ret = null; if( type.equals(DEPLOY_CUSTOM)) { - String val = jbs.getAttribute(DEPLOY_DIRECTORY, (String)null); - if( val != null ) { - IPath val2 = new Path(val); - return ServerUtil.makeGlobal(jbsrt.getRuntime(), val2).toString(); - } - // if no value is set, default to metadata - type = DEPLOY_METADATA; + ret = getCustomDeployLocationFromSettings(jbs.getServer(), DEPLOY_DIRECTORY); } - if( type.equals(DEPLOY_METADATA)) { - return JBossServerCorePlugin.getServerStateLocation(server). - append(DEPLOY).makeAbsolute().toString(); - } else if( type.equals(DEPLOY_SERVER)) { - String loc = jbsrt.getConfigLocation(); - String config = jbsrt.getJBossConfiguration(); - IPath p = new Path(loc).append(config) - .append(DEPLOY); - return ServerUtil.makeGlobal(jbsrt.getRuntime(), p).toString(); + if( ret == null || type.equals(DEPLOY_METADATA)) { + return getMetadataDeployLocation(jbs.getServer()); + } + return null; + } + + public static String getCustomDeployLocationFromSettings(IServer server, String attribute) { + String val = server.getAttribute(attribute, (String)null); + if( val != null ) { + IPath val2 = new Path(val); + return ServerUtil.makeGlobal(server.getRuntime(), val2).toString(); } return null; } + public static String getMetadataDeployLocation(IServer server) { + return JBossServerCorePlugin.getServerStateLocation(server).append(DEPLOY).makeAbsolute().toString(); + } + + public JBossExtendedProperties getExtendedProperties() { + return (JBossExtendedProperties)getServer().loadAdapter(JBossExtendedProperties.class, null); + } + public String getTempDeployFolder() { return getTempDeployFolder(this, getDeployLocationType()); } Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS7ExtendedProperties.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS7ExtendedProperties.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS7ExtendedProperties.java 2012-02-29 04:14:20 UTC (rev 39186) @@ -0,0 +1,16 @@ +package org.jboss.ide.eclipse.as.core.server.internal.extendedproperties; + +import org.eclipse.wst.server.core.IServer; + +/** + * + */ +public class JBossAS7ExtendedProperties extends JBossExtendedProperties { + public JBossAS7ExtendedProperties(IServer server) { + super(server); + } + + public String getNewFilesetDefaultRootFolder() { + return "standalone/configuration"; //$NON-NLS-1$ + } +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossExtendedProperties.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossExtendedProperties.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossExtendedProperties.java 2012-02-29 04:14:20 UTC (rev 39186) @@ -0,0 +1,31 @@ +package org.jboss.ide.eclipse.as.core.server.internal.extendedproperties; + +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.resolvers.ConfigNameResolver; +import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants; + +/** + * The superclass containing most functionality, to be overridden as necessary. + * The contents of this are all sorts of errata that do not really fit anywhere + * else, but need to be customized on a per-server or per-server-type basis + * + */ +public class JBossExtendedProperties { + private IServer server; + public JBossExtendedProperties(IServer server) { + this.server = server; + } + public String getNewFilesetDefaultRootFolder() { + return "servers/${jboss_config}"; //$NON-NLS-1$ + } + + /** + * Returns the full path of a local server's server/{config}/deploy folder + */ + public String getServerDeployLocation() { + String original = ConfigNameResolver.getVariablePattern(ConfigNameResolver.JBOSS_CONFIG_DIR) + + "/" + IJBossRuntimeResourceConstants.DEPLOY; //$NON-NLS-1$ + return new ConfigNameResolver().performSubstitutions( + original, server.getName()); + } +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2012-02-29 01:25:55 UTC (rev 39185) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2012-02-29 04:14:20 UTC (rev 39186) @@ -80,9 +80,13 @@ } public static IPath makeGlobal(IRuntime rt, IPath p) { + return rt == null ? p : makeGlobal(rt.getLocation(), p); + } + + public static IPath makeGlobal(IPath rtLocation, IPath p) { if( !p.isAbsolute() ) { - if( rt != null && rt.getLocation() != null ) { - return rt.getLocation().append(p).makeAbsolute(); + if( rtLocation != null && rtLocation != null ) { + return rtLocation.append(p).makeAbsolute(); } return p.makeAbsolute(); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2012-02-29 01:25:55 UTC (rev 39185) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2012-02-29 04:14:20 UTC (rev 39186) @@ -1194,9 +1194,9 @@ point="org.eclipse.core.runtime.adapters"> <factory adaptableType="org.eclipse.wst.server.core.IServer" - class="org.jboss.ide.eclipse.as.core.server.internal.ExtendedPropertiesServerAdapterFactory"> + class="org.jboss.ide.eclipse.as.core.server.internal.ExtendedServerPropertiesAdapterFactory"> <adapter - type="org.jboss.ide.eclipse.as.core.Adapter1"> + type="org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossExtendedProperties"> </adapter> </factory> </extension> Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.java 2012-02-29 01:25:55 UTC (rev 39185) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.java 2012-02-29 04:14:20 UTC (rev 39186) @@ -79,7 +79,7 @@ JBossServer ds = ServerConverter.getJBossServer(server); ArrayList<String> folders = new ArrayList<String>(); // add the server folder deploy loc. first - String insideServer = JBossServer.getDeployFolder(ds, JBossServer.DEPLOY_SERVER); + String insideServer = ds.getDeployFolder(JBossServer.DEPLOY_SERVER); String metadata = JBossServer.getDeployFolder(ds, JBossServer.DEPLOY_METADATA); String custom = JBossServer.getDeployFolder(ds, JBossServer.DEPLOY_CUSTOM); String type = ds.getDeployLocationType();