JBoss Tools SVN: r8934 - branches/jbosstools-2.1.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/sample.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-06-25 05:13:10 -0400 (Wed, 25 Jun 2008)
New Revision: 8934
Modified:
branches/jbosstools-2.1.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/sample/XActionWrapper.java
Log:
JBIDE-2436
Modified: branches/jbosstools-2.1.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/sample/XActionWrapper.java
===================================================================
--- branches/jbosstools-2.1.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/sample/XActionWrapper.java 2008-06-25 09:12:04 UTC (rev 8933)
+++ branches/jbosstools-2.1.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/sample/XActionWrapper.java 2008-06-25 09:13:10 UTC (rev 8934)
@@ -38,7 +38,7 @@
updateState();
}
- private void updateState() {
+ public void updateState() {
if ((this.xmo==null)||(path==null)) {
setEnabled(Boolean.FALSE.booleanValue());
} else {
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r8933 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/sample.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-06-25 05:12:04 -0400 (Wed, 25 Jun 2008)
New Revision: 8933
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/sample/XActionWrapper.java
Log:
JBIDE-2436
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/sample/XActionWrapper.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/sample/XActionWrapper.java 2008-06-25 06:33:57 UTC (rev 8932)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/sample/XActionWrapper.java 2008-06-25 09:12:04 UTC (rev 8933)
@@ -38,7 +38,7 @@
updateState();
}
- private void updateState() {
+ public void updateState() {
if ((this.xmo==null)||(path==null)) {
setEnabled(Boolean.FALSE.booleanValue());
} else {
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r8932 - trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-06-25 02:33:57 -0400 (Wed, 25 Jun 2008)
New Revision: 8932
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFImportTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-2441 - JSFImportTest Disabled for a while
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFImportTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFImportTest.java 2008-06-25 06:00:35 UTC (rev 8931)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFImportTest.java 2008-06-25 06:33:57 UTC (rev 8932)
@@ -28,7 +28,11 @@
init("org.jboss.tools.jsf.test", "/projects", "JSFKickStartOldFormat");
}
- public void testImportWithoutLinks() {
+ /**
+ * FIXME test is disabled because it hangs build for an eternity
+ * http://jira.jboss.org/jira/browse/JBIDE-2441
+ */
+ public void disapledTestImportWithoutLinks() {
if(projectLocation == null) return;
ImportWebDirProjectContext context = new ImportProjectWizardContext(XModelFactory.getDefaultInstance().getRoot());
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2008-06-25 06:00:35 UTC (rev 8931)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2008-06-25 06:33:57 UTC (rev 8932)
@@ -23,7 +23,8 @@
suite.addTestSuite(JSFModelTest.class);
suite.addTestSuite(ModelFormat_2_0_0_Test.class);
- suite.addTestSuite(JSFImportTest.class);
+ // FIXME http://jira.jboss.org/jira/browse/JBIDE-2441
+ // suite.addTestSuite(JSFImportTest.class);
suite.addTestSuite(JSFBeansTest.class);
suite.addTestSuite(JSFPromptingProviderTest.class);
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r8931 - branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-06-25 02:00:35 -0400 (Wed, 25 Jun 2008)
New Revision: 8931
Modified:
branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-2440
Modified: branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
===================================================================
--- branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2008-06-25 05:59:23 UTC (rev 8930)
+++ branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2008-06-25 06:00:35 UTC (rev 8931)
@@ -372,10 +372,12 @@
} else {
filterSet.addFilter("driverJar",""); //$NON-NLS-1$ //$NON-NLS-2$
}
- AntCopyUtils.FileSet excludeCvsSvn = new AntCopyUtils.FileSet(CVS_SVN).dir(seamGenResFolder);
+
+ File ejbTemplateDir = new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(),"ejb");
+ AntCopyUtils.FileSet excludeCvsSvn = new AntCopyUtils.FileSet(CVS_SVN).dir(ejbTemplateDir);
AntCopyUtils.copyFilesAndFolders(
- new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(),"ejb"), //$NON-NLS-1$
+ ejbTemplateDir, //$NON-NLS-1$
ejb, new AntCopyUtils.FileSetFileFilter(excludeCvsSvn),
new FilterSetCollection(filterSet), true);
Modified: branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
===================================================================
--- branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2008-06-25 05:59:23 UTC (rev 8930)
+++ branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2008-06-25 06:00:35 UTC (rev 8931)
@@ -428,10 +428,12 @@
} else {
filterSet.addFilter("driverJar", ""); //$NON-NLS-1$ //$NON-NLS-2$
}
- AntCopyUtils.FileSet excludeCvsSvn = new AntCopyUtils.FileSet(CVS_SVN).dir(seamGenResFolder);
+
+ File ejbTemplateDir = new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(),"ejb");
+ AntCopyUtils.FileSet excludeCvsSvn = new AntCopyUtils.FileSet(CVS_SVN).dir(ejbTemplateDir);
AntCopyUtils.copyFilesAndFolders(
- new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "ejb"), //$NON-NLS-1$
+ ejbTemplateDir, //$NON-NLS-1$
ejb, new AntCopyUtils.FileSetFileFilter(excludeCvsSvn),
new FilterSetCollection(filterSet), true);
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r8930 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-06-25 01:59:23 -0400 (Wed, 25 Jun 2008)
New Revision: 8930
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-2440
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2008-06-24 23:21:18 UTC (rev 8929)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2008-06-25 05:59:23 UTC (rev 8930)
@@ -376,10 +376,12 @@
} else {
filterSet.addFilter("driverJar",""); //$NON-NLS-1$ //$NON-NLS-2$
}
- AntCopyUtils.FileSet excludeCvsSvn = new AntCopyUtils.FileSet(CVS_SVN).dir(seamGenResFolder);
+
+ File ejbTemplateDir = new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(),"ejb");
+ AntCopyUtils.FileSet excludeCvsSvn = new AntCopyUtils.FileSet(CVS_SVN).dir(ejbTemplateDir);
AntCopyUtils.copyFilesAndFolders(
- new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(),"ejb"), //$NON-NLS-1$
+ ejbTemplateDir, //$NON-NLS-1$
ejb, new AntCopyUtils.FileSetFileFilter(excludeCvsSvn),
new FilterSetCollection(filterSet), true);
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2008-06-24 23:21:18 UTC (rev 8929)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2008-06-25 05:59:23 UTC (rev 8930)
@@ -458,10 +458,12 @@
} else {
filterSet.addFilter("driverJar", ""); //$NON-NLS-1$ //$NON-NLS-2$
}
- AntCopyUtils.FileSet excludeCvsSvn = new AntCopyUtils.FileSet(CVS_SVN).dir(seamGenResFolder);
+
+ File ejbTemplateDir = new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(),"ejb");
+ AntCopyUtils.FileSet excludeCvsSvn = new AntCopyUtils.FileSet(CVS_SVN).dir(ejbTemplateDir);
AntCopyUtils.copyFilesAndFolders(
- new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "ejb"), //$NON-NLS-1$
+ ejbTemplateDir, //$NON-NLS-1$
ejb, new AntCopyUtils.FileSetFileFilter(excludeCvsSvn),
new FilterSetCollection(filterSet), true);
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r8929 - in trunk: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules and 11 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-06-24 19:21:18 -0400 (Tue, 24 Jun 2008)
New Revision: 8929
Added:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/asf/
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/asf/DirectoryScanner.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchivesVFS.java
Removed:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IRuntimeVariables.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/archives/WarArchiveType.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceVariables.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntVariables.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/IsolatedTruezipExecution.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModelCore.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveImpl.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
Log:
JBIDE-2439
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/archives/WarArchiveType.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/archives/WarArchiveType.java 2008-06-24 20:46:22 UTC (rev 8928)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/archives/WarArchiveType.java 2008-06-24 23:21:18 UTC (rev 8929)
@@ -23,7 +23,6 @@
import java.util.ArrayList;
-import org.apache.tools.ant.DirectoryScanner;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -41,6 +40,7 @@
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.server.core.IModule;
import org.jboss.ide.eclipse.archives.core.ArchivesCorePlugin;
+import org.jboss.ide.eclipse.archives.core.asf.DirectoryScanner;
import org.jboss.ide.eclipse.archives.core.model.ArchivesModelException;
import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java 2008-06-24 20:46:22 UTC (rev 8928)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java 2008-06-24 23:21:18 UTC (rev 8929)
@@ -227,10 +227,7 @@
private IPath workspaceRelative;
public SingleDeployableModuleDelegate(IPath workspaceRelative) {
this.workspaceRelative = workspaceRelative;
- String projectName = workspaceRelative.segment(0);
- //global = ArchivesCore.getInstance().getVariables().getProjectPath(projectName);
- //global = ResourcesPlugin.getWorkspace().getRoot().findMember(workspaceRelative).getLocation();
- global = ArchivesCore.getInstance().getVariables().getProjectPath(projectName).append(workspaceRelative.removeFirstSegments(1));
+ global = ArchivesCore.getInstance().getVFS().workspacePathToAbsolutePath(workspaceRelative);
}
public IModule[] getChildModules() {
return new IModule[0];
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2008-06-24 20:46:22 UTC (rev 8928)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2008-06-24 23:21:18 UTC (rev 8929)
@@ -26,6 +26,7 @@
Export-Package: de.schlichtherle.io;x-friends:="org.jboss.ide.eclipse.archives.test",
org.jboss.ide.eclipse.archives.core,
org.jboss.ide.eclipse.archives.core.ant,
+ org.jboss.ide.eclipse.archives.core.asf,
org.jboss.ide.eclipse.archives.core.build,
org.jboss.ide.eclipse.archives.core.model,
org.jboss.ide.eclipse.archives.core.model.internal;x-friends:="org.jboss.ide.eclipse.archives.test",
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java 2008-06-24 20:46:22 UTC (rev 8928)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java 2008-06-24 23:21:18 UTC (rev 8929)
@@ -7,7 +7,7 @@
import org.jboss.ide.eclipse.archives.core.model.IArchivesLogger;
import org.jboss.ide.eclipse.archives.core.model.IExtensionManager;
import org.jboss.ide.eclipse.archives.core.model.IPreferenceManager;
-import org.jboss.ide.eclipse.archives.core.model.IRuntimeVariables;
+import org.jboss.ide.eclipse.archives.core.model.IArchivesVFS;
import org.jboss.ide.eclipse.archives.core.model.other.internal.ArchivesWorkspaceLogger;
import org.jboss.ide.eclipse.archives.core.model.other.internal.WorkspaceExtensionManager;
import org.jboss.ide.eclipse.archives.core.model.other.internal.WorkspacePreferenceManager;
@@ -31,7 +31,7 @@
return new WorkspacePreferenceManager();
}
- protected IRuntimeVariables createVariables() {
+ protected IArchivesVFS createVFS() {
return new WorkspaceVariables();
}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceVariables.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceVariables.java 2008-06-24 20:46:22 UTC (rev 8928)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceVariables.java 2008-06-24 23:21:18 UTC (rev 8929)
@@ -1,45 +1,74 @@
package org.jboss.ide.eclipse.archives.core.model.other.internal;
-import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.variables.VariablesPlugin;
-import org.jboss.ide.eclipse.archives.core.ArchivesCorePlugin;
-import org.jboss.ide.eclipse.archives.core.model.IRuntimeVariables;
+import org.jboss.ide.eclipse.archives.core.model.IArchivesVFS;
-public class WorkspaceVariables implements IRuntimeVariables {
+public class WorkspaceVariables implements IArchivesVFS {
+//
+// public IPath getProjectPath (String projectName) {
+// IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+//
+// if (project.exists() && project.isAccessible())
+// {
+// IPath location = project.getRawLocation();
+// if (location == null) return project.getLocation();
+//
+// return location;
+// }
+//
+// return null;
+// }
- public IPath getProjectPath (String projectName) {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-
- if (project.exists() && project.isAccessible())
- {
- IPath location = project.getRawLocation();
- if (location == null) return project.getLocation();
-
- return location;
- }
-
- return null;
+// public boolean isDebugging(String option) {
+// return ArchivesCorePlugin.getDefault().isDebugging()
+// && "true".equalsIgnoreCase(Platform.getDebugOption(option));
+// }
+//
+// public String getProjectName(IPath path) {
+// IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
+// for( int i = 0; i < projects.length; i++ )
+// if( projects[i].getLocation().equals(path))
+// return projects[i].getName();
+// return null;
+// }
+//
+ public String performStringSubstitution(String expression,
+ boolean reportUndefinedVariables) throws CoreException {
+ return VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(expression, reportUndefinedVariables);
}
- public boolean isDebugging(String option) {
- return ArchivesCorePlugin.getDefault().isDebugging()
- && "true".equalsIgnoreCase(Platform.getDebugOption(option));
+ public IPath[] getWorkspaceChildren(IPath path) {
+ IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
+ if( res != null || !(res instanceof IContainer)) {
+ try {
+ IResource[] resources = ((IContainer)res).members();
+ IPath[] paths = new IPath[resources.length];
+ for( int i = 0; i < resources.length; i++ )
+ paths[i] = resources[i].getFullPath();
+ return paths;
+ } catch( CoreException ce ) {
+ return new IPath[0];
+ }
+ }
+ return new IPath[0];
}
- public String getProjectName(IPath path) {
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- for( int i = 0; i < projects.length; i++ )
- if( projects[i].getLocation().equals(path))
- return projects[i].getName();
+ public IPath workspacePathToAbsolutePath(IPath path) {
+ IResource r = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
+ if( r != null )
+ return r.getLocation();
return null;
}
- public String performStringSubstitution(String expression,
- boolean reportUndefinedVariables) throws CoreException {
- return VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(expression, reportUndefinedVariables);
+ public IPath[] workspacePathToAbsolutePath(IPath[] paths) {
+ IPath[] results = new IPath[paths.length];
+ for( int i = 0; i < paths.length; i++ )
+ results[i] = workspacePathToAbsolutePath(paths[i]);
+ return results;
}
}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java 2008-06-24 20:46:22 UTC (rev 8928)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java 2008-06-24 23:21:18 UTC (rev 8929)
@@ -25,7 +25,7 @@
import org.jboss.ide.eclipse.archives.core.model.IArchivesLogger;
import org.jboss.ide.eclipse.archives.core.model.IExtensionManager;
import org.jboss.ide.eclipse.archives.core.model.IPreferenceManager;
-import org.jboss.ide.eclipse.archives.core.model.IRuntimeVariables;
+import org.jboss.ide.eclipse.archives.core.model.IArchivesVFS;
/**
* The core entry point for Archives
@@ -51,20 +51,20 @@
public static final int WORKSPACE = 1;
private int runType;
- private IRuntimeVariables variables;
+ private IArchivesVFS vfs;
private IExtensionManager extensionManager;
private IPreferenceManager preferenceManager;
private IArchivesLogger logger;
public ArchivesCore(int runType) {
this.runType = runType;
- variables = createVariables();
+ vfs = createVFS();
extensionManager = createExtensionManager();
preferenceManager = createPreferenceManager();
logger = createLogger();
}
- protected abstract IRuntimeVariables createVariables();
+ protected abstract IArchivesVFS createVFS();
protected abstract IExtensionManager createExtensionManager();
protected abstract IPreferenceManager createPreferenceManager();
protected abstract IArchivesLogger createLogger();
@@ -72,8 +72,8 @@
public int getRunType() {
return runType;
}
- public IRuntimeVariables getVariables() {
- return variables;
+ public IArchivesVFS getVFS() {
+ return vfs;
}
public IExtensionManager getExtensionManager() {
return extensionManager;
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java 2008-06-24 20:46:22 UTC (rev 8928)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java 2008-06-24 23:21:18 UTC (rev 8929)
@@ -7,7 +7,7 @@
import org.jboss.ide.eclipse.archives.core.model.IArchivesLogger;
import org.jboss.ide.eclipse.archives.core.model.IExtensionManager;
import org.jboss.ide.eclipse.archives.core.model.IPreferenceManager;
-import org.jboss.ide.eclipse.archives.core.model.IRuntimeVariables;
+import org.jboss.ide.eclipse.archives.core.model.IArchivesVFS;
/**
* A core API entry point for ant.
@@ -29,7 +29,7 @@
return new AntPreferenceManager();
}
- protected IRuntimeVariables createVariables() {
+ protected IArchivesVFS createVFS() {
return new AntVariables();
}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntVariables.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntVariables.java 2008-06-24 20:46:22 UTC (rev 8928)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntVariables.java 2008-06-24 23:21:18 UTC (rev 8929)
@@ -1,52 +1,17 @@
package org.jboss.ide.eclipse.archives.core.ant;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Properties;
-
import org.apache.tools.ant.Task;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.jboss.ide.eclipse.archives.core.model.IRuntimeVariables;
+import org.jboss.ide.eclipse.archives.core.model.IArchivesVFS;
import org.jboss.ide.eclipse.archives.core.model.IVariableManager;
import org.jboss.ide.eclipse.archives.core.xpl.StringSubstitutionEngineClone;
-public class AntVariables implements IRuntimeVariables, IVariableManager {
+public class AntVariables implements IArchivesVFS, IVariableManager {
private Task currentTask;
public void setCurrentTask(Task task) { currentTask = task; }
public Task getCurrentTask() { return currentTask; }
- public IPath getProjectPath(String projectName) {
-// HashMap<Object, Object> map = ResourceModel.getDefault().getTaskEnvironment(currentTask);
-// if( map.containsKey(projectName)) return new Path((String)map.get(projectName));
-// if( map.containsKey(IPath.SEPARATOR + projectName)) return new Path((String)map.get(IPath.SEPARATOR + projectName));
- projectName = projectName.replace(' ', '_');
- String projectPath = System.getProperty(projectName + ".dir");
- if (projectPath != null)
- return new Path(projectPath);
- return null;
- }
-
- public boolean isDebugging(String option) {
- return System.getProperty("archives.debug", "true")
- .equals("true");
- }
-
- public String getProjectName(IPath path) {
- Properties props = System.getProperties();
- Object key, val;
- for( Iterator i = props.keySet().iterator(); i.hasNext(); ) {
- key = i.next();
- if( key instanceof String && ((String)key).endsWith(".dir")) {
- val = props.get(key);
- if( path.toOSString().equals(new Path((String)val).toOSString()))
- return (String)key;
- }
- }
- return null;
- }
-
public String performStringSubstitution(String expression,
boolean reportUndefinedVariables) throws CoreException {
return new StringSubstitutionEngineClone().performStringSubstitution(expression, reportUndefinedVariables, this);
@@ -59,5 +24,17 @@
public String getVariableValue(String variable, String arg) {
return null;
}
+ public IPath[] getWorkspaceChildren(IPath path) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+ public IPath workspacePathToAbsolutePath(IPath path) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+ public IPath[] workspacePathToAbsolutePath(IPath[] paths) {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/IsolatedTruezipExecution.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/IsolatedTruezipExecution.java 2008-06-24 20:46:22 UTC (rev 8928)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/IsolatedTruezipExecution.java 2008-06-24 23:21:18 UTC (rev 8929)
@@ -6,6 +6,7 @@
import org.apache.tools.ant.Project;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.model.ArchivesModel;
import org.jboss.ide.eclipse.archives.core.model.ArchivesModelCore;
@@ -33,10 +34,10 @@
ClassLoader myCL = getClass().getClassLoader();
Thread.currentThread().setContextClassLoader(myCL);
- ((AntVariables)ArchivesCore.getInstance().getVariables()).setCurrentTask(task);
+ ((AntVariables)ArchivesCore.getInstance().getVFS()).setCurrentTask(task);
// figure out which one to build
ArchivesModel.instance().addBuildListener(listener);
- IPath path = ArchivesCore.getInstance().getVariables().getProjectPath(task.getEclipseProject());
+ IPath path = ArchivesCore.getInstance().getVFS().workspacePathToAbsolutePath(new Path(task.getEclipseProject()));
if( verifyBuildPrereqs(path) ) {
task.log("Building archives for project project: " + path, Project.MSG_VERBOSE);
ArchivesModelCore.buildProject(path, null);
@@ -95,9 +96,9 @@
});
boolean retVal = true;
- AntVariables vars = ((AntVariables)ArchivesCore.getInstance().getVariables());
+ AntVariables vars = ((AntVariables)ArchivesCore.getInstance().getVFS());
for( int i = 0; i < requiredProjects.size(); i++ ) {
- IPath p = vars.getProjectPath(requiredProjects.get(i));
+ IPath p = vars.workspacePathToAbsolutePath(new Path(requiredProjects.get(i)));
if( p == null ) {
retVal = false;
task.log("Required project \"" + requiredProjects.get(i) +
Added: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/asf/DirectoryScanner.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/asf/DirectoryScanner.java (rev 0)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/asf/DirectoryScanner.java 2008-06-24 23:21:18 UTC (rev 8929)
@@ -0,0 +1,1710 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+
+/*
+ * This file has been CHANGED, MODIFIED, EDITED.
+ * It has been coppied because list(File file) is
+ * a private method and is not able to be overridden.
+ *
+ * For archives, we need to be able to delegate to
+ * the eclipse VFS / resource model.
+ * rob.stryker(a)redhat.com
+ */
+package org.jboss.ide.eclipse.archives.core.asf;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.FileScanner;
+import org.apache.tools.ant.taskdefs.condition.Os;
+import org.apache.tools.ant.types.Resource;
+import org.apache.tools.ant.types.ResourceFactory;
+import org.apache.tools.ant.types.resources.FileResource;
+import org.apache.tools.ant.types.selectors.FileSelector;
+import org.apache.tools.ant.types.selectors.SelectorScanner;
+import org.apache.tools.ant.types.selectors.SelectorUtils;
+import org.apache.tools.ant.util.FileUtils;
+
+/**
+ * Class for scanning a directory for files/directories which match certain
+ * criteria.
+ * <p>
+ * These criteria consist of selectors and patterns which have been specified.
+ * With the selectors you can select which files you want to have included.
+ * Files which are not selected are excluded. With patterns you can include
+ * or exclude files based on their filename.
+ * <p>
+ * The idea is simple. A given directory is recursively scanned for all files
+ * and directories. Each file/directory is matched against a set of selectors,
+ * including special support for matching against filenames with include and
+ * and exclude patterns. Only files/directories which match at least one
+ * pattern of the include pattern list or other file selector, and don't match
+ * any pattern of the exclude pattern list or fail to match against a required
+ * selector will be placed in the list of files/directories found.
+ * <p>
+ * When no list of include patterns is supplied, "**" will be used, which
+ * means that everything will be matched. When no list of exclude patterns is
+ * supplied, an empty list is used, such that nothing will be excluded. When
+ * no selectors are supplied, none are applied.
+ * <p>
+ * The filename pattern matching is done as follows:
+ * The name to be matched is split up in path segments. A path segment is the
+ * name of a directory or file, which is bounded by
+ * <code>File.separator</code> ('/' under UNIX, '\' under Windows).
+ * For example, "abc/def/ghi/xyz.java" is split up in the segments "abc",
+ * "def","ghi" and "xyz.java".
+ * The same is done for the pattern against which should be matched.
+ * <p>
+ * The segments of the name and the pattern are then matched against each
+ * other. When '**' is used for a path segment in the pattern, it matches
+ * zero or more path segments of the name.
+ * <p>
+ * There is a special case regarding the use of <code>File.separator</code>s
+ * at the beginning of the pattern and the string to match:<br>
+ * When a pattern starts with a <code>File.separator</code>, the string
+ * to match must also start with a <code>File.separator</code>.
+ * When a pattern does not start with a <code>File.separator</code>, the
+ * string to match may not start with a <code>File.separator</code>.
+ * When one of these rules is not obeyed, the string will not
+ * match.
+ * <p>
+ * When a name path segment is matched against a pattern path segment, the
+ * following special characters can be used:<br>
+ * '*' matches zero or more characters<br>
+ * '?' matches one character.
+ * <p>
+ * Examples:
+ * <p>
+ * "**\*.class" matches all .class files/dirs in a directory tree.
+ * <p>
+ * "test\a??.java" matches all files/dirs which start with an 'a', then two
+ * more characters and then ".java", in a directory called test.
+ * <p>
+ * "**" matches everything in a directory tree.
+ * <p>
+ * "**\test\**\XYZ*" matches all files/dirs which start with "XYZ" and where
+ * there is a parent directory called test (e.g. "abc\test\def\ghi\XYZ123").
+ * <p>
+ * Case sensitivity may be turned off if necessary. By default, it is
+ * turned on.
+ * <p>
+ * Example of usage:
+ * <pre>
+ * String[] includes = {"**\\*.class"};
+ * String[] excludes = {"modules\\*\\**"};
+ * ds.setIncludes(includes);
+ * ds.setExcludes(excludes);
+ * ds.setBasedir(new File("test"));
+ * ds.setCaseSensitive(true);
+ * ds.scan();
+ *
+ * System.out.println("FILES:");
+ * String[] files = ds.getIncludedFiles();
+ * for (int i = 0; i < files.length; i++) {
+ * System.out.println(files[i]);
+ * }
+ * </pre>
+ * This will scan a directory called test for .class files, but excludes all
+ * files in all proper subdirectories of a directory called "modules"
+ *
+ */
+public class DirectoryScanner
+ implements FileScanner, SelectorScanner, ResourceFactory {
+
+ /** Is OpenVMS the operating system we're running on? */
+ private static final boolean ON_VMS = Os.isFamily("openvms");
+
+ /**
+ * Patterns which should be excluded by default.
+ *
+ * <p>Note that you can now add patterns to the list of default
+ * excludes. Added patterns will not become part of this array
+ * that has only been kept around for backwards compatibility
+ * reasons.</p>
+ *
+ * @deprecated since 1.6.x.
+ * Use the {@link #getDefaultExcludes getDefaultExcludes}
+ * method instead.
+ */
+ protected static final String[] DEFAULTEXCLUDES = {
+ // Miscellaneous typical temporary files
+ "**/*~",
+ "**/#*#",
+ "**/.#*",
+ "**/%*%",
+ "**/._*",
+
+ // CVS
+ "**/CVS",
+ "**/CVS/**",
+ "**/.cvsignore",
+
+ // SCCS
+ "**/SCCS",
+ "**/SCCS/**",
+
+ // Visual SourceSafe
+ "**/vssver.scc",
+
+ // Subversion
+ "**/.svn",
+ "**/.svn/**",
+
+ // Mac
+ "**/.DS_Store"
+ };
+
+ /** Helper. */
+ private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
+
+ /** iterations for case-sensitive scanning. */
+ private static final boolean[] CS_SCAN_ONLY = new boolean[] {true};
+
+ /** iterations for non-case-sensitive scanning. */
+ private static final boolean[] CS_THEN_NON_CS = new boolean[] {true, false};
+
+ /**
+ * Patterns which should be excluded by default.
+ *
+ * @see #addDefaultExcludes()
+ */
+ private static Vector<String> defaultExcludes = new Vector<String>();
+ static {
+ resetDefaultExcludes();
+ }
+
+ // CheckStyle:VisibilityModifier OFF - bc
+
+ /** The base directory to be scanned. */
+ protected File basedir;
+
+ /** The patterns for the files to be included. */
+ protected String[] includes;
+
+ /** The patterns for the files to be excluded. */
+ protected String[] excludes;
+
+ /** Selectors that will filter which files are in our candidate list. */
+ protected FileSelector[] selectors = null;
+
+ /**
+ * The files which matched at least one include and no excludes
+ * and were selected.
+ */
+ protected Vector<String> filesIncluded;
+
+ /** The files which did not match any includes or selectors. */
+ protected Vector<String> filesNotIncluded;
+
+ /**
+ * The files which matched at least one include and at least
+ * one exclude.
+ */
+ protected Vector<String> filesExcluded;
+
+ /**
+ * The directories which matched at least one include and no excludes
+ * and were selected.
+ */
+ protected Vector<String> dirsIncluded;
+
+ /** The directories which were found and did not match any includes. */
+ protected Vector<String> dirsNotIncluded;
+
+ /**
+ * The directories which matched at least one include and at least one
+ * exclude.
+ */
+ protected Vector<String> dirsExcluded;
+
+ /**
+ * The files which matched at least one include and no excludes and
+ * which a selector discarded.
+ */
+ protected Vector<String> filesDeselected;
+
+ /**
+ * The directories which matched at least one include and no excludes
+ * but which a selector discarded.
+ */
+ protected Vector<String> dirsDeselected;
+
+ /** Whether or not our results were built by a slow scan. */
+ protected boolean haveSlowResults = false;
+
+ /**
+ * Whether or not the file system should be treated as a case sensitive
+ * one.
+ */
+ protected boolean isCaseSensitive = true;
+
+ /**
+ * Whether or not symbolic links should be followed.
+ *
+ * @since Ant 1.5
+ */
+ private boolean followSymlinks = true;
+
+ /** Whether or not everything tested so far has been included. */
+ protected boolean everythingIncluded = true;
+
+ // CheckStyle:VisibilityModifier ON
+
+ /**
+ * Temporary table to speed up the various scanning methods.
+ *
+ * @since Ant 1.6
+ */
+ private Map<File, File[]> fileListMap = new HashMap<File, File[]>();
+
+ /**
+ * List of all scanned directories.
+ *
+ * @since Ant 1.6
+ */
+ private Set<String> scannedDirs = new HashSet<String>();
+
+ /**
+ * Set of all include patterns that are full file names and don't
+ * contain any wildcards.
+ *
+ * <p>If this instance is not case sensitive, the file names get
+ * turned to lower case.</p>
+ *
+ * <p>Gets lazily initialized on the first invocation of
+ * isIncluded or isExcluded and cleared at the end of the scan
+ * method (cleared in clearCaches, actually).</p>
+ *
+ * @since Ant 1.6.3
+ */
+ private Set<String> includeNonPatterns = new HashSet<String>();
+
+ /**
+ * Set of all include patterns that are full file names and don't
+ * contain any wildcards.
+ *
+ * <p>If this instance is not case sensitive, the file names get
+ * turned to lower case.</p>
+ *
+ * <p>Gets lazily initialized on the first invocation of
+ * isIncluded or isExcluded and cleared at the end of the scan
+ * method (cleared in clearCaches, actually).</p>
+ *
+ * @since Ant 1.6.3
+ */
+ private Set<String> excludeNonPatterns = new HashSet<String>();
+
+ /**
+ * Array of all include patterns that contain wildcards.
+ *
+ * <p>Gets lazily initialized on the first invocation of
+ * isIncluded or isExcluded and cleared at the end of the scan
+ * method (cleared in clearCaches, actually).</p>
+ *
+ * @since Ant 1.6.3
+ */
+ private String[] includePatterns;
+
+ /**
+ * Array of all exclude patterns that contain wildcards.
+ *
+ * <p>Gets lazily initialized on the first invocation of
+ * isIncluded or isExcluded and cleared at the end of the scan
+ * method (cleared in clearCaches, actually).</p>
+ *
+ * @since Ant 1.6.3
+ */
+ private String[] excludePatterns;
+
+ /**
+ * Have the non-pattern sets and pattern arrays for in- and
+ * excludes been initialized?
+ *
+ * @since Ant 1.6.3
+ */
+ private boolean areNonPatternSetsReady = false;
+
+ /**
+ * Scanning flag.
+ *
+ * @since Ant 1.6.3
+ */
+ private boolean scanning = false;
+
+ /**
+ * Scanning lock.
+ *
+ * @since Ant 1.6.3
+ */
+ private Object scanLock = new Object();
+
+ /**
+ * Slow scanning flag.
+ *
+ * @since Ant 1.6.3
+ */
+ private boolean slowScanning = false;
+
+ /**
+ * Slow scanning lock.
+ *
+ * @since Ant 1.6.3
+ */
+ private Object slowScanLock = new Object();
+
+ /**
+ * Exception thrown during scan.
+ *
+ * @since Ant 1.6.3
+ */
+ private IllegalStateException illegal = null;
+
+ /**
+ * Sole constructor.
+ */
+ public DirectoryScanner() {
+ }
+
+ /**
+ * Test whether or not a given path matches the start of a given
+ * pattern up to the first "**".
+ * <p>
+ * This is not a general purpose test and should only be used if you
+ * can live with false positives. For example, <code>pattern=**\a</code>
+ * and <code>str=b</code> will yield <code>true</code>.
+ *
+ * @param pattern The pattern to match against. Must not be
+ * <code>null</code>.
+ * @param str The path to match, as a String. Must not be
+ * <code>null</code>.
+ *
+ * @return whether or not a given path matches the start of a given
+ * pattern up to the first "**".
+ */
+ protected static boolean matchPatternStart(String pattern, String str) {
+ return SelectorUtils.matchPatternStart(pattern, str);
+ }
+
+ /**
+ * Test whether or not a given path matches the start of a given
+ * pattern up to the first "**".
+ * <p>
+ * This is not a general purpose test and should only be used if you
+ * can live with false positives. For example, <code>pattern=**\a</code>
+ * and <code>str=b</code> will yield <code>true</code>.
+ *
+ * @param pattern The pattern to match against. Must not be
+ * <code>null</code>.
+ * @param str The path to match, as a String. Must not be
+ * <code>null</code>.
+ * @param isCaseSensitive Whether or not matching should be performed
+ * case sensitively.
+ *
+ * @return whether or not a given path matches the start of a given
+ * pattern up to the first "**".
+ */
+ protected static boolean matchPatternStart(String pattern, String str,
+ boolean isCaseSensitive) {
+ return SelectorUtils.matchPatternStart(pattern, str, isCaseSensitive);
+ }
+
+ /**
+ * Test whether or not a given path matches a given pattern.
+ *
+ * @param pattern The pattern to match against. Must not be
+ * <code>null</code>.
+ * @param str The path to match, as a String. Must not be
+ * <code>null</code>.
+ *
+ * @return <code>true</code> if the pattern matches against the string,
+ * or <code>false</code> otherwise.
+ */
+ protected static boolean matchPath(String pattern, String str) {
+ return SelectorUtils.matchPath(pattern, str);
+ }
+
+ /**
+ * Test whether or not a given path matches a given pattern.
+ *
+ * @param pattern The pattern to match against. Must not be
+ * <code>null</code>.
+ * @param str The path to match, as a String. Must not be
+ * <code>null</code>.
+ * @param isCaseSensitive Whether or not matching should be performed
+ * case sensitively.
+ *
+ * @return <code>true</code> if the pattern matches against the string,
+ * or <code>false</code> otherwise.
+ */
+ protected static boolean matchPath(String pattern, String str,
+ boolean isCaseSensitive) {
+ return SelectorUtils.matchPath(pattern, str, isCaseSensitive);
+ }
+
+ /**
+ * Test whether or not a string matches against a pattern.
+ * The pattern may contain two special characters:<br>
+ * '*' means zero or more characters<br>
+ * '?' means one and only one character
+ *
+ * @param pattern The pattern to match against.
+ * Must not be <code>null</code>.
+ * @param str The string which must be matched against the pattern.
+ * Must not be <code>null</code>.
+ *
+ * @return <code>true</code> if the string matches against the pattern,
+ * or <code>false</code> otherwise.
+ */
+ public static boolean match(String pattern, String str) {
+ return SelectorUtils.match(pattern, str);
+ }
+
+ /**
+ * Test whether or not a string matches against a pattern.
+ * The pattern may contain two special characters:<br>
+ * '*' means zero or more characters<br>
+ * '?' means one and only one character
+ *
+ * @param pattern The pattern to match against.
+ * Must not be <code>null</code>.
+ * @param str The string which must be matched against the pattern.
+ * Must not be <code>null</code>.
+ * @param isCaseSensitive Whether or not matching should be performed
+ * case sensitively.
+ *
+ *
+ * @return <code>true</code> if the string matches against the pattern,
+ * or <code>false</code> otherwise.
+ */
+ protected static boolean match(String pattern, String str,
+ boolean isCaseSensitive) {
+ return SelectorUtils.match(pattern, str, isCaseSensitive);
+ }
+
+
+ /**
+ * Get the list of patterns that should be excluded by default.
+ *
+ * @return An array of <code>String</code> based on the current
+ * contents of the <code>defaultExcludes</code>
+ * <code>Vector</code>.
+ *
+ * @since Ant 1.6
+ */
+ public static String[] getDefaultExcludes() {
+ return defaultExcludes.toArray(new String[defaultExcludes
+ .size()]);
+ }
+
+ /**
+ * Add a pattern to the default excludes unless it is already a
+ * default exclude.
+ *
+ * @param s A string to add as an exclude pattern.
+ * @return <code>true</code> if the string was added;
+ * <code>false</code> if it already existed.
+ *
+ * @since Ant 1.6
+ */
+ public static boolean addDefaultExclude(String s) {
+ if (defaultExcludes.indexOf(s) == -1) {
+ defaultExcludes.add(s);
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Remove a string if it is a default exclude.
+ *
+ * @param s The string to attempt to remove.
+ * @return <code>true</code> if <code>s</code> was a default
+ * exclude (and thus was removed);
+ * <code>false</code> if <code>s</code> was not
+ * in the default excludes list to begin with.
+ *
+ * @since Ant 1.6
+ */
+ public static boolean removeDefaultExclude(String s) {
+ return defaultExcludes.remove(s);
+ }
+
+ /**
+ * Go back to the hardwired default exclude patterns.
+ *
+ * @since Ant 1.6
+ */
+ public static void resetDefaultExcludes() {
+ defaultExcludes = new Vector<String>();
+ for (int i = 0; i < DEFAULTEXCLUDES.length; i++) {
+ defaultExcludes.add(DEFAULTEXCLUDES[i]);
+ }
+ }
+
+ /**
+ * Set the base directory to be scanned. This is the directory which is
+ * scanned recursively. All '/' and '\' characters are replaced by
+ * <code>File.separatorChar</code>, so the separator used need not match
+ * <code>File.separatorChar</code>.
+ *
+ * @param basedir The base directory to scan.
+ */
+ public void setBasedir(String basedir) {
+ setBasedir(basedir == null ? (File) null
+ : new File(basedir.replace('/', File.separatorChar).replace(
+ '\\', File.separatorChar)));
+ }
+
+ /**
+ * Set the base directory to be scanned. This is the directory which is
+ * scanned recursively.
+ *
+ * @param basedir The base directory for scanning.
+ */
+ public synchronized void setBasedir(File basedir) {
+ this.basedir = basedir;
+ }
+
+ /**
+ * Return the base directory to be scanned.
+ * This is the directory which is scanned recursively.
+ *
+ * @return the base directory to be scanned.
+ */
+ public synchronized File getBasedir() {
+ return basedir;
+ }
+
+ /**
+ * Find out whether include exclude patterns are matched in a
+ * case sensitive way.
+ * @return whether or not the scanning is case sensitive.
+ * @since Ant 1.6
+ */
+ public synchronized boolean isCaseSensitive() {
+ return isCaseSensitive;
+ }
+
+ /**
+ * Set whether or not include and exclude patterns are matched
+ * in a case sensitive way.
+ *
+ * @param isCaseSensitive whether or not the file system should be
+ * regarded as a case sensitive one.
+ */
+ public synchronized void setCaseSensitive(boolean isCaseSensitive) {
+ this.isCaseSensitive = isCaseSensitive;
+ }
+
+ /**
+ * Get whether or not a DirectoryScanner follows symbolic links.
+ *
+ * @return flag indicating whether symbolic links should be followed.
+ *
+ * @since Ant 1.6
+ */
+ public synchronized boolean isFollowSymlinks() {
+ return followSymlinks;
+ }
+
+ /**
+ * Set whether or not symbolic links should be followed.
+ *
+ * @param followSymlinks whether or not symbolic links should be followed.
+ */
+ public synchronized void setFollowSymlinks(boolean followSymlinks) {
+ this.followSymlinks = followSymlinks;
+ }
+
+ /**
+ * Set the list of include patterns to use. All '/' and '\' characters
+ * are replaced by <code>File.separatorChar</code>, so the separator used
+ * need not match <code>File.separatorChar</code>.
+ * <p>
+ * When a pattern ends with a '/' or '\', "**" is appended.
+ *
+ * @param includes A list of include patterns.
+ * May be <code>null</code>, indicating that all files
+ * should be included. If a non-<code>null</code>
+ * list is given, all elements must be
+ * non-<code>null</code>.
+ */
+ public synchronized void setIncludes(String[] includes) {
+ if (includes == null) {
+ this.includes = null;
+ } else {
+ this.includes = new String[includes.length];
+ for (int i = 0; i < includes.length; i++) {
+ this.includes[i] = normalizePattern(includes[i]);
+ }
+ }
+ }
+
+ /**
+ * Set the list of exclude patterns to use. All '/' and '\' characters
+ * are replaced by <code>File.separatorChar</code>, so the separator used
+ * need not match <code>File.separatorChar</code>.
+ * <p>
+ * When a pattern ends with a '/' or '\', "**" is appended.
+ *
+ * @param excludes A list of exclude patterns.
+ * May be <code>null</code>, indicating that no files
+ * should be excluded. If a non-<code>null</code> list is
+ * given, all elements must be non-<code>null</code>.
+ */
+ public synchronized void setExcludes(String[] excludes) {
+ if (excludes == null) {
+ this.excludes = null;
+ } else {
+ this.excludes = new String[excludes.length];
+ for (int i = 0; i < excludes.length; i++) {
+ this.excludes[i] = normalizePattern(excludes[i]);
+ }
+ }
+ }
+
+ /**
+ * Add to the list of exclude patterns to use. All '/' and '\'
+ * characters are replaced by <code>File.separatorChar</code>, so
+ * the separator used need not match <code>File.separatorChar</code>.
+ * <p>
+ * When a pattern ends with a '/' or '\', "**" is appended.
+ *
+ * @param excludes A list of exclude patterns.
+ * May be <code>null</code>, in which case the
+ * exclude patterns don't get changed at all.
+ *
+ * @since Ant 1.6.3
+ */
+ public synchronized void addExcludes(String[] excludes) {
+ if (excludes != null && excludes.length > 0) {
+ if (this.excludes != null && this.excludes.length > 0) {
+ String[] tmp = new String[excludes.length
+ + this.excludes.length];
+ System.arraycopy(this.excludes, 0, tmp, 0,
+ this.excludes.length);
+ for (int i = 0; i < excludes.length; i++) {
+ tmp[this.excludes.length + i] =
+ normalizePattern(excludes[i]);
+ }
+ this.excludes = tmp;
+ } else {
+ setExcludes(excludes);
+ }
+ }
+ }
+
+ /**
+ * All '/' and '\' characters are replaced by
+ * <code>File.separatorChar</code>, so the separator used need not
+ * match <code>File.separatorChar</code>.
+ *
+ * <p> When a pattern ends with a '/' or '\', "**" is appended.
+ *
+ * @since Ant 1.6.3
+ */
+ private static String normalizePattern(String p) {
+ String pattern = p.replace('/', File.separatorChar)
+ .replace('\\', File.separatorChar);
+ if (pattern.endsWith(File.separator)) {
+ pattern += "**";
+ }
+ return pattern;
+ }
+
+ /**
+ * Set the selectors that will select the filelist.
+ *
+ * @param selectors specifies the selectors to be invoked on a scan.
+ */
+ public synchronized void setSelectors(FileSelector[] selectors) {
+ this.selectors = selectors;
+ }
+
+ /**
+ * Return whether or not the scanner has included all the files or
+ * directories it has come across so far.
+ *
+ * @return <code>true</code> if all files and directories which have
+ * been found so far have been included.
+ */
+ public synchronized boolean isEverythingIncluded() {
+ return everythingIncluded;
+ }
+
+ /**
+ * Scan for files which match at least one include pattern and don't match
+ * any exclude patterns. If there are selectors then the files must pass
+ * muster there, as well. Scans under basedir, if set; otherwise the
+ * include patterns without leading wildcards specify the absolute paths of
+ * the files that may be included.
+ *
+ * @exception IllegalStateException if the base directory was set
+ * incorrectly (i.e. if it doesn't exist or isn't a directory).
+ */
+ public void scan() throws IllegalStateException {
+ synchronized (scanLock) {
+ if (scanning) {
+ while (scanning) {
+ try {
+ scanLock.wait();
+ } catch (InterruptedException e) {
+ continue;
+ }
+ }
+ if (illegal != null) {
+ throw illegal;
+ }
+ return;
+ }
+ scanning = true;
+ }
+ try {
+ synchronized (this) {
+ illegal = null;
+ clearResults();
+
+ // set in/excludes to reasonable defaults if needed:
+ boolean nullIncludes = (includes == null);
+ includes = nullIncludes ? new String[] {"**"} : includes;
+ boolean nullExcludes = (excludes == null);
+ excludes = nullExcludes ? new String[0] : excludes;
+
+ if (basedir == null) {
+ // if no basedir and no includes, nothing to do:
+ if (nullIncludes) {
+ return;
+ }
+ } else {
+ if (!basedir.exists()) {
+ illegal = new IllegalStateException("basedir " + basedir
+ + " does not exist");
+ }
+ if (!basedir.isDirectory()) {
+ illegal = new IllegalStateException("basedir " + basedir
+ + " is not a directory");
+ }
+ if (illegal != null) {
+ throw illegal;
+ }
+ }
+ if (isIncluded("")) {
+ if (!isExcluded("")) {
+ if (isSelected("", basedir)) {
+ dirsIncluded.addElement("");
+ } else {
+ dirsDeselected.addElement("");
+ }
+ } else {
+ dirsExcluded.addElement("");
+ }
+ } else {
+ dirsNotIncluded.addElement("");
+ }
+ checkIncludePatterns();
+ clearCaches();
+ includes = nullIncludes ? null : includes;
+ excludes = nullExcludes ? null : excludes;
+ }
+ } finally {
+ synchronized (scanLock) {
+ scanning = false;
+ scanLock.notifyAll();
+ }
+ }
+ }
+
+ /**
+ * This routine is actually checking all the include patterns in
+ * order to avoid scanning everything under base dir.
+ * @since Ant 1.6
+ */
+ private void checkIncludePatterns() {
+ Map<String, String> newroots = new HashMap<String, String>();
+ // put in the newroots map the include patterns without
+ // wildcard tokens
+ for (int i = 0; i < includes.length; i++) {
+ if (FileUtils.isAbsolutePath(includes[i])) {
+ //skip abs. paths not under basedir, if set:
+ if (basedir != null
+ && !SelectorUtils.matchPatternStart(includes[i],
+ basedir.getAbsolutePath(), isCaseSensitive())) {
+ continue;
+ }
+ } else if (basedir == null) {
+ //skip non-abs. paths if basedir == null:
+ continue;
+ }
+ newroots.put(SelectorUtils.rtrimWildcardTokens(
+ includes[i]), includes[i]);
+ }
+ if (newroots.containsKey("") && basedir != null) {
+ // we are going to scan everything anyway
+ scandir(basedir, "", true);
+ } else {
+ // only scan directories that can include matched files or
+ // directories
+ Iterator it = newroots.entrySet().iterator();
+
+ File canonBase = null;
+ if (basedir != null) {
+ try {
+ canonBase = basedir.getCanonicalFile();
+ } catch (IOException ex) {
+ throw new BuildException(ex);
+ }
+ }
+ while (it.hasNext()) {
+ Map.Entry entry = (Map.Entry) it.next();
+ String currentelement = (String) entry.getKey();
+ if (basedir == null && !FileUtils.isAbsolutePath(currentelement)) {
+ continue;
+ }
+ String originalpattern = (String) entry.getValue();
+ File myfile = new File(basedir, currentelement);
+
+ if (myfile.exists()) {
+ // may be on a case insensitive file system. We want
+ // the results to show what's really on the disk, so
+ // we need to double check.
+ try {
+ String path = (basedir == null)
+ ? myfile.getCanonicalPath()
+ : FILE_UTILS.removeLeadingPath(canonBase,
+ myfile.getCanonicalFile());
+ if (!path.equals(currentelement) || ON_VMS) {
+ myfile = findFile(basedir, currentelement, true);
+ if (myfile != null && basedir != null) {
+ currentelement = FILE_UTILS.removeLeadingPath(
+ basedir, myfile);
+ }
+ }
+ } catch (IOException ex) {
+ throw new BuildException(ex);
+ }
+ }
+ if ((myfile == null || !myfile.exists()) && !isCaseSensitive()) {
+ File f = findFile(basedir, currentelement, false);
+ if (f != null && f.exists()) {
+ // adapt currentelement to the case we've
+ // actually found
+ currentelement = (basedir == null)
+ ? f.getAbsolutePath()
+ : FILE_UTILS.removeLeadingPath(basedir, f);
+ myfile = f;
+ }
+ }
+ if (myfile != null && myfile.exists()) {
+ if (!followSymlinks
+ && isSymlink(basedir, currentelement)) {
+ continue;
+ }
+ if (myfile.isDirectory()) {
+ if (isIncluded(currentelement)
+ && currentelement.length() > 0) {
+ accountForIncludedDir(currentelement, myfile, true);
+ } else {
+ if (currentelement.length() > 0) {
+ if (currentelement.charAt(currentelement
+ .length() - 1)
+ != File.separatorChar) {
+ currentelement =
+ currentelement + File.separatorChar;
+ }
+ }
+ scandir(myfile, currentelement, true);
+ }
+ } else {
+ boolean included = isCaseSensitive()
+ ? originalpattern.equals(currentelement)
+ : originalpattern.equalsIgnoreCase(currentelement);
+ if (included) {
+ accountForIncludedFile(currentelement, myfile);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Clear the result caches for a scan.
+ */
+ protected synchronized void clearResults() {
+ filesIncluded = new Vector<String>();
+ filesNotIncluded = new Vector<String>();
+ filesExcluded = new Vector<String>();
+ filesDeselected = new Vector<String>();
+ dirsIncluded = new Vector<String>();
+ dirsNotIncluded = new Vector<String>();
+ dirsExcluded = new Vector<String>();
+ dirsDeselected = new Vector<String>();
+ everythingIncluded = (basedir != null);
+ scannedDirs.clear();
+ }
+
+ /**
+ * Top level invocation for a slow scan. A slow scan builds up a full
+ * list of excluded/included files/directories, whereas a fast scan
+ * will only have full results for included files, as it ignores
+ * directories which can't possibly hold any included files/directories.
+ * <p>
+ * Returns immediately if a slow scan has already been completed.
+ */
+ protected void slowScan() {
+ synchronized (slowScanLock) {
+ if (haveSlowResults) {
+ return;
+ }
+ if (slowScanning) {
+ while (slowScanning) {
+ try {
+ slowScanLock.wait();
+ } catch (InterruptedException e) {
+ // Empty
+ }
+ }
+ return;
+ }
+ slowScanning = true;
+ }
+ try {
+ synchronized (this) {
+
+ // set in/excludes to reasonable defaults if needed:
+ boolean nullIncludes = (includes == null);
+ includes = nullIncludes ? new String[] {"**"} : includes;
+ boolean nullExcludes = (excludes == null);
+ excludes = nullExcludes ? new String[0] : excludes;
+
+ String[] excl = new String[dirsExcluded.size()];
+ dirsExcluded.copyInto(excl);
+
+ String[] notIncl = new String[dirsNotIncluded.size()];
+ dirsNotIncluded.copyInto(notIncl);
+
+ processSlowScan(excl);
+ processSlowScan(notIncl);
+ clearCaches();
+ includes = nullIncludes ? null : includes;
+ excludes = nullExcludes ? null : excludes;
+ }
+ } finally {
+ synchronized (slowScanLock) {
+ haveSlowResults = true;
+ slowScanning = false;
+ slowScanLock.notifyAll();
+ }
+ }
+ }
+
+ private void processSlowScan(String[] arr) {
+ for (int i = 0; i < arr.length; i++) {
+ if (!couldHoldIncluded(arr[i])) {
+ scandir(new File(basedir, arr[i]),
+ arr[i] + File.separator, false);
+ }
+ }
+ }
+
+ /**
+ * Scan the given directory for files and directories. Found files and
+ * directories are placed in their respective collections, based on the
+ * matching of includes, excludes, and the selectors. When a directory
+ * is found, it is scanned recursively.
+ *
+ * @param dir The directory to scan. Must not be <code>null</code>.
+ * @param vpath The path relative to the base directory (needed to
+ * prevent problems with an absolute path when using
+ * dir). Must not be <code>null</code>.
+ * @param fast Whether or not this call is part of a fast scan.
+ *
+ * @see #filesIncluded
+ * @see #filesNotIncluded
+ * @see #filesExcluded
+ * @see #dirsIncluded
+ * @see #dirsNotIncluded
+ * @see #dirsExcluded
+ * @see #slowScan
+ */
+ protected void scandir(File dir, String vpath, boolean fast) {
+ if (dir == null) {
+ throw new BuildException("dir must not be null.");
+ } else if (!dir.exists()) {
+ throw new BuildException(dir + " doesn't exist.");
+ } else if (!dir.isDirectory()) {
+ throw new BuildException(dir + " is not a directory.");
+ }
+ // avoid double scanning of directories, can only happen in fast mode
+ if (fast && hasBeenScanned(vpath)) {
+ return;
+ }
+
+ // LINE MODIFIED FOR JBOSS TOOLS; was dir.list();
+ File[] newfiles = list(dir);
+
+ if (newfiles == null) {
+ /*
+ * two reasons are mentioned in the API docs for File.list
+ * (1) dir is not a directory. This is impossible as
+ * we wouldn't get here in this case.
+ * (2) an IO error occurred (why doesn't it throw an exception
+ * then???)
+ */
+ throw new BuildException("IO error scanning directory '"
+ + dir.getAbsolutePath() + "'");
+ }
+ if (!followSymlinks) {
+ Vector<File> noLinks = new Vector<File>();
+ for (int i = 0; i < newfiles.length; i++) {
+ try {
+ if (FILE_UTILS.isSymbolicLink(dir, newfiles[i].getName())) {
+ String name = vpath + newfiles[i].getName();
+ File file = newfiles[i];
+ (file.isDirectory()
+ ? dirsExcluded : filesExcluded).addElement(name);
+ } else {
+ noLinks.addElement(newfiles[i]);
+ }
+ } catch (IOException ioe) {
+ String msg = "IOException caught while checking "
+ + "for links, couldn't get canonical path!";
+ // will be caught and redirected to Ant's logging system
+ System.err.println(msg);
+ noLinks.addElement(newfiles[i]);
+ }
+ }
+ newfiles = (noLinks.toArray(new File[noLinks.size()]));
+ }
+ for (int i = 0; i < newfiles.length; i++) {
+ String name = vpath + getName(newfiles[i]);
+ File file = newfiles[i];
+ if (file.isDirectory()) {
+ if (isIncluded(name)) {
+ accountForIncludedDir(name, file, fast);
+ } else {
+ everythingIncluded = false;
+ dirsNotIncluded.addElement(name);
+ if (fast && couldHoldIncluded(name)) {
+ scandir(file, name + File.separator, fast);
+ }
+ }
+ if (!fast) {
+ scandir(file, name + File.separator, fast);
+ }
+ } else if (file.isFile()) {
+ if (isIncluded(name)) {
+ accountForIncludedFile(name, file);
+ } else {
+ everythingIncluded = false;
+ filesNotIncluded.addElement(name);
+ }
+ }
+ }
+ }
+
+ protected String getName(File file) {
+ return file.getName();
+ }
+
+ /**
+ * Process included file.
+ * @param name path of the file relative to the directory of the FileSet.
+ * @param file included File.
+ */
+ private void accountForIncludedFile(String name, File file) {
+ processIncluded(name, file, filesIncluded, filesExcluded, filesDeselected);
+ }
+
+ /**
+ * Process included directory.
+ * @param name path of the directory relative to the directory of
+ * the FileSet.
+ * @param file directory as File.
+ * @param fast whether to perform fast scans.
+ */
+ private void accountForIncludedDir(String name, File file, boolean fast) {
+ processIncluded(name, file, dirsIncluded, dirsExcluded, dirsDeselected);
+ if (fast && couldHoldIncluded(name) && !contentsExcluded(name)) {
+ scandir(file, name + File.separator, fast);
+ }
+ }
+
+ private void processIncluded(String name, File file, Vector<String> inc, Vector<String> exc, Vector<String> des) {
+
+ if (inc.contains(name) || exc.contains(name) || des.contains(name)) { return; }
+
+ boolean included = false;
+ if (isExcluded(name)) {
+ exc.add(name);
+ } else if (isSelected(name, file)) {
+ included = true;
+ inc.add(name);
+ } else {
+ des.add(name);
+ }
+ everythingIncluded &= included;
+ }
+
+ /**
+ * Test whether or not a name matches against at least one include
+ * pattern.
+ *
+ * @param name The name to match. Must not be <code>null</code>.
+ * @return <code>true</code> when the name matches against at least one
+ * include pattern, or <code>false</code> otherwise.
+ */
+ protected boolean isIncluded(String name) {
+ ensureNonPatternSetsReady();
+
+ if (isCaseSensitive()
+ ? includeNonPatterns.contains(name)
+ : includeNonPatterns.contains(name.toUpperCase())) {
+ return true;
+ }
+ for (int i = 0; i < includePatterns.length; i++) {
+ if (matchPath(includePatterns[i], name, isCaseSensitive())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Test whether or not a name matches the start of at least one include
+ * pattern.
+ *
+ * @param name The name to match. Must not be <code>null</code>.
+ * @return <code>true</code> when the name matches against the start of at
+ * least one include pattern, or <code>false</code> otherwise.
+ */
+ protected boolean couldHoldIncluded(String name) {
+ for (int i = 0; i < includes.length; i++) {
+ if (matchPatternStart(includes[i], name, isCaseSensitive())
+ && isMorePowerfulThanExcludes(name, includes[i])
+ && isDeeper(includes[i], name)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Verify that a pattern specifies files deeper
+ * than the level of the specified file.
+ * @param pattern the pattern to check.
+ * @param name the name to check.
+ * @return whether the pattern is deeper than the name.
+ * @since Ant 1.6.3
+ */
+ private boolean isDeeper(String pattern, String name) {
+ Vector p = SelectorUtils.tokenizePath(pattern);
+ Vector n = SelectorUtils.tokenizePath(name);
+ return p.contains("**") || p.size() > n.size();
+ }
+
+ /**
+ * Find out whether one particular include pattern is more powerful
+ * than all the excludes.
+ * Note: the power comparison is based on the length of the include pattern
+ * and of the exclude patterns without the wildcards.
+ * Ideally the comparison should be done based on the depth
+ * of the match; that is to say how many file separators have been matched
+ * before the first ** or the end of the pattern.
+ *
+ * IMPORTANT : this function should return false "with care".
+ *
+ * @param name the relative path to test.
+ * @param includepattern one include pattern.
+ * @return true if there is no exclude pattern more powerful than this include pattern.
+ * @since Ant 1.6
+ */
+ private boolean isMorePowerfulThanExcludes(String name, String includepattern) {
+ String soughtexclude = name + File.separator + "**";
+ for (int counter = 0; counter < excludes.length; counter++) {
+ if (excludes[counter].equals(soughtexclude)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Test whether all contents of the specified directory must be excluded.
+ * @param name the directory name to check.
+ * @return whether all the specified directory's contents are excluded.
+ */
+ private boolean contentsExcluded(String name) {
+ name = (name.endsWith(File.separator)) ? name : name + File.separator;
+ for (int i = 0; i < excludes.length; i++) {
+ String e = excludes[i];
+ if (e.endsWith("**") && SelectorUtils.matchPath(
+ e.substring(0, e.length() - 2), name, isCaseSensitive())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Test whether or not a name matches against at least one exclude
+ * pattern.
+ *
+ * @param name The name to match. Must not be <code>null</code>.
+ * @return <code>true</code> when the name matches against at least one
+ * exclude pattern, or <code>false</code> otherwise.
+ */
+ protected boolean isExcluded(String name) {
+ ensureNonPatternSetsReady();
+
+ if (isCaseSensitive()
+ ? excludeNonPatterns.contains(name)
+ : excludeNonPatterns.contains(name.toUpperCase())) {
+ return true;
+ }
+ for (int i = 0; i < excludePatterns.length; i++) {
+ if (matchPath(excludePatterns[i], name, isCaseSensitive())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Test whether a file should be selected.
+ *
+ * @param name the filename to check for selecting.
+ * @param file the java.io.File object for this filename.
+ * @return <code>false</code> when the selectors says that the file
+ * should not be selected, <code>true</code> otherwise.
+ */
+ protected boolean isSelected(String name, File file) {
+ if (selectors != null) {
+ for (int i = 0; i < selectors.length; i++) {
+ if (!selectors[i].isSelected(basedir, name, file)) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Return the names of the files which matched at least one of the
+ * include patterns and none of the exclude patterns.
+ * The names are relative to the base directory.
+ *
+ * @return the names of the files which matched at least one of the
+ * include patterns and none of the exclude patterns.
+ */
+ public synchronized String[] getIncludedFiles() {
+ if (filesIncluded == null) {
+ throw new IllegalStateException("Must call scan() first");
+ }
+ String[] files = new String[filesIncluded.size()];
+ filesIncluded.copyInto(files);
+ Arrays.sort(files);
+ return files;
+ }
+
+ /**
+ * Return the count of included files.
+ * @return <code>int</code>.
+ * @since Ant 1.6.3
+ */
+ public synchronized int getIncludedFilesCount() {
+ if (filesIncluded == null) {
+ throw new IllegalStateException("Must call scan() first");
+ }
+ return filesIncluded.size();
+ }
+
+ /**
+ * Return the names of the files which matched none of the include
+ * patterns. The names are relative to the base directory. This involves
+ * performing a slow scan if one has not already been completed.
+ *
+ * @return the names of the files which matched none of the include
+ * patterns.
+ *
+ * @see #slowScan
+ */
+ public synchronized String[] getNotIncludedFiles() {
+ slowScan();
+ String[] files = new String[filesNotIncluded.size()];
+ filesNotIncluded.copyInto(files);
+ return files;
+ }
+
+ /**
+ * Return the names of the files which matched at least one of the
+ * include patterns and at least one of the exclude patterns.
+ * The names are relative to the base directory. This involves
+ * performing a slow scan if one has not already been completed.
+ *
+ * @return the names of the files which matched at least one of the
+ * include patterns and at least one of the exclude patterns.
+ *
+ * @see #slowScan
+ */
+ public synchronized String[] getExcludedFiles() {
+ slowScan();
+ String[] files = new String[filesExcluded.size()];
+ filesExcluded.copyInto(files);
+ return files;
+ }
+
+ /**
+ * <p>Return the names of the files which were selected out and
+ * therefore not ultimately included.</p>
+ *
+ * <p>The names are relative to the base directory. This involves
+ * performing a slow scan if one has not already been completed.</p>
+ *
+ * @return the names of the files which were deselected.
+ *
+ * @see #slowScan
+ */
+ public synchronized String[] getDeselectedFiles() {
+ slowScan();
+ String[] files = new String[filesDeselected.size()];
+ filesDeselected.copyInto(files);
+ return files;
+ }
+
+ /**
+ * Return the names of the directories which matched at least one of the
+ * include patterns and none of the exclude patterns.
+ * The names are relative to the base directory.
+ *
+ * @return the names of the directories which matched at least one of the
+ * include patterns and none of the exclude patterns.
+ */
+ public synchronized String[] getIncludedDirectories() {
+ if (dirsIncluded == null) {
+ throw new IllegalStateException("Must call scan() first");
+ }
+ String[] directories = new String[dirsIncluded.size()];
+ dirsIncluded.copyInto(directories);
+ Arrays.sort(directories);
+ return directories;
+ }
+
+ /**
+ * Return the count of included directories.
+ * @return <code>int</code>.
+ * @since Ant 1.6.3
+ */
+ public synchronized int getIncludedDirsCount() {
+ if (dirsIncluded == null) {
+ throw new IllegalStateException("Must call scan() first");
+ }
+ return dirsIncluded.size();
+ }
+
+ /**
+ * Return the names of the directories which matched none of the include
+ * patterns. The names are relative to the base directory. This involves
+ * performing a slow scan if one has not already been completed.
+ *
+ * @return the names of the directories which matched none of the include
+ * patterns.
+ *
+ * @see #slowScan
+ */
+ public synchronized String[] getNotIncludedDirectories() {
+ slowScan();
+ String[] directories = new String[dirsNotIncluded.size()];
+ dirsNotIncluded.copyInto(directories);
+ return directories;
+ }
+
+ /**
+ * Return the names of the directories which matched at least one of the
+ * include patterns and at least one of the exclude patterns.
+ * The names are relative to the base directory. This involves
+ * performing a slow scan if one has not already been completed.
+ *
+ * @return the names of the directories which matched at least one of the
+ * include patterns and at least one of the exclude patterns.
+ *
+ * @see #slowScan
+ */
+ public synchronized String[] getExcludedDirectories() {
+ slowScan();
+ String[] directories = new String[dirsExcluded.size()];
+ dirsExcluded.copyInto(directories);
+ return directories;
+ }
+
+ /**
+ * <p>Return the names of the directories which were selected out and
+ * therefore not ultimately included.</p>
+ *
+ * <p>The names are relative to the base directory. This involves
+ * performing a slow scan if one has not already been completed.</p>
+ *
+ * @return the names of the directories which were deselected.
+ *
+ * @see #slowScan
+ */
+ public synchronized String[] getDeselectedDirectories() {
+ slowScan();
+ String[] directories = new String[dirsDeselected.size()];
+ dirsDeselected.copyInto(directories);
+ return directories;
+ }
+
+ /**
+ * Add default exclusions to the current exclusions set.
+ */
+ public synchronized void addDefaultExcludes() {
+ int excludesLength = excludes == null ? 0 : excludes.length;
+ String[] newExcludes;
+ newExcludes = new String[excludesLength + defaultExcludes.size()];
+ if (excludesLength > 0) {
+ System.arraycopy(excludes, 0, newExcludes, 0, excludesLength);
+ }
+ String[] defaultExcludesTemp = getDefaultExcludes();
+ for (int i = 0; i < defaultExcludesTemp.length; i++) {
+ newExcludes[i + excludesLength] =
+ defaultExcludesTemp[i].replace('/', File.separatorChar)
+ .replace('\\', File.separatorChar);
+ }
+ excludes = newExcludes;
+ }
+
+ /**
+ * Get the named resource.
+ * @param name path name of the file relative to the dir attribute.
+ *
+ * @return the resource with the given name.
+ * @since Ant 1.5.2
+ */
+ public synchronized Resource getResource(String name) {
+ return new FileResource(basedir, name);
+ }
+
+ /**
+ * Return a cached result of list performed on file, if
+ * available. Invokes the method and caches the result otherwise.
+ *
+ * @param file File (dir) to list.
+ * @since Ant 1.6
+ */
+ private File[] list(File file) {
+ File[] files = fileListMap.get(file);
+ if (files == null) {
+ files = list2(file);
+ if (files != null) {
+ fileListMap.put(file, files);
+ }
+ }
+ return files;
+ }
+
+ // Made protected to be over-ridden
+ protected File[] list2(File file) {
+ return file.listFiles();
+ }
+
+ /**
+ * From <code>base</code> traverse the filesystem in order to find
+ * a file that matches the given name.
+ *
+ * @param base base File (dir).
+ * @param path file path.
+ * @param cs whether to scan case-sensitively.
+ * @return File object that points to the file in question or null.
+ *
+ * @since Ant 1.6.3
+ */
+ private File findFile(File base, String path, boolean cs) {
+ if (FileUtils.isAbsolutePath(path)) {
+ if (base == null) {
+ String[] s = FILE_UTILS.dissect(path);
+ base = new File(s[0]);
+ path = s[1];
+ } else {
+ File f = FILE_UTILS.normalize(path);
+ String s = FILE_UTILS.removeLeadingPath(base, f);
+ if (s.equals(f.getAbsolutePath())) {
+ //removing base from path yields no change; path not child of base
+ return null;
+ }
+ path = s;
+ }
+ }
+ return findFile(base, SelectorUtils.tokenizePath(path), cs);
+ }
+
+ /**
+ * From <code>base</code> traverse the filesystem in order to find
+ * a file that matches the given stack of names.
+ *
+ * @param base base File (dir).
+ * @param pathElements Vector of path elements (dirs...file).
+ * @param cs whether to scan case-sensitively.
+ * @return File object that points to the file in question or null.
+ *
+ * @since Ant 1.6.3
+ */
+ private File findFile(File base, Vector pathElements, boolean cs) {
+ if (pathElements.size() == 0) {
+ return base;
+ }
+ String current = (String) pathElements.remove(0);
+ if (base == null) {
+ return findFile(new File(current), pathElements, cs);
+ }
+ if (!base.isDirectory()) {
+ return null;
+ }
+ File[] files = list(base);
+ if (files == null) {
+ throw new BuildException("IO error scanning directory "
+ + base.getAbsolutePath());
+ }
+ boolean[] matchCase = cs ? CS_SCAN_ONLY : CS_THEN_NON_CS;
+ for (int i = 0; i < matchCase.length; i++) {
+ for (int j = 0; j < files.length; j++) {
+ if (matchCase[i] ? files[j].getName().equals(current)
+ : files[j].getName().equalsIgnoreCase(current)) {
+ return findFile(files[j], pathElements, cs);
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Do we have to traverse a symlink when trying to reach path from
+ * basedir?
+ * @param base base File (dir).
+ * @param path file path.
+ * @since Ant 1.6
+ */
+ private boolean isSymlink(File base, String path) {
+ return isSymlink(base, SelectorUtils.tokenizePath(path));
+ }
+
+ /**
+ * Do we have to traverse a symlink when trying to reach path from
+ * basedir?
+ * @param base base File (dir).
+ * @param pathElements Vector of path elements (dirs...file).
+ * @since Ant 1.6
+ */
+ private boolean isSymlink(File base, Vector pathElements) {
+ if (pathElements.size() > 0) {
+ String current = (String) pathElements.remove(0);
+ try {
+ return FILE_UTILS.isSymbolicLink(base, current)
+ || isSymlink(new File(base, current), pathElements);
+ } catch (IOException ioe) {
+ String msg = "IOException caught while checking "
+ + "for links, couldn't get canonical path!";
+ // will be caught and redirected to Ant's logging system
+ System.err.println(msg);
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Has the directory with the given path relative to the base
+ * directory already been scanned?
+ *
+ * <p>Registers the given directory as scanned as a side effect.</p>
+ *
+ * @since Ant 1.6
+ */
+ private boolean hasBeenScanned(String vpath) {
+ return !scannedDirs.add(vpath);
+ }
+
+ /**
+ * This method is of interest for testing purposes. The returned
+ * Set is live and should not be modified.
+ * @return the Set of relative directory names that have been scanned.
+ */
+ /* package-private */ Set<String> getScannedDirs() {
+ return scannedDirs;
+ }
+
+ /**
+ * Clear internal caches.
+ *
+ * @since Ant 1.6
+ */
+ private synchronized void clearCaches() {
+ fileListMap.clear();
+ includeNonPatterns.clear();
+ excludeNonPatterns.clear();
+ includePatterns = null;
+ excludePatterns = null;
+ areNonPatternSetsReady = false;
+ }
+
+ /**
+ * Ensure that the in|exclude "patterns"
+ * have been properly divided up.
+ *
+ * @since Ant 1.6.3
+ */
+ private synchronized void ensureNonPatternSetsReady() {
+ if (!areNonPatternSetsReady) {
+ includePatterns = fillNonPatternSet(includeNonPatterns, includes);
+ excludePatterns = fillNonPatternSet(excludeNonPatterns, excludes);
+ areNonPatternSetsReady = true;
+ }
+ }
+
+ /**
+ * Add all patterns that are not real patterns (do not contain
+ * wildcards) to the set and returns the real patterns.
+ *
+ * @param set Set to populate.
+ * @param patterns String[] of patterns.
+ * @since Ant 1.6.3
+ */
+ private String[] fillNonPatternSet(Set<String> set, String[] patterns) {
+ ArrayList<String> al = new ArrayList<String>(patterns.length);
+ for (int i = 0; i < patterns.length; i++) {
+ if (!SelectorUtils.hasWildcards(patterns[i])) {
+ set.add(isCaseSensitive() ? patterns[i]
+ : patterns[i].toUpperCase());
+ } else {
+ al.add(patterns[i]);
+ }
+ }
+ return set.size() == 0 ? patterns
+ : al.toArray(new String[al.size()]);
+ }
+
+}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModelCore.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModelCore.java 2008-06-24 20:46:22 UTC (rev 8928)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModelCore.java 2008-06-24 23:21:18 UTC (rev 8929)
@@ -21,13 +21,11 @@
*/
package org.jboss.ide.eclipse.archives.core.model;
-import org.apache.tools.ant.DirectoryScanner;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
-import org.jboss.ide.eclipse.archives.core.ArchivesCore;
+import org.jboss.ide.eclipse.archives.core.asf.DirectoryScanner;
import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate;
/**
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java 2008-06-24 20:46:22 UTC (rev 8928)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java 2008-06-24 23:21:18 UTC (rev 8929)
@@ -22,9 +22,12 @@
package org.jboss.ide.eclipse.archives.core.model;
import java.io.File;
+import java.util.HashMap;
-import org.apache.tools.ant.DirectoryScanner;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.jboss.ide.eclipse.archives.core.ArchivesCore;
+import org.jboss.ide.eclipse.archives.core.asf.DirectoryScanner;
/**
* Utility methods to create scanners for matching
@@ -38,12 +41,11 @@
if( filesystemFolder == null )
return null;
- DirectoryScannerExtension scanner = new DirectoryScannerExtension();
+ DirectoryScannerExtension scanner = new DirectoryScannerExtension(false);
String excludesList[] = excludes.split(" ?, ?");
String includesList[] = includes.split(" ?, ?");
- File basedir = filesystemFolder.toFile();
- scanner.setBasedir(basedir);
+ scanner.setBasedir2(filesystemFolder);
scanner.setExcludes(excludesList);
scanner.setIncludes(includesList);
if (scan) {
@@ -53,6 +55,19 @@
return scanner;
}
+ public static DirectoryScannerExtension createDirectoryScanner(IArchiveFileSet fs, boolean scan) {
+ if( !fs.isInWorkspace()) {
+ return createDirectoryScanner(fs.getGlobalSourcePath(), fs.getIncludesPattern(), fs.getExcludesPattern(), scan);
+ }
+
+ // in workspace
+ DirectoryScannerExtension scanner = new DirectoryScannerExtension(fs);
+ if (scan) {
+ scanner.scan();
+ }
+ return scanner;
+ }
+
/**
* Exposes the isIncluded method so that entire scans do not need to occur
* to find matches.
@@ -60,8 +75,90 @@
* Overwrites
*/
public static class DirectoryScannerExtension extends DirectoryScanner {
+ protected boolean workspaceRelative;
+ // maps a File to it's workspace path
+ protected HashMap<File, IPath> absoluteToWorkspace;
+ protected IArchiveFileSet fs;
+
+ public DirectoryScannerExtension(boolean relative) {
+ workspaceRelative = relative;
+ absoluteToWorkspace = new HashMap<File, IPath>();
+ }
+
+ public DirectoryScannerExtension(IArchiveFileSet fs) {
+ this.fs = fs;
+ String includes = fs.getIncludesPattern() == null ? "" : fs.getIncludesPattern();
+ String excludes = fs.getExcludesPattern() == null ? "" : fs.getExcludesPattern();
+ String includesList[] = includes.split(" ?, ?");
+ String excludesList[] = excludes.split(" ?, ?");
+ setExcludes(excludesList);
+ setIncludes(includesList);
+ workspaceRelative = fs.isInWorkspace();
+ absoluteToWorkspace = new HashMap<File, IPath>();
+ setBasedir2(fs.getSourcePath());
+ }
+
+ public void setBasedir2(IPath path) {
+ IPath p = path;
+ if( workspaceRelative ) {
+ p = ArchivesCore.getInstance().getVFS()
+ .workspacePathToAbsolutePath(path);
+ absoluteToWorkspace.put(p.toFile(), path);
+ }
+ setBasedir(p.toFile());
+ }
+
+ public IPath getWorkspacePath(IPath absolutePath) {
+ return absoluteToWorkspace.get(absolutePath.toFile());
+ }
+
+ protected File[] list2(File file) {
+ return workspaceRelative ? list3(file) : file.listFiles();
+ }
+
+ protected String getName(File file) {
+ return absoluteToWorkspace.get(file).lastSegment();
+ }
+
+ /* Only used when workspace relative! */
+ protected File[] list3(File file) {
+ IPath workspaceRelative = absoluteToWorkspace.get(file);
+
+ if( workspaceRelative == null )
+ return new File[0];
+
+ IPath[] childrenWorkspace = ArchivesCore.getInstance()
+ .getVFS().getWorkspaceChildren(workspaceRelative);
+ IPath[] childrenAbsolute = ArchivesCore.getInstance()
+ .getVFS().workspacePathToAbsolutePath(childrenWorkspace);
+ File[] files = new File[childrenAbsolute.length];
+ for( int i = 0; i < files.length; i++ ) {
+ files[i] = childrenAbsolute[i].toFile();
+ if( files[i] != null && childrenWorkspace[i] != null )
+ absoluteToWorkspace.put(files[i], childrenWorkspace[i]);
+ }
+ return files;
+ }
+
public boolean isUltimatelyIncluded(String name) {
return super.isIncluded(name) && !super.isExcluded(name);
}
+
+ public IPath[] getAbsoluteIncludedFiles() {
+ String[] relative = super.getIncludedFiles();
+ if( workspaceRelative ) {
+ IPath[] absolutes = new IPath[relative.length];
+ for( int i = 0; i < relative.length; i++ )
+ absolutes[i] = ArchivesCore.getInstance()
+ .getVFS().workspacePathToAbsolutePath(fs.getSourcePath().append(relative[i]));
+ return absolutes;
+ } else {
+ IPath base2 = new Path(basedir.getAbsolutePath());
+ IPath[] absolutes = new IPath[relative.length];
+ for( int i = 0; i < relative.length; i++ )
+ absolutes[i] = base2.append(relative[i]);
+ return absolutes;
+ }
+ }
}
}
Copied: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchivesVFS.java (from rev 8699, trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IRuntimeVariables.java)
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchivesVFS.java (rev 0)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchivesVFS.java 2008-06-24 23:21:18 UTC (rev 8929)
@@ -0,0 +1,53 @@
+/**
+ * JBoss, a Division of Red Hat
+ * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ide.eclipse.archives.core.model;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+
+/**
+ *
+ * @author rob.stryker <rob.stryker(a)redhat.com>
+ *
+ */
+public interface IArchivesVFS {
+
+ /**
+ * Returns a list of workspace-relative paths
+ * that are children of the parameter.
+ * @param path
+ * @return
+ */
+ public IPath[] getWorkspaceChildren(IPath path);
+
+ /**
+ * Translates a workspace path to a global path
+ * @param path
+ * @return
+ */
+ public IPath workspacePathToAbsolutePath(IPath path);
+
+ public IPath[] workspacePathToAbsolutePath(IPath[] paths);
+
+ public String performStringSubstitution(String expression, boolean reportUndefinedVariables) throws CoreException;
+
+}
Deleted: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IRuntimeVariables.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IRuntimeVariables.java 2008-06-24 20:46:22 UTC (rev 8928)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IRuntimeVariables.java 2008-06-24 23:21:18 UTC (rev 8929)
@@ -1,41 +0,0 @@
-/**
- * JBoss, a Division of Red Hat
- * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ide.eclipse.archives.core.model;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-
-/**
- *
- * @author rob.stryker <rob.stryker(a)redhat.com>
- *
- */
-public interface IRuntimeVariables {
-
- public boolean isDebugging(String option);
- public IPath getProjectPath(String projectName);
- public String getProjectName(IPath path);
-
- // allow for variable replacement
- public String performStringSubstitution(String expression, boolean reportUndefinedVariables) throws CoreException;
-
-}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2008-06-24 20:46:22 UTC (rev 8928)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2008-06-24 23:21:18 UTC (rev 8929)
@@ -22,6 +22,7 @@
package org.jboss.ide.eclipse.archives.core.model.internal;
import java.util.ArrayList;
+import java.util.Arrays;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IPath;
@@ -30,10 +31,8 @@
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory;
import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet;
-import org.jboss.ide.eclipse.archives.core.model.IArchivesLogger;
import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension;
import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbFileSet;
-import org.jboss.ide.eclipse.archives.core.util.ModelUtil;
/**
* An implementation for filesets
@@ -93,7 +92,7 @@
if (path == null || path.equals(".") || path.equals("")) {
ret = getProjectPath();
} else if( isInWorkspace()){
- ret = ModelUtil.workspacePathToAbsolutePath(new Path(path));
+ ret = ArchivesCore.getInstance().getVFS().workspacePathToAbsolutePath(new Path(path));
} else {
ret = new Path(path);
}
@@ -137,26 +136,14 @@
* Will re-scan if required, or use cached scanner
* @return
*/
- private synchronized DirectoryScannerExtension getScanner() {
+ public synchronized DirectoryScannerExtension getScanner() {
if( scanner == null || rescanRequired) {
rescanRequired = false;
try {
- // new scanner
- scanner = DirectoryScannerFactory.createDirectoryScanner(
- getGlobalSourcePath(), getIncludesPattern(), getExcludesPattern(), true);
-
- ArrayList<IPath> paths = new ArrayList<IPath>();
- if( scanner != null ) {
- // cache the paths
- IPath sp = getGlobalSourcePath();
- String matched[] = scanner.getIncludedFiles();
- for (int i = 0; i < matched.length; i++) {
- IPath path = sp.append(new Path(matched[i]));
- paths.add(path);
- }
- }
- matchingPaths = paths;
+ scanner = DirectoryScannerFactory.createDirectoryScanner(this, true);
+ if( scanner != null )
+ matchingPaths = new ArrayList(Arrays.asList(scanner.getAbsoluteIncludedFiles()));
} catch( IllegalStateException ise ) {
ArchivesCore.getInstance().getLogger().log(IStatus.WARNING, "Could not create directory scanner", ise);
}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveImpl.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveImpl.java 2008-06-24 20:46:22 UTC (rev 8928)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveImpl.java 2008-06-24 23:21:18 UTC (rev 8929)
@@ -35,7 +35,6 @@
import org.jboss.ide.eclipse.archives.core.model.INamedContainerArchiveNode;
import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbPackage;
import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbPackages;
-import org.jboss.ide.eclipse.archives.core.util.ModelUtil;
/**
* An archive
@@ -78,7 +77,7 @@
return getProjectPath() == null ? Path.EMPTY : getProjectPath();
if (isDestinationInWorkspace()) {
- return ModelUtil.workspacePathToAbsolutePath(new Path(packageDelegate.getToDir()));
+ return ArchivesCore.getInstance().getVFS().workspacePathToAbsolutePath(new Path(packageDelegate.getToDir()));
} else
return new Path(packageDelegate.getToDir());
}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java 2008-06-24 20:46:22 UTC (rev 8928)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java 2008-06-24 23:21:18 UTC (rev 8929)
@@ -220,13 +220,13 @@
}
- public static IPath workspacePathToAbsolutePath (IPath workspacePath) {
- String projectName = workspacePath.segment(0);
- if( projectName == null ) return null;
- IPath projectPath = ArchivesCore.getInstance().getVariables().getProjectPath(projectName);
- if( projectPath == null ) return null;
- return projectPath.append(workspacePath.removeFirstSegments(1));
- }
+// public static IPath workspacePathToAbsolutePath (IPath workspacePath) {
+// String projectName = workspacePath.segment(0);
+// if( projectName == null ) return null;
+// IPath projectPath = ArchivesCore.getInstance().getVariables().getProjectPath(projectName);
+// if( projectPath == null ) return null;
+// return projectPath.append(workspacePath.removeFirstSegments(1));
+// }
public static void fillArchiveModel( XbPackages node, IArchiveModelRootNode modelNode) throws ArchivesModelException {
for (Iterator iter = node.getAllChildren().iterator(); iter.hasNext(); ) {
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2008-06-24 20:46:22 UTC (rev 8928)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2008-06-24 23:21:18 UTC (rev 8929)
@@ -31,6 +31,7 @@
import org.jboss.ide.eclipse.archives.core.model.IArchiveFolder;
import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
import org.jboss.ide.eclipse.archives.core.model.IArchiveNodeVisitor;
+import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveFileSetImpl;
import org.jboss.ide.eclipse.archives.core.util.ModelUtil;
import de.schlichtherle.io.ArchiveDetector;
@@ -207,12 +208,17 @@
return new File[]{};
File[] returnFiles = new File[inputFiles.length];
- int fsLength = fs.getGlobalSourcePath().toOSString().length()+1;
for( int i = 0; i < inputFiles.length; i++ ) {
if( fs.isFlattened() )
filesetRelative = inputFiles[i].lastSegment();
- else
- filesetRelative = inputFiles[i].toOSString().substring(fsLength);
+ else if( fs.isInWorkspace() ){
+ IPath wsPath = ((ArchiveFileSetImpl)fs).getScanner().getWorkspacePath(inputFiles[i]);
+ filesetRelative = wsPath.removeFirstSegments(fs.getSourcePath().segmentCount()).toString();
+ } else {
+ int fsLength = fs.getGlobalSourcePath().toOSString().length()+1;
+ filesetRelative = inputFiles[i].toOSString().substring(fsLength);
+ }
+
File parentFile;
if(new Path(filesetRelative).segmentCount() > 1 ) {
String tmp = new Path(filesetRelative).removeLastSegments(1).toString();
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2008-06-24 20:46:22 UTC (rev 8928)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2008-06-24 23:21:18 UTC (rev 8929)
@@ -308,6 +308,14 @@
}
private void fillDefaults () {
+ String projectName = "";
+ IProject[] project = ResourcesPlugin.getWorkspace().getRoot().getProjects();
+ for( int i = 0; i < project.length; i++ )
+ if( project[i].getLocation().equals(parentNode.getProjectPath()))
+ projectName = project[i].getName();
+
+ rootProjectLabel.setText(projectName);
+
if (fileset != null) {
if (fileset.getIncludesPattern() != null) {
includes = fileset.getIncludesPattern();
@@ -332,15 +340,11 @@
} else {
rootDirIsWorkspaceRelative = true;
rootDir = parentNode.getProjectPath();
- workspaceRelativeRootDir = "";
+ workspaceRelativeRootDir = projectName;
flattened = false;
flattenedYes.setSelection(flattened);
flattenedNo.setSelection(!flattened);
}
- IProject[] project = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- for( int i = 0; i < project.length; i++ )
- if( project[i].getLocation().equals(parentNode.getProjectPath()))
- rootProjectLabel.setText(project[i].getName());
}
@@ -375,7 +379,7 @@
if (project != null) {
IPath projectRelativePath = path.removeFirstSegments(1);
rootProjectLabel.setText(project.getName());
- rootDir = ArchivesCore.getInstance().getVariables().getProjectPath(projectName).append(projectRelativePath);
+ rootDir = ArchivesCore.getInstance().getVFS().workspacePathToAbsolutePath(path);
workspaceRelativeRootDir = path.toString();
if (!projectRelativePath.isEmpty()) {
rootDirText.setText(projectRelativePath.toString());
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r8928 - trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/internal/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-06-24 16:46:22 -0400 (Tue, 24 Jun 2008)
New Revision: 8928
Modified:
trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/internal/project/facet/BirtPostInstallListener.java
Log:
JBIDE-2220 JBoss BIRT Integration
Modified: trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/internal/project/facet/BirtPostInstallListener.java
===================================================================
--- trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/internal/project/facet/BirtPostInstallListener.java 2008-06-24 20:46:17 UTC (rev 8927)
+++ trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/internal/project/facet/BirtPostInstallListener.java 2008-06-24 20:46:22 UTC (rev 8928)
@@ -101,7 +101,7 @@
properties.load(inputStream);
String bootDelegation = "org.osgi.framework.bootdelegation";
String loader = "osgi.parentClassloader";
- properties.put(bootDelegation, "org.hibernate,org.hibernate.type,org.hibernate.metadata");
+ properties.put(bootDelegation, "org.hibernate,org.hibernate.type,org.hibernate.metadata,org.hibernate.ejb, javax.persistence");
properties.put(loader,"fwk");
// FIXME
//String compatibility = "osgi.compatibility.bootdelegation";
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r8927 - in trunk/birt/plugins/org.jboss.tools.birt.oda: src/org/jboss/tools/birt/oda and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-06-24 16:46:17 -0400 (Tue, 24 Jun 2008)
New Revision: 8927
Modified:
trunk/birt/plugins/org.jboss.tools.birt.oda/plugin.xml
trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/IOdaFactory.java
trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/ServerOdaFactory.java
Log:
JBIDE-2220 JBoss BIRT Integration
Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/plugin.xml
===================================================================
--- trunk/birt/plugins/org.jboss.tools.birt.oda/plugin.xml 2008-06-24 20:45:51 UTC (rev 8926)
+++ trunk/birt/plugins/org.jboss.tools.birt.oda/plugin.xml 2008-06-24 20:46:17 UTC (rev 8927)
@@ -20,7 +20,14 @@
isEncryptable="false">
</property>
<property
+ name="jndiName"
allowsEmptyValueAsNull="true"
+ defaultDisplayName="JNDI Session Factory Name"
+ type="string"
+ isEncryptable="false">
+ </property>
+ <property
+ allowsEmptyValueAsNull="true"
defaultDisplayName="Max results"
defaultValue="100"
isEncryptable="false"
Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/IOdaFactory.java
===================================================================
--- trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/IOdaFactory.java 2008-06-24 20:45:51 UTC (rev 8926)
+++ trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/IOdaFactory.java 2008-06-24 20:46:17 UTC (rev 8927)
@@ -26,6 +26,7 @@
public static final String MAX_ROWS = "maxRows";
public static final String CONFIGURATION = "configuration";
+ public static final String JNDI_NAME = "jndiName";
public static final String ORG_HIBERNATE_ECLIPSE_BUNDLE_ID = "org.hibernate.eclipse";
void close();
Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/ServerOdaFactory.java
===================================================================
--- trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/ServerOdaFactory.java 2008-06-24 20:45:51 UTC (rev 8926)
+++ trunk/birt/plugins/org.jboss.tools.birt.oda/src/org/jboss/tools/birt/oda/impl/ServerOdaFactory.java 2008-06-24 20:46:17 UTC (rev 8927)
@@ -3,13 +3,18 @@
import java.util.Properties;
import javax.naming.InitialContext;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
import org.eclipse.datatools.connectivity.oda.OdaException;
import org.hibernate.SessionFactory;
+import org.hibernate.ejb.EntityManagerImpl;
import org.jboss.tools.birt.oda.IOdaFactory;
public class ServerOdaFactory extends AbstractOdaFactory {
+ private EntityManager manager;
+
public ServerOdaFactory(Properties properties) throws OdaException {
getSessionFactory(properties);
String maxRowString = properties
@@ -22,20 +27,64 @@
}
public Object getSessionFactory(Properties properties) throws OdaException {
+ String jndiName = properties.getProperty(JNDI_NAME);
String configurationName = properties.getProperty(CONFIGURATION);
+ if (configurationName != null) {
+ int index = configurationName.indexOf("-ejb");
+ if (index > 0) {
+ configurationName = configurationName.substring(0, index);
+ }
+ }
+ if (jndiName == null || jndiName.length() <= 0) {
+ jndiName = "java:/" + configurationName;
+ }
+ String entityFactoryName = "java:/" + configurationName + "EntityManagerFactory";
+
if (sessionFactory == null) {
InitialContext ctx = null;
try {
ctx = new InitialContext();
- sessionFactory = (SessionFactory) ctx.lookup("java:/"
- + configurationName);
+ //sessionFactory = (SessionFactory) ctx.lookup("java:/"
+ // + configurationName);
+ try {
+ Object object = ctx.lookup(jndiName);
+ if (object instanceof SessionFactory) {
+ sessionFactory = (SessionFactory) object;
+ return sessionFactory;
+ }
+ if (object instanceof EntityManagerFactory) {
+ EntityManagerFactory entityManagerFactory = (EntityManagerFactory) object;
+ manager = entityManagerFactory.createEntityManager();
+ if (manager instanceof EntityManagerImpl) {
+ EntityManagerImpl hibernateManager = (EntityManagerImpl) manager;
+ sessionFactory = hibernateManager.getSession().getSessionFactory();
+ manager.close();
+ return sessionFactory;
+ }
+ }
+ } catch (Exception e1) {
+ Object object = ctx.lookup(entityFactoryName);
+ if (object instanceof SessionFactory) {
+ sessionFactory = (SessionFactory) object;
+ return sessionFactory;
+ }
+ if (object instanceof EntityManagerFactory) {
+ EntityManagerFactory entityManagerFactory = (EntityManagerFactory) object;
+ manager = entityManagerFactory.createEntityManager();
+ if (manager instanceof EntityManagerImpl) {
+ EntityManagerImpl hibernateManager = (EntityManagerImpl) manager;
+ sessionFactory = hibernateManager.getSession().getSessionFactory();
+ manager.close();
+ return sessionFactory;
+ }
+ }
+ }
} catch (Exception e) {
e.printStackTrace();
throw new OdaException(
"Cannot create Hibernate session factory");
}
-
}
return sessionFactory;
}
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r8926 - trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-06-24 16:45:51 -0400 (Tue, 24 Jun 2008)
New Revision: 8926
Modified:
trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/HibernateSelectionPageHelper.java
Log:
JBIDE-2220 JBoss BIRT Integration
Modified: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/HibernateSelectionPageHelper.java
===================================================================
--- trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/HibernateSelectionPageHelper.java 2008-06-24 18:45:31 UTC (rev 8925)
+++ trunk/birt/plugins/org.jboss.tools.birt.oda.ui/src/org/jboss/tools/birt/oda/ui/impl/HibernateSelectionPageHelper.java 2008-06-24 20:45:51 UTC (rev 8926)
@@ -49,6 +49,7 @@
private WizardPage wizardPage;
private PreferencePage propertyPage;
private Combo configurationCombo;
+ private Text jndiSessionFactoryName;
private Text maxRows;
private Button testButton;
@@ -80,6 +81,16 @@
gridData.horizontalAlignment = SWT.FILL;
gridData.grabExcessHorizontalSpace = true;
configurationCombo.setLayoutData(gridData);
+
+ Label jndiLabel = new Label(composite, SWT.RIGHT);
+ jndiLabel.setText("JNDI URL:");
+
+ jndiSessionFactoryName = new Text(composite,SWT.BORDER);
+ gridData = new GridData();
+ gridData.horizontalSpan = 2;
+ gridData.horizontalAlignment = SWT.FILL;
+ gridData.grabExcessHorizontalSpace = true;
+ jndiSessionFactoryName.setLayoutData(gridData);
ConsoleConfiguration[] configurations = KnownConfigurations
.getInstance().getConfigurations();
@@ -99,9 +110,12 @@
public void modifyText(ModifyEvent e) {
validateData();
+ adjustJndiName();
}
});
+
+ adjustJndiName();
new Label(composite, SWT.NONE);
testButton = new Button(composite, SWT.PUSH);
@@ -120,6 +134,20 @@
}
+ private void adjustJndiName() {
+ String jndiName = jndiSessionFactoryName.getText();
+ if (jndiName == null || jndiName.length() <= 0) {
+ String configurationName = configurationCombo.getText();
+ if (configurationName != null && configurationName.length() > 0) {
+ int index = configurationName.indexOf("-ejb");
+ if (index > 0) {
+ configurationName = configurationName.substring(0,index);
+ }
+ jndiSessionFactoryName.setText("java:/" + configurationName);
+ }
+ }
+ }
+
private void setMessage(String message, int type) {
if (wizardPage != null)
wizardPage.setMessage(message, type);
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r8925 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-06-24 14:45:31 -0400 (Tue, 24 Jun 2008)
New Revision: 8925
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java
Log:
Editors closing is performed during the TestCase tearDowm procodure.
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java 2008-06-24 17:38:58 UTC (rev 8924)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java 2008-06-24 18:45:31 UTC (rev 8925)
@@ -88,7 +88,10 @@
}
protected void tearDown() throws Exception {
+ EditorTestHelper.closeAllEditors();
+
super.tearDown();
+
earProject = null;
earEjbProject = null;
earEarProject = null;
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java 2008-06-24 17:38:58 UTC (rev 8924)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java 2008-06-24 18:45:31 UTC (rev 8925)
@@ -22,7 +22,6 @@
import org.jboss.tools.seam.core.SeamProjectsSet;
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
-import org.jboss.tools.seam.core.project.facet.SeamVersion;
import org.jboss.tools.seam.ui.wizard.IParameter;
import org.jboss.tools.test.util.JUnitUtils;
import org.jboss.tools.test.util.ProjectImportTestSetup;
@@ -73,6 +72,18 @@
}
}
+
+ protected void tearDown() throws Exception {
+ EditorTestHelper.closeAllEditors();
+
+ super.tearDown();
+
+ warProject = null;
+ testProject = null;
+ seamWarProject = null;
+ seamTestProject = null;
+ }
+
protected IProject getProject() {
return warProject;
}
15 years, 10 months
- 1
- 0