[jbosstools-commits] JBoss Tools SVN: r43145 - in trunk/as/plugins: org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets and 1 other directories.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2012-08-21 23:43:13 -0400 (Tue, 21 Aug 2012)
New Revision: 43145

Added:
   trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.60
   trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.70
   trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.71
   trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.60
Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.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/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java
Log:
JBIDE-12453 adding default filesets for newer app server versions

Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.60
===================================================================
(Binary files differ)


Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.60
___________________________________________________________________
Added: svn:mime-type
   + application/xml

Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.70
===================================================================
(Binary files differ)


Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.70
___________________________________________________________________
Added: svn:mime-type
   + application/xml

Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.71
===================================================================
(Binary files differ)


Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.71
___________________________________________________________________
Added: svn:mime-type
   + application/xml

Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.60
===================================================================
(Binary files differ)


Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.60
___________________________________________________________________
Added: svn:mime-type
   + application/xml

Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java	2012-08-22 03:06:52 UTC (rev 43144)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java	2012-08-22 03:43:13 UTC (rev 43145)
@@ -84,12 +84,23 @@
 	public String getExcludesPattern() {
 		return excludesPattern == null ? "" : excludesPattern; //$NON-NLS-1$
 	}
+	
+	public String getResolvedExclude() {
+		String pattern = excludesPattern == null ? "" : excludesPattern; //$NON-NLS-1$
+		String resolved = new ConfigNameResolver().performSubstitutions(pattern, runtime == null ? null : runtime.getName(), true);
+		return resolved;
+	}
 	/**
 	 * @return the includesPattern
 	 */
 	public String getIncludesPattern() {
 		return includesPattern == null ? "" : includesPattern; //$NON-NLS-1$
 	}
+	public String getResolvedIncludesPattern() {
+		String pattern = includesPattern == null ? "" : includesPattern; //$NON-NLS-1$
+		String resolved = new ConfigNameResolver().performSubstitutions(pattern, runtime == null ? null : runtime.getName(), true);
+		return resolved;
+	}
 
 	/**
 	 * @param excludesPattern the excludesPattern to set
@@ -155,8 +166,8 @@
 	
 	public IPath[] findPaths() {
 		String dir = getFolder();
-		String includes = getIncludesPattern();
-		String excludes = getExcludesPattern();
+		String includes = getResolvedIncludesPattern();
+		String excludes = getResolvedExclude();
 		return findPaths(dir, includes, excludes);
 	}
 	

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-08-22 03:06:52 UTC (rev 43144)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetDialog.java	2012-08-22 03:43:13 UTC (rev 43145)
@@ -228,8 +228,11 @@
 	}
 
 	private void updatePreview() {
-		if( preview != null ) 
-			preview.setInput(findPaths(fileset.getFolder(), includes, excludes));
+		if( preview != null ) { 
+			String resInc = fileset.getResolvedIncludesPattern();
+			String resExc = fileset.getResolvedExclude();
+			preview.setInput(findPaths(fileset.getFolder(), resInc, resExc));
+		}
 	}
 
 	public String getDir() {

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java	2012-08-22 03:06:52 UTC (rev 43144)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java	2012-08-22 03:43:13 UTC (rev 43145)
@@ -89,8 +89,11 @@
 	// Overrides of as6-and-below's notion of configuration
 	@Override
 	public String getConfigLocation() {
-		return new Path(getConfigurationFile()).removeLastSegments(1).toFile().getAbsolutePath();
+		 IPath config = getRuntime().getLocation().append(IJBossRuntimeResourceConstants.AS7_STANDALONE)
+			.append(IJBossRuntimeResourceConstants.CONFIGURATION);
+		 return config.toFile().getAbsolutePath();
 	}
+	
 	@Override
 	public String getJBossConfiguration() {
 		return ""; //$NON-NLS-1$