[jbosstools-commits] JBoss Tools SVN: r5392 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam: core/project/facet and 6 other directories.

Author: dgolovin Date: 2007-12-19 19:17:11 -0500 (Wed, 19 Dec 2007) New Revision: 5392 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponent.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCorePlugin.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntime.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPackage.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/AntCopyUtils.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/DataSourceXmlDeployer.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamCoreConstants.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPostInstallDelegate.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/SeamAnnotations.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/TypeScanner.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidator.java Log: Cleanup the code: 1. new Long(value) replaced for Long.valueOf(value) 2. new String() removed 3. new Boolean(true/false) replaced to Boolean.TRUE/FALSE 4. Unused packages were removed from seam.plugins 5. Throwing of NullPointerException replaced to IllegalArgument Exception 6. catch Exception replaced to particular Exception types in several places Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponent.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponent.java 2007-12-20 00:12:39 UTC (rev 5391) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponent.java 2007-12-20 00:17:11 UTC (rev 5392) @@ -14,8 +14,6 @@ import java.util.List; import java.util.Set; -import org.jboss.tools.seam.core.event.ISeamValue; - /** * Represents component in seam tools model. * @author Alexey Kazakov Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java 2007-12-20 00:12:39 UTC (rev 5391) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java 2007-12-20 00:17:11 UTC (rev 5392) @@ -1,8 +1,5 @@ package org.jboss.tools.seam.core; -import java.util.MissingResourceException; -import java.util.ResourceBundle; - import org.eclipse.osgi.util.NLS; public class SeamCoreMessages { Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCorePlugin.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCorePlugin.java 2007-12-20 00:12:39 UTC (rev 5391) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCorePlugin.java 2007-12-20 00:17:11 UTC (rev 5392) @@ -18,13 +18,8 @@ import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.IScopeContext; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.wst.common.project.facet.core.IFacetedProject; -import org.eclipse.wst.common.project.facet.core.IProjectFacet; -import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.eclipse.wst.common.project.facet.core.internal.FacetedProject; import org.jboss.tools.common.log.BaseUIPlugin; import org.jboss.tools.common.log.IPluginLog; -import org.jboss.tools.seam.internal.core.project.facet.ISeamCoreConstants; import org.osgi.framework.BundleContext; /** Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntime.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntime.java 2007-12-20 00:12:39 UTC (rev 5391) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntime.java 2007-12-20 00:17:11 UTC (rev 5392) @@ -10,8 +10,6 @@ ******************************************************************************/ package org.jboss.tools.seam.core.project.facet; -import java.io.File; - /** * @author eskimo * Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPackage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPackage.java 2007-12-20 00:12:39 UTC (rev 5391) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPackage.java 2007-12-20 00:17:11 UTC (rev 5392) @@ -11,7 +11,6 @@ package org.jboss.tools.seam.internal.core; -import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Map; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/AntCopyUtils.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/AntCopyUtils.java 2007-12-20 00:12:39 UTC (rev 5391) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/AntCopyUtils.java 2007-12-20 00:17:11 UTC (rev 5392) @@ -11,7 +11,6 @@ package org.jboss.tools.seam.internal.core.project.facet; import java.io.File; import java.io.FileFilter; -import java.io.FileNotFoundException; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/DataSourceXmlDeployer.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/DataSourceXmlDeployer.java 2007-12-20 00:12:39 UTC (rev 5391) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/DataSourceXmlDeployer.java 2007-12-20 00:17:11 UTC (rev 5392) @@ -10,25 +10,15 @@ ******************************************************************************/ package org.jboss.tools.seam.internal.core.project.facet; -import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; -import org.eclipse.wst.common.frameworks.datamodel.IDataModel; -import org.eclipse.wst.common.project.facet.core.IFacetedProject; -import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.eclipse.wst.server.core.IModule; -import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.ServerCore; import org.eclipse.wst.server.core.model.ServerBehaviourDelegate; import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamCoreConstants.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamCoreConstants.java 2007-12-20 00:12:39 UTC (rev 5391) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamCoreConstants.java 2007-12-20 00:17:11 UTC (rev 5392) @@ -11,8 +11,15 @@ package org.jboss.tools.seam.internal.core.project.facet; -public interface ISeamCoreConstants { +/** + * Old fashion way to define constants + * @author eskimo + */ +public interface ISeamCoreConstants { - public static final String SEAM_CORE_FACET_ID = "jst.seam"; //$NON-NLS-1$ + /** + * Seam Facet ID constant + */ + String SEAM_CORE_FACET_ID = "jst.seam"; //$NON-NLS-1$ } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java 2007-12-20 00:12:39 UTC (rev 5391) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java 2007-12-20 00:17:11 UTC (rev 5392) @@ -36,106 +36,168 @@ * Package name used session objects: actions, forms, conversations, beans * web pages backing beans */ - public static final String SESION_BEAN_PACKAGE_NAME = "action.package"; //$NON-NLS-1$ + String SESION_BEAN_PACKAGE_NAME = "action.package"; //$NON-NLS-1$ /** * Package name for Entity Beans classes */ - public static final String ENTITY_BEAN_PACKAGE_NAME = "model.package"; //$NON-NLS-1$ + String ENTITY_BEAN_PACKAGE_NAME = "model.package"; //$NON-NLS-1$ /** * Connection profile name */ - public static final String SEAM_CONNECTION_PROFILE = "seam.project.connection.profile"; //$NON-NLS-1$ + String SEAM_CONNECTION_PROFILE = "seam.project.connection.profile"; //$NON-NLS-1$ /** * Selected deployment type */ - public static final String JBOSS_AS_DEPLOY_AS = "seam.project.deployment.type"; //$NON-NLS-1$ + String JBOSS_AS_DEPLOY_AS = "seam.project.deployment.type"; //$NON-NLS-1$ /** * Test project name that was created for Seam Web Project */ - public static final String SEAM_TEST_PROJECT = "seam.test.project"; //$NON-NLS-1$ + String SEAM_TEST_PROJECT = "seam.test.project"; //$NON-NLS-1$ /** * Seam runtime name that should be used to create seam artifacts: * forms, actions, conversations and entities */ - public static final String SEAM_RUNTIME_NAME = "seam.runtime.name"; //$NON-NLS-1$ + String SEAM_RUNTIME_NAME = "seam.runtime.name"; //$NON-NLS-1$ /** * Package where tests for seam artifacts should be placed inside the * test project */ - public static final String TEST_CASES_PACKAGE_NAME = "test.package"; //$NON-NLS-1$ + String TEST_CASES_PACKAGE_NAME = "test.package"; //$NON-NLS-1$ /** - * Ejb project name created fro Seam Web Project in EAR deployment configuration + * Ejb project name created from Seam Web Project in EAR deployment configuration */ - public static final String SEAM_EJB_PROJECT = "seam.ejb.project"; //$NON-NLS-1$ + String SEAM_EJB_PROJECT = "seam.ejb.project"; //$NON-NLS-1$ /** * Ear project name created for Seam Web Project in EAR deployment configuration */ - public static final String SEAM_EAR_PROJECT = "seam.ear.project"; //$NON-NLS-1$ + String SEAM_EAR_PROJECT = "seam.ear.project"; //$NON-NLS-1$ // Seam Facet Wizard Page parameters constants - public static final String SEAM_PROJECT_NAME = "project.name"; //$NON-NLS-1$ + /** + * Project name token + */ + String SEAM_PROJECT_NAME = "project.name"; //$NON-NLS-1$ - public static final String SEAM_PROJECT_INSTANCE = "seam.project.instance"; //$NON-NLS-1$ + /** + * Selected Seam Project + */ + String SEAM_PROJECT_INSTANCE = "seam.project.instance"; //$NON-NLS-1$ + + /** + * Path to JBoss AS server + */ + String JBOSS_AS_HOME = "jboss.home"; //$NON-NLS-1$ - public static final String JBOSS_AS_HOME = "jboss.home"; //$NON-NLS-1$ + /** + * Selected Database type + */ + String DB_TYPE = "database.type"; //$NON-NLS-1$ - public static final String DB_TYPE = "database.type"; //$NON-NLS-1$ + /** + * Selected hibernate dialect + */ + String HIBERNATE_DIALECT = "hibernate.dialect"; //$NON-NLS-1$ - public static final String HIBERNATE_DIALECT = "hibernate.dialect"; //$NON-NLS-1$ + /** + * JDBC driver class name token + */ + String JDBC_DRIVER_CLASS_NAME = "hibernate.connection.driver_class"; //$NON-NLS-1$ - public static final String JDBC_DRIVER_CLASS_NAME = "hibernate.connection.driver_class"; //$NON-NLS-1$ + /** + * JDBC Connection URL token + */ + String JDBC_URL_FOR_DB = "hibernate.connection.url"; //$NON-NLS-1$ - public static final String JDBC_URL_FOR_DB = "hibernate.connection.url"; //$NON-NLS-1$ + /** + * Connection user name token + */ + String DB_USER_NAME = "hibernate.connection.username"; //$NON-NLS-1$ - public static final String DB_USER_NAME = "hibernate.connection.username"; //$NON-NLS-1$ + /** + * Connection user name password + */ + String DB_USER_PASSWORD = "hibernate.connection.password"; //$NON-NLS-1$ - public static final String DB_USER_PASSWORD = "hibernate.connection.password"; //$NON-NLS-1$ + /** + * Schema name + */ + String DB_SCHEMA_NAME = "schema.property"; //$NON-NLS-1$ - public static final String DB_SCHEMA_NAME = "schema.property"; //$NON-NLS-1$ + /** + * Catalog name + */ + String DB_CATALOG_NAME = "catalog.property"; //$NON-NLS-1$ - public static final String DB_CATALOG_NAME = "catalog.property"; //$NON-NLS-1$ + /** + * DB tables already exists in database check box value + */ + String DB_ALREADY_EXISTS = "database.exists"; //$NON-NLS-1$ - public static final String DB_ALREADY_EXISTS = "database.exists"; //$NON-NLS-1$ + /** + * Recreate database tables and data on deploy check box value + */ + String RECREATE_TABLES_AND_DATA_ON_DEPLOY = "database.drop"; //$NON-NLS-1$ - public static final String RECREATE_TABLES_AND_DATA_ON_DEPLOY = "database.drop"; //$NON-NLS-1$ + /** + * TODO + */ + String HIBERNATE_HBM2DDL_AUTO = "hibernate.hbm2ddl.auto"; //$NON-NLS-1$ - public static final String HIBERNATE_HBM2DDL_AUTO = "hibernate.hbm2ddl.auto"; //$NON-NLS-1$ + /** + * Driver file name + */ + String JDBC_DRIVER_JAR_PATH = "driver.file"; //$NON-NLS-1$ - public static final String JDBC_DRIVER_JAR_PATH = "driver.file"; //$NON-NLS-1$ - // TODO: should be moved to org.jboss.tools.seam.ui.wizard.IParameter // why is this a property when it is always derivable from sesion_bean_package_name ? - public static final String SESION_BEAN_PACKAGE_PATH = "action.package.path"; //$NON-NLS-1$ + String SESION_BEAN_PACKAGE_PATH = "action.package.path"; //$NON-NLS-1$ // TODO: should be moved to org.jboss.tools.seam.ui.wizard.IParameter // why is this a property when it is always derivable from entity_bean_package_name ? - public static final String ENTITY_BEAN_PACKAGE_PATH = "model.package.path"; //$NON-NLS-1$ + String ENTITY_BEAN_PACKAGE_PATH = "model.package.path"; //$NON-NLS-1$ // TODO: should be moved to org.jboss.tools.seam.ui.wizard.IParameter // why is this a property when it is always derivable from test_package_path ? - public static final String TEST_CASES_PACKAGE_PATH = "test.package.path"; //$NON-NLS-1$ + String TEST_CASES_PACKAGE_PATH = "test.package.path"; //$NON-NLS-1$ - public static final String JBOSS_SEAM_HOME = "seam.home.folder"; //$NON-NLS-1$ + /** + * Selected Seam Runtime home folder + */ + String JBOSS_SEAM_HOME = "seam.home.folder"; //$NON-NLS-1$ - public static final String WEB_CONTENTS_FOLDER = "seam.project.web.root.folder"; //$NON-NLS-1$ + /** + * Seam project web contents root folder + */ + String WEB_CONTENTS_FOLDER = "seam.project.web.root.folder"; //$NON-NLS-1$ - public static final String DEPLOY_AS_WAR = "war"; //$NON-NLS-1$ + /** + * WAR deployment constant + */ + String DEPLOY_AS_WAR = "war"; //$NON-NLS-1$ - public static final String DEPLOY_AS_EAR = "ear"; //$NON-NLS-1$ + /** + * EAR deployment constant + */ + String DEPLOY_AS_EAR = "ear"; //$NON-NLS-1$ - public static final String JBOSS_AS_TARGET_SERVER = "seam.project.deployment.target"; //$NON-NLS-1$ + /** + * Selected Server Runtime + */ + String JBOSS_AS_TARGET_SERVER = "seam.project.deployment.target"; //$NON-NLS-1$ - public static final String JBOSS_AS_TARGET_RUNTIME = "seam.project.deployment.runtime"; //$NON-NLS-1$ + /** + * Selected Server + */ + String JBOSS_AS_TARGET_RUNTIME = "seam.project.deployment.runtime"; //$NON-NLS-1$ - } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2007-12-20 00:12:39 UTC (rev 5391) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2007-12-20 00:17:11 UTC (rev 5392) @@ -18,7 +18,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.PlatformUI; import org.eclipse.wst.common.project.facet.core.IDelegate; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.jboss.tools.seam.core.SeamCoreMessages; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPostInstallDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPostInstallDelegate.java 2007-12-20 00:12:39 UTC (rev 5391) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPostInstallDelegate.java 2007-12-20 00:17:11 UTC (rev 5392) @@ -11,7 +11,6 @@ package org.jboss.tools.seam.internal.core.project.facet; import java.io.File; - import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; @@ -28,46 +27,74 @@ import org.jboss.tools.jst.web.server.RegistrationHelper; /** + * <p>Facet Post install delegate that handles: + * <ul> + * <li>JDBC driver copying to server libraries folder; + * <li> registering faceted project on the selected server; + * <li>deploying datasource .xml file to the selected server; + * </ul> + * </p> * @author eskimo * */ -public class SeamFacetPostInstallDelegate implements - IDelegate, ISeamFacetDataModelProperties{ - - /* (non-Javadoc) - * @see org.eclipse.wst.common.project.facet.core.IDelegate#execute(org.eclipse.core.resources.IProject, org.eclipse.wst.common.project.facet.core.IProjectFacetVersion, java.lang.Object, org.eclipse.core.runtime.IProgressMonitor) +public class SeamFacetPostInstallDelegate implements IDelegate, ISeamFacetDataModelProperties { + /** + * Description + * @param project + * target project + * @param fv + * Facet version information + * @param config + * configuration parameters + * @param monitor + * progress monitor + * @throws CoreException + * never throws */ - public void execute(final IProject project, IProjectFacetVersion fv, - Object config, IProgressMonitor monitor) throws CoreException { - final IDataModel model = (IDataModel)config; + public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException { + final IDataModel model = (IDataModel) config; - IServer server = (IServer)model.getProperty(JBOSS_AS_TARGET_SERVER); - JBossServer jbs = (JBossServer)server.loadAdapter(JBossServer.class, new NullProgressMonitor()); - if( jbs != null ) { - String[] driverJars = (String[])model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH); + IServer server = (IServer) model.getProperty(JBOSS_AS_TARGET_SERVER); + JBossServer jbs = (JBossServer) server.loadAdapter(JBossServer.class, new NullProgressMonitor()); + if (jbs != null) { + String[] driverJars = (String[]) model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH); String configFolder = jbs.getConfigDirectory(); - AntCopyUtils.copyFiles(driverJars, new File(configFolder,"lib"),false); + AntCopyUtils.copyFiles(driverJars, new File(configFolder, "lib"), false); } if (server != null) { RegistrationHelper.runRegisterInServerJob(project, server); IPath filePath = new Path("resources").append(project.getName() + "-ds.xml"); - if(!isWarConfiguration(model)) { + if (!isWarConfiguration(model)) { IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot(); - IProject earProjectToBeImported = wsRoot.getProject(project.getName()+"-ear"); - new DataSourceXmlDeployer(earProjectToBeImported,server,filePath).schedule(); + IProject earProjectToBeImported = wsRoot.getProject(project.getName() + "-ear"); + new DataSourceXmlDeployer(earProjectToBeImported, server, filePath).schedule(); } else { - new DataSourceXmlDeployer(project,server,filePath).schedule(); + new DataSourceXmlDeployer(project, server, filePath).schedule(); } } } /** + * Never used + * @throws CoreException + * never throws + * @return + * always return null * @see org.eclipse.wst.common.project.facet.core.IActionConfigFactory#create() */ - public Object create() throws CoreException {return null; } - + public Object create() throws CoreException { + return null; + } + /** + * Define if WAR deployment configuration is used + * @param model + * configuration parameters + * @return + * true - is Seam Project uses EAR deployment + * false - EAR + */ public static boolean isWarConfiguration(IDataModel model) { return "war".equals(model.getProperty(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS)); //$NON-NLS-1$ } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java 2007-12-20 00:12:39 UTC (rev 5391) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java 2007-12-20 00:17:11 UTC (rev 5392) @@ -16,15 +16,12 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.datatools.connectivity.IConnectionProfile; import org.eclipse.datatools.connectivity.ProfileManager; import org.eclipse.datatools.connectivity.drivers.DriverManager; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IDelegate; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; -import org.jboss.tools.seam.core.SeamCorePlugin; -import org.osgi.service.prefs.BackingStoreException; public class SeamFacetPreInstallDelegate implements IDelegate { Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2007-12-20 00:12:39 UTC (rev 5391) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2007-12-20 00:17:11 UTC (rev 5392) @@ -16,16 +16,13 @@ import java.util.HashMap; import java.util.Map; -import org.eclipse.core.internal.preferences.PreferencesService; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; import org.eclipse.core.runtime.preferences.DefaultScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; -import org.eclipse.core.runtime.preferences.IScopeContext; import org.jboss.tools.seam.core.SeamCorePlugin; -import org.jboss.tools.seam.core.SeamPreferences; import org.jboss.tools.seam.core.project.facet.SeamProjectPreferences; import org.jboss.tools.seam.core.project.facet.SeamRuntime; import org.jboss.tools.seam.core.project.facet.SeamRuntimeListConverter; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/SeamAnnotations.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/SeamAnnotations.java 2007-12-20 00:12:39 UTC (rev 5391) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/SeamAnnotations.java 2007-12-20 00:17:11 UTC (rev 5392) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.seam.internal.core.scanner.java; -import org.jboss.tools.seam.core.SeamCoreMessages; /** * Java annotations processed in building seam model Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/TypeScanner.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/TypeScanner.java 2007-12-20 00:12:39 UTC (rev 5391) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/TypeScanner.java 2007-12-20 00:17:11 UTC (rev 5392) @@ -23,8 +23,6 @@ import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.core.dom.Annotation; -import org.eclipse.jdt.core.dom.MethodDeclaration; import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants; import org.eclipse.jdt.internal.compiler.classfmt.ClassFileReader; import org.eclipse.jdt.internal.compiler.env.EnumConstantSignature; @@ -33,8 +31,6 @@ import org.eclipse.jdt.internal.compiler.env.IBinaryField; import org.eclipse.jdt.internal.compiler.env.IBinaryMethod; import org.eclipse.jdt.internal.compiler.impl.Constant; -import org.eclipse.jdt.internal.compiler.impl.IntConstant; -import org.eclipse.jdt.internal.compiler.impl.StringConstant; import org.jboss.tools.seam.core.BeanType; import org.jboss.tools.seam.core.BijectedAttributeType; import org.jboss.tools.seam.core.IValueInfo; @@ -48,7 +44,6 @@ import org.jboss.tools.seam.internal.core.SeamJavaComponentDeclaration; import org.jboss.tools.seam.internal.core.scanner.LoadedDeclarations; import org.jboss.tools.seam.internal.core.scanner.Util; -import org.jboss.tools.seam.internal.core.scanner.java.AnnotatedASTNode; import org.jboss.tools.seam.internal.core.scanner.java.SeamAnnotations; import org.jboss.tools.seam.internal.core.scanner.java.ValueInfo; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java 2007-12-20 00:12:39 UTC (rev 5391) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java 2007-12-20 00:17:11 UTC (rev 5392) @@ -111,10 +111,8 @@ ((FolderImpl)o.getParent()).updateChildFile(o, f.getLocation().toFile()); if(o.getParent() == null) { boolean b = isLikelyComponentSource(f); - System.out.println("--1 " + b); if(!b) return null; o = EclipseResourceUtil.getObjectByResource(o.getModel(), f); - System.out.println("--2 " + o); if(o == null) return null; } } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidator.java 2007-12-20 00:12:39 UTC (rev 5391) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidator.java 2007-12-20 00:17:11 UTC (rev 5392) @@ -12,21 +12,18 @@ import java.util.Set; -import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.jface.text.BadLocationException; import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; -import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.ISeamTextSourceReference; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.SeamPreferences; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.Document; /** * Abstract implementation of ISeamvalidator @@ -96,10 +93,12 @@ target).getLineOfOffset(offset) + 1); } catch (BadLocationException e) { - SeamCorePlugin.getPluginLog().logError(e); + SeamCorePlugin.getPluginLog().logError( + "Exception occurred during error line number calculation",e); return; } catch (CoreException e) { - SeamCorePlugin.getPluginLog().logError(e); + SeamCorePlugin.getPluginLog().logError( + "Exception occurred during error line number calculation",e); return; } if (!ignore) {