Author: vrubezhny
Date: 2007-10-17 13:54:58 -0400 (Wed, 17 Oct 2007)
New Revision: 4303
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF
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/SeamFacetProjectCreationDataModelProvider.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-926 DataSourceXMLDeployer chooses first server
that matches runtime when several may match
Registration in the server selected is added
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2007-10-17 17:38:27
UTC (rev 4302)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2007-10-17 17:54:58
UTC (rev 4303)
@@ -37,7 +37,8 @@
org.jboss.ide.eclipse.as.core,
org.eclipse.wst.server.core,
org.eclipse.core.filesystem,
- org.eclipse.jst.j2ee.ejb
+ org.eclipse.jst.j2ee.ejb,
+ org.jboss.tools.jst.web
Provide-Package: org.jboss.tools.seam.core,
org.jboss.tools.seam.internal.core,
org.jboss.tools.seam.internal.core.scanner,
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-10-17
17:38:27 UTC (rev 4302)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPostInstallDelegate.java 2007-10-17
17:54:58 UTC (rev 4303)
@@ -32,6 +32,8 @@
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.eclipse.wst.server.core.IServer;
+import org.jboss.tools.jst.web.server.RegistrationHelper;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.osgi.service.prefs.BackingStoreException;
@@ -81,6 +83,11 @@
} catch (BackingStoreException e) {
SeamCorePlugin.getPluginLog().logError(e);
}
+
+ IServer server = (IServer)model.getProperty(JBOSS_AS_TARGET_SERVER);
+ if (server != null) {
+ RegistrationHelper.runRegisterInServerJob(project, server);
+ }
}
/**
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java 2007-10-17
17:38:27 UTC (rev 4302)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java 2007-10-17
17:54:58 UTC (rev 4303)
@@ -80,6 +80,10 @@
FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
IDataModel seamFacet = map.getFacetDataModel( ISeamCoreConstants.SEAM_CORE_FACET_ID
);
seamFacet.setProperty( ISeamFacetDataModelProperties.JBOSS_AS_TARGET_RUNTIME,
propertyValue );
+ } else if (propertyName.equals(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_SERVER))
{
+ FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
+ IDataModel seamFacet = map.getFacetDataModel( ISeamCoreConstants.SEAM_CORE_FACET_ID
);
+ seamFacet.setProperty( ISeamFacetDataModelProperties.JBOSS_AS_TARGET_SERVER,
propertyValue );
}
return super.propertySet(propertyName, propertyValue);