JBoss Tools SVN: r31383 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-05-19 10:57:51 -0400 (Thu, 19 May 2011)
New Revision: 31383
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-8959 - fixes for as7,
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-05-19 14:54:06 UTC (rev 31382)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-05-19 14:57:51 UTC (rev 31383)
@@ -66,7 +66,7 @@
type="org.jboss.ide.eclipse.as.core.server.startupConfiguration"/>
<launchConfigurationTabGroup
- class="org.jboss.ide.eclipse.as.ui.launch.JBossLaunchConfigurationTabGroup"
+ class="org.jboss.ide.eclipse.as.ui.launch.JBoss7LaunchConfigurationTabGroup"
description="%jbossLaunchconfigurationTabGroupDescription"
id="org.jboss.ide.eclipse.as.core.jboss7LaunchTabGroup"
type="org.jboss.ide.eclipse.as.core.server.JBoss7StartupConfiguration"/>
13 years, 5 months
JBoss Tools SVN: r31382 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: server/internal and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-05-19 10:54:06 -0400 (Thu, 19 May 2011)
New Revision: 31382
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
Log:
JBIDE-8959 - fixes for as7,
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2011-05-19 14:43:08 UTC (rev 31381)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2011-05-19 14:54:06 UTC (rev 31382)
@@ -61,12 +61,13 @@
}
public boolean isComplete() throws PollingException {
- JBossBehaviourDelegate del = server.getDelegate();
- if( del instanceof IProcessProvider ) {
- IProcess p = ((IProcessProvider)del).getProcess();
- return p == null || p.isTerminated();
- }
- return true;
+// JBossBehaviourDelegate del = server.getDelegate();
+// if( del instanceof IProcessProvider ) {
+// IProcess p = ((IProcessProvider)del).getProcess();
+// boolean b = p == null || p.isTerminated();
+// System.out.println(p + " " + b); //$NON-NLS-1$
+// }
+ return false;
}
public void failureHandled(Properties properties) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-05-19 14:43:08 UTC (rev 31381)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-05-19 14:54:06 UTC (rev 31382)
@@ -136,6 +136,8 @@
for (int i = 0; i < size; i++) {
if (process != null && process.equals(events[i].getSource()) && events[i].getKind() == DebugEvent.TERMINATE) {
DebugPlugin.getDefault().removeDebugEventListener(this);
+ if( pollThread != null )
+ pollThread.cancel();
forceStop();
addProcessTerminatedEvent();
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2011-05-19 14:43:08 UTC (rev 31381)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2011-05-19 14:54:06 UTC (rev 31382)
@@ -27,6 +27,7 @@
setAttribute(DEPLOY_DIRECTORY_TYPE, DEPLOY_SERVER);
setAttribute(IJBossToolingConstants.WEB_PORT_DETECT, false);
setAttribute(IJBossToolingConstants.WEB_PORT, IJBossToolingConstants.JBOSS_WEB_DEFAULT_PORT);
+ setAttribute(IJBossToolingConstants.STARTUP_POLLER_KEY, JBoss7ManagerServicePoller.POLLER_ID);
}
public boolean hasJMXProvider() {
return false;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-05-19 14:43:08 UTC (rev 31381)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-05-19 14:54:06 UTC (rev 31382)
@@ -87,24 +87,12 @@
if( pollThread != null ) {
pollThread.cancel();
}
- IServerStatePoller poller = PollThreadUtils.getPoller(JBoss7ManagerServicePoller.POLLER_ID, expectedState, getServer());
+ //IServerStatePoller poller = PollThreadUtils.getPoller(JBoss7ManagerServicePoller.POLLER_ID, expectedState, getServer());
+ IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, getServer());
this.pollThread = new PollThread(expectedState, poller, this);
pollThread.start();
}
- @Override
- public void serverStarting() {
- //super.serverStarting();
- setServerStarting();
- pollServer(IServerStatePoller.SERVER_UP);
- }
-
- @Override
- public void serverStopping() {
- super.serverStopping();
- pollServer(IServerStatePoller.SERVER_DOWN);
- }
-
private void initDebugListener(IProcess process) {
DebugPlugin.getDefault().addDebugEventListener(serverProcessListener = new JBossServerLifecycleListener());
}
@@ -113,6 +101,8 @@
if( serverProcessListener != null ) {
DebugPlugin.getDefault().removeDebugEventListener(serverProcessListener);
serverProcess = null;
+ if( pollThread != null )
+ pollThread.cancel();
}
}
13 years, 5 months
JBoss Tools SVN: r31381 - trunk/build/aggregate/site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-05-19 10:43:08 -0400 (Thu, 19 May 2011)
New Revision: 31381
Modified:
trunk/build/aggregate/site/index-template.html
trunk/build/aggregate/site/index.html
Log:
bump M6 -> M7 in update site html page
Modified: trunk/build/aggregate/site/index-template.html
===================================================================
--- trunk/build/aggregate/site/index-template.html 2011-05-19 14:13:11 UTC (rev 31380)
+++ trunk/build/aggregate/site/index-template.html 2011-05-19 14:43:08 UTC (rev 31381)
@@ -41,7 +41,7 @@
</p>
<ul>
- <li><a href="http://download.jboss.org/jbosstools/updates/indigo/M6">JBoss Tools Requirements - Composite Mirror - Indigo M6</a></li>
+ <li><a href="http://download.jboss.org/jbosstools/updates/indigo/M7">JBoss Tools Requirements - Composite Mirror - Indigo M7</a></li>
</ul>
</td>
</tr>
Modified: trunk/build/aggregate/site/index.html
===================================================================
--- trunk/build/aggregate/site/index.html 2011-05-19 14:13:11 UTC (rev 31380)
+++ trunk/build/aggregate/site/index.html 2011-05-19 14:43:08 UTC (rev 31381)
@@ -41,7 +41,7 @@
</p>
<ul>
- <li><a href="http://download.jboss.org/jbosstools/updates/indigo/M6">JBoss Tools Requirements - Composite Mirror - Indigo M6</a></li>
+ <li><a href="http://download.jboss.org/jbosstools/updates/indigo/M7">JBoss Tools Requirements - Composite Mirror - Indigo M7</a></li>
</ul>
</td>
</tr>
13 years, 5 months
JBoss Tools SVN: r31380 - in trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi: configurators and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: fbricon
Date: 2011-05-19 10:13:11 -0400 (Thu, 19 May 2011)
New Revision: 31380
Modified:
trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/Messages.java
trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/configurators/CDIProjectConfigurator.java
trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/messages.properties
Log:
JBIDE-8962 : only add the CDI facet if the correct Web or EJB facets are installed
Modified: trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/Messages.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/Messages.java 2011-05-19 13:48:33 UTC (rev 31379)
+++ trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/Messages.java 2011-05-19 14:13:11 UTC (rev 31380)
@@ -19,7 +19,7 @@
*/
public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.jboss.tools.maven.cdi.messages"; //$NON-NLS-1$
- public static String CDIProjectConfigurator_The_project_does_not_contain_the_Web_Module_facet;
+ public static String CDIProjectConfigurator_The_project_does_not_contain_required_facets;
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
Modified: trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/configurators/CDIProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/configurators/CDIProjectConfigurator.java 2011-05-19 13:48:33 UTC (rev 31379)
+++ trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/configurators/CDIProjectConfigurator.java 2011-05-19 14:13:11 UTC (rev 31380)
@@ -45,7 +45,9 @@
private static final String CDI_API_ARTIFACT_ID = "cdi-api"; //$NON-NLS-1$
protected static final IProjectFacet dynamicWebFacet;
+ protected static final IProjectFacet ejbFacet;
protected static final IProjectFacetVersion dynamicWebVersion;
+ protected static final IProjectFacetVersion ejbVersion;
protected static final IProjectFacet cdiFacet;
protected static final IProjectFacetVersion cdiVersion;
@@ -56,6 +58,8 @@
static {
dynamicWebFacet = ProjectFacetsManager.getProjectFacet("jst.web"); //$NON-NLS-1$
dynamicWebVersion = dynamicWebFacet.getVersion("2.5"); //$NON-NLS-1$
+ ejbFacet = ProjectFacetsManager.getProjectFacet("jst.ejb"); //$NON-NLS-1$
+ ejbVersion = ejbFacet.getVersion("3.0"); //$NON-NLS-1$
cdiFacet = ProjectFacetsManager.getProjectFacet("jst.cdi"); //$NON-NLS-1$
cdiVersion = cdiFacet.getVersion("1.0"); //$NON-NLS-1$
m2Facet = ProjectFacetsManager.getProjectFacet("jboss.m2"); //$NON-NLS-1$
@@ -83,7 +87,7 @@
if (cdiVersion != null) {
final IFacetedProject fproj = ProjectFacetsManager.create(project);
if ( (fproj != null) && ("war".equals(packaging) || "ejb".equals(packaging)) ) { //$NON-NLS-1$
- installWarFacets(fproj, cdiVersion, monitor);
+ installDefaultFacets(fproj, cdiVersion, monitor);
}
CDIUtil.enableCDI(project, false, new NullProgressMonitor());
}
@@ -117,16 +121,20 @@
}
- private void installWarFacets(IFacetedProject fproj, String cdiVersion,IProgressMonitor monitor) throws CoreException {
+ private void installDefaultFacets(IFacetedProject fproj, String cdiVersion,IProgressMonitor monitor) throws CoreException {
+ IProjectFacetVersion currentWebVersion = fproj.getProjectFacetVersion(dynamicWebFacet);
+ IProjectFacetVersion currentEjbVersion = fproj.getProjectFacetVersion(ejbFacet);
- if (!fproj.hasProjectFacet(dynamicWebFacet)) {
+ if ((currentWebVersion != null && currentWebVersion.compareTo(dynamicWebVersion)> -1)
+ || (currentEjbVersion != null && currentEjbVersion.compareTo(dynamicWebVersion)> -1)) {
+ installCDIFacet(fproj, cdiVersion, monitor);
+ } else {
String name = "";
if (fproj.getProject() != null) {
name = fproj.getProject().getName();
}
- MavenCDIActivator.log(NLS.bind(Messages.CDIProjectConfigurator_The_project_does_not_contain_the_Web_Module_facet, name));
+ MavenCDIActivator.log(NLS.bind(Messages.CDIProjectConfigurator_The_project_does_not_contain_required_facets, name));
}
- installCDIFacet(fproj, cdiVersion, monitor);
installM2Facet(fproj, monitor);
}
@@ -143,9 +151,7 @@
}
private String getCDIVersion(MavenProject mavenProject) {
- String version = null;
- version = Activator.getDefault().getDependencyVersion(mavenProject, CDI_API_GROUP_ID, CDI_API_ARTIFACT_ID);
-
+ String version = Activator.getDefault().getDependencyVersion(mavenProject, CDI_API_GROUP_ID, CDI_API_ARTIFACT_ID);
return version;
}
Modified: trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/messages.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/messages.properties 2011-05-19 13:48:33 UTC (rev 31379)
+++ trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/messages.properties 2011-05-19 14:13:11 UTC (rev 31380)
@@ -1 +1 @@
-CDIProjectConfigurator_The_project_does_not_contain_the_Web_Module_facet=The {0} project doesn't contain the Web Module facet.
+CDIProjectConfigurator_The_project_does_not_contain_required_facets=The {0} project does not contain the Dynamic Web Module facet or the EJB Module facet.
13 years, 5 months
JBoss Tools SVN: r31379 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-05-19 09:48:33 -0400 (Thu, 19 May 2011)
New Revision: 31379
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java
Log:
JBIDE-8960 - removal of deprecated code
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java 2011-05-19 13:45:44 UTC (rev 31378)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java 2011-05-19 13:48:33 UTC (rev 31379)
@@ -14,9 +14,6 @@
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.core.ExtensionManager;
-import org.jboss.ide.eclipse.as.core.publishers.JstPublisher;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
import org.jboss.ide.eclipse.as.test.ASTest;
import org.jboss.ide.eclipse.as.test.util.IOUtil;
import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
13 years, 5 months
JBoss Tools SVN: r31378 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-05-19 09:45:44 -0400 (Thu, 19 May 2011)
New Revision: 31378
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeployableMockDeploymentTester.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java
Log:
JBIDE-8960 - removal of deprecated code
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeployableMockDeploymentTester.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeployableMockDeploymentTester.java 2011-05-19 13:34:14 UTC (rev 31377)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeployableMockDeploymentTester.java 2011-05-19 13:45:44 UTC (rev 31378)
@@ -12,10 +12,7 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.internal.ServerPreferences;
-import org.jboss.ide.eclipse.as.core.ExtensionManager;
import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
-import org.jboss.ide.eclipse.as.core.publishers.SingleFilePublisher;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentModulePrefs;
@@ -43,7 +40,6 @@
SingleDeployableFactory.makeDeployable(file);
mods = SingleDeployableFactory.getFactory().getModules();
assertEquals(mods.length, 1);
- verifyPublisher(mods[0], SingleFilePublisher.class);
server = ServerRuntimeUtils.addModule(server, mods[0]);
IPath deployRoot = new Path(ServerRuntimeUtils.getDeployRoot(server));
deployRoot.toFile().mkdirs();
@@ -133,7 +129,6 @@
SingleDeployableFactory.makeDeployable(folder);
mods = SingleDeployableFactory.getFactory().getModules();
assertEquals(mods.length, 1);
- verifyPublisher(mods[0], SingleFilePublisher.class);
return mods;
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java 2011-05-19 13:34:14 UTC (rev 31377)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java 2011-05-19 13:45:44 UTC (rev 31378)
@@ -12,10 +12,7 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.wst.server.core.IModule;
-import org.jboss.ide.eclipse.as.core.ExtensionManager;
import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
-import org.jboss.ide.eclipse.as.core.publishers.SingleFilePublisher;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentModulePrefs;
@@ -36,7 +33,6 @@
SingleDeployableFactory.makeDeployable(file);
mods = SingleDeployableFactory.getFactory().getModules();
assertEquals(mods.length, 1);
- verifyPublisher(mods[0], SingleFilePublisher.class);
server = ServerRuntimeUtils.addModule(server, mods[0]);
IPath deployRoot = new Path(ServerRuntimeUtils.getDeployRoot(server));
deployRoot.toFile().mkdirs();
@@ -118,7 +114,6 @@
SingleDeployableFactory.makeDeployable(folder);
mods = SingleDeployableFactory.getFactory().getModules();
assertEquals(mods.length, 1);
- verifyPublisher(mods[0], SingleFilePublisher.class);
return mods;
}
@@ -170,7 +165,6 @@
SingleDeployableFactory.makeDeployable(file);
mods = SingleDeployableFactory.getFactory().getModules();
assertEquals(mods.length, 1);
- verifyPublisher(mods[0], SingleFilePublisher.class);
server = ServerRuntimeUtils.addModule(server, mods[0]);
ArrayList<IPath> changed2 = MockPublishMethod.changed;
ArrayList<IPath> removed2 = MockPublishMethod.removed;
@@ -250,13 +244,6 @@
}
- protected void verifyPublisher(IModule module, Class c) {
-// IModule[] mod = new IModule[] { module };
-// IJBossServerPublisher publisher = ExtensionManager
-// .getDefault().getPublisher(server, mod, "local");
-// assertTrue(publisher.getClass().equals(c));
- }
-
protected IFile createFile(String filename, String contents) throws CoreException, IOException {
IFile resource = project.getFile(filename);
IOUtil.setContents(resource, contents);
13 years, 5 months
JBoss Tools SVN: r31377 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-05-19 09:34:14 -0400 (Thu, 19 May 2011)
New Revision: 31377
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractJSTPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/NullPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/UnifiedPublisher.java
Log:
JBIDE-8960 - removal of deprecated code
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractJSTPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractJSTPublisher.java 2011-05-19 13:33:20 UTC (rev 31376)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractJSTPublisher.java 2011-05-19 13:34:14 UTC (rev 31377)
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.core.publishers;
-
-
-@Deprecated
-public abstract class AbstractJSTPublisher extends AbstractServerToolsPublisher {
- public AbstractJSTPublisher() {}
-}
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2011-05-19 13:33:20 UTC (rev 31376)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2011-05-19 13:34:14 UTC (rev 31377)
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.core.publishers;
-
-@Deprecated
-public class JstPublisher extends AbstractJSTPublisher {
- protected String getTargetedPublishMethodId() {
- return LocalPublishMethod.LOCAL_PUBLISH_METHOD;
- }
-}
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/NullPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/NullPublisher.java 2011-05-19 13:33:20 UTC (rev 31376)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/NullPublisher.java 2011-05-19 13:34:14 UTC (rev 31377)
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.core.publishers;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.model.IModuleResourceDelta;
-import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
-import org.jboss.ide.eclipse.as.core.Messages;
-import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
-
-/**
- *
- * @author rob.stryker(a)jboss.com
- */
-public class NullPublisher implements IJBossServerPublisher {
-
- public int getPublishState() {
- return IServer.PUBLISH_STATE_NONE;
- }
- public boolean accepts(String method, IServer server, IModule[] module) {
- return true;
- }
-
- public IStatus publishModule(
- IJBossServerPublishMethod method,
- IServer server, IModule[] module,
- int publishType, IModuleResourceDelta[] delta,
- IProgressMonitor monitor) throws CoreException {
- return new Status(IStatus.WARNING, JBossServerCorePlugin.PLUGIN_ID,
- IEventCodes.NO_PUBLISHER_ROOT_CODE,
- NLS.bind(Messages.NoPublisherFound, module[module.length-1]), null);
- }
-}
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2011-05-19 13:33:20 UTC (rev 31376)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2011-05-19 13:34:14 UTC (rev 31377)
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.core.publishers;
-
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher;
-import org.jboss.ide.eclipse.as.core.util.ServerConverter;
-
-@Deprecated
-public class SingleFilePublisher extends JBoss7JSTPublisher {
- protected boolean forceZipModule(IModule[] moduleTree) {
- return false;
- }
-
- public boolean accepts(String method, IServer server, IModule[] module) {
- IDeployableServer ds = ServerConverter.getDeployableServer(server);
-// if( verifyModuleType(module, SingleDeployableFactory.MODULE_TYPE)) {
-// IJBTModule del = (IJBTModule)module[module.length-1].loadAdapter(IJBTModule.class, new NullProgressMonitor());
-// if( del != null && (del.isBinary() || !ds.zipsWTPDeployments())) {
-// return true;
-// }
-// }
- return false;
- }
-}
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/UnifiedPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/UnifiedPublisher.java 2011-05-19 13:33:20 UTC (rev 31376)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/UnifiedPublisher.java 2011-05-19 13:34:14 UTC (rev 31377)
@@ -1,7 +0,0 @@
-package org.jboss.ide.eclipse.as.core.publishers;
-
-import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher;
-
-public class UnifiedPublisher extends JBoss7JSTPublisher {
-
-}
13 years, 5 months
JBoss Tools SVN: r31376 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core: jbosscore/org/jboss/ide/eclipse/as/core/publishers and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-05-19 09:33:20 -0400 (Thu, 19 May 2011)
New Revision: 31376
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
JBIDE-8959 - fixes for as7,
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2011-05-19 13:21:28 UTC (rev 31375)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2011-05-19 13:33:20 UTC (rev 31376)
@@ -43,7 +43,7 @@
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities;
-/**O
+/**
* Class suitable for parsing any properly formed servertools-api module
*/
public abstract class AbstractServerToolsPublisher implements IJBossServerPublisher {
@@ -203,7 +203,7 @@
append(IJBossServerConstants.TEMP_DEPLOY).makeAbsolute();
try {
- File temp = deployRoot.toFile().createTempFile(module.getName(), ".tmp", deployRoot.toFile()); //$NON-NLS-1$
+ File temp = File.createTempFile(module.getName(), ".tmp", deployRoot.toFile()); //$NON-NLS-1$
IPath tempFile = new Path(temp.getAbsolutePath());
list.addAll(Arrays.asList(PublishUtil.packModuleIntoJar(moduleTree[moduleTree.length-1], tempFile)));
String parentFolder = deployPath.removeLastSegments(1).toString();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-05-19 13:21:28 UTC (rev 31375)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-05-19 13:33:20 UTC (rev 31376)
@@ -94,7 +94,8 @@
@Override
public void serverStarting() {
- super.serverStarting();
+ //super.serverStarting();
+ setServerStarting();
pollServer(IServerStatePoller.SERVER_UP);
}
@@ -109,8 +110,10 @@
}
private void disposeServerProcessListener() {
- DebugPlugin.getDefault().removeDebugEventListener(serverProcessListener);
- serverProcess = null;
+ if( serverProcessListener != null ) {
+ DebugPlugin.getDefault().removeDebugEventListener(serverProcessListener);
+ serverProcess = null;
+ }
}
@Override
@@ -163,7 +166,8 @@
try {
if (force) {
- serverProcess.terminate();
+ if( serverProcess != null )
+ serverProcess.terminate();
} else {
serverStopping();
// TODO: for now only local, implement for remote afterwards
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-05-19 13:21:28 UTC (rev 31375)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-05-19 13:33:20 UTC (rev 31376)
@@ -699,6 +699,13 @@
supportsShutdown="true"
supportsStartup="true">
</serverPoller>
+ <serverPoller
+ class="org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManagerServicePoller"
+ id="org.jboss.ide.eclipse.as.core.server.JBoss7ManagerServicePoller"
+ name="JBoss 7 Manager Service Poller"
+ supportsShutdown="true"
+ supportsStartup="true">
+ </serverPoller>
</extension>
@@ -1102,24 +1109,10 @@
<extension
point="org.jboss.ide.eclipse.as.core.publishers">
<publisher
- class="org.jboss.ide.eclipse.as.core.publishers.UnifiedPublisher"
+ class="org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher"
priority="15"
zipDelegate="false">
</publisher>
- <!--
- <publisher
- class="org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher"
- priority="6">
- </publisher>
- <publisher
- class="org.jboss.ide.eclipse.as.core.publishers.JstPublisher"
- priority="5">
- </publisher>
- <publisher
- class="org.jboss.ide.eclipse.as.core.publishers.NullPublisher"
- priority="0">
- </publisher>
- -->
</extension>
<extension
point="org.eclipse.jdt.core.classpathContainerInitializer">
13 years, 5 months
JBoss Tools SVN: r31375 - branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-05-19 09:21:28 -0400 (Thu, 19 May 2011)
New Revision: 31375
Modified:
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml
Log:
[JBIDE-8928] added visibility expression to create instance menu contribution
Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml
===================================================================
--- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2011-05-19 13:21:18 UTC (rev 31374)
+++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2011-05-19 13:21:28 UTC (rev 31375)
@@ -664,6 +664,18 @@
label="%command.createinstance.label"
style="push"
tooltip="%command.createinstance.tooltip">
+ <visibleWhen
+ checkEnabled="true">
+ <with
+ variable="selection">
+ <iterate>
+ <not>
+ <adapt
+ type="org.jboss.tools.deltacloud.core.DeltaCloudImage" />
+ </not>
+ </iterate>
+ </with>
+ </visibleWhen>
</command>
</menuContribution>
<menuContribution
13 years, 5 months
JBoss Tools SVN: r31374 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-05-19 09:21:18 -0400 (Thu, 19 May 2011)
New Revision: 31374
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml
Log:
[JBIDE-8928] added visibility expression to create instance menu contribution
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2011-05-19 12:20:36 UTC (rev 31373)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2011-05-19 13:21:18 UTC (rev 31374)
@@ -672,6 +672,18 @@
label="%command.createinstance.label"
style="push"
tooltip="%command.createinstance.tooltip">
+ <visibleWhen
+ checkEnabled="true">
+ <with
+ variable="selection">
+ <iterate>
+ <not>
+ <adapt
+ type="org.jboss.tools.deltacloud.core.DeltaCloudImage" />
+ </not>
+ </iterate>
+ </with>
+ </visibleWhen>
</command>
</menuContribution>
<menuContribution
13 years, 5 months