Author: akazakov Date: 2009-03-08 20:58:26 -0400 (Sun, 08 Mar 2009) New Revision: 14100 Modified: branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java Log: https://jira.jboss.org/jira/browse/JBIDE-3623 - Fixed Modified: branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java =================================================================== --- branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java 2009-03-09 00:52:44 UTC (rev 14099) +++ branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java 2009-03-09 00:58:26 UTC (rev 14100) @@ -11,8 +11,12 @@ package org.jboss.tools.seam.internal.core.project.facet; import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; import java.io.IOException; import java.util.HashSet; +import java.util.Properties; import java.util.Set; import org.apache.tools.ant.types.FilterSet; @@ -24,6 +28,7 @@ import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.jboss.tools.seam.core.SeamCorePlugin; +import org.jboss.tools.seam.core.project.facet.SeamVersion; /** * @author Alexey Kazakov @@ -150,6 +155,22 @@ testSrcDir, //$NON-NLS-1$ new FilterSetCollection(filterSet), true); + // Add "org.jboss.seam.core.init.debug=false" for Seam 2.1 + // to seam.properties file to avoid https://jira.jboss.org/jira/browse/JBIDE-3623 + if(getVersion() == SeamVersion.SEAM_2_1) { + Properties seamProperties = new Properties(); + File testSeamPropertiesFile = new File(testSrcDir, "seam.properties"); + try { + seamProperties.load(new FileInputStream(testSeamPropertiesFile)); + seamProperties.setProperty("org.jboss.seam.core.init.debug", "false"); //$NON-NLS-1$ //$NON-NLS-2$ + seamProperties.store(new FileOutputStream(testSeamPropertiesFile), "debug is explicitly disabled in test to avoid JBIDE-3623"); + } catch (FileNotFoundException e) { + SeamCorePlugin.getPluginLog().logError(e); + } catch (IOException e) { + SeamCorePlugin.getPluginLog().logError(e); + } + } + AntCopyUtils.copyFiles( new File(seamRuntime.getHomeDir(), "lib"), //$NON-NLS-1$ testLibDir, Modified: branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java =================================================================== --- branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2009-03-09 00:52:44 UTC (rev 14099) +++ branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2009-03-09 00:58:26 UTC (rev 14100) @@ -32,6 +32,7 @@ import org.eclipse.jst.common.project.facet.JavaFacetUtils; import org.eclipse.jst.common.project.facet.core.ClasspathHelper; import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; @@ -44,6 +45,7 @@ import org.jboss.tools.seam.core.SeamCorePlugin; 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.osgi.service.prefs.BackingStoreException; /** @@ -180,6 +182,11 @@ droolsLibFolder = new File(seamHomePath, SeamFacetInstallDelegate.DROOLS_LIB_SEAM_RELATED_PATH); } + public SeamVersion getVersion() { + String seamVersionString = getModel().getProperty(IFacetDataModelProperties.FACET_VERSION_STR).toString(); + return SeamVersion.parseFromString(seamVersionString); + } + public IDataModel getModel() { return model; }