JBoss Tools SVN: r32860 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl: definition and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-12 12:54:14 -0400 (Tue, 12 Jul 2011)
New Revision: 32860
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/XMLNodeReference.java
Log:
JBIDE-9313
https://issues.jboss.org/browse/JBIDE-9313
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-07-12 16:38:40 UTC (rev 32859)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-07-12 16:54:14 UTC (rev 32860)
@@ -98,7 +98,8 @@
private Map<String, Set<IInjectionPoint>> injectionPointsByType = new HashMap<String, Set<IInjectionPoint>>();
- BeansXMLData beansXMLData = new BeansXMLData();
+ BeansXMLData allBeansXMLData = new BeansXMLData();
+ BeansXMLData projectBeansXMLData = new BeansXMLData();
public CDIProject() {}
@@ -130,7 +131,7 @@
public List<INodeReference> getAlternativeClasses() {
List<INodeReference> result = new ArrayList<INodeReference>();
- Set<INodeReference> typeAlternatives = beansXMLData.getTypeAlternatives();
+ Set<INodeReference> typeAlternatives = allBeansXMLData.getTypeAlternatives();
synchronized (typeAlternatives) {
result.addAll(typeAlternatives);
}
@@ -139,26 +140,32 @@
public List<INodeReference> getAlternativeStereotypes() {
List<INodeReference> result = new ArrayList<INodeReference>();
- Set<INodeReference> stereotypeAlternatives = beansXMLData.getStereotypeAlternatives();
+ Set<INodeReference> stereotypeAlternatives = allBeansXMLData.getStereotypeAlternatives();
synchronized (stereotypeAlternatives) {
result.addAll(stereotypeAlternatives);
}
return result;
}
+ /**
+ * Selected in at least one bean archive
+ *
+ * @param fullQualifiedTypeName
+ * @return
+ */
public boolean isClassAlternativeActivated(String fullQualifiedTypeName) {
- return beansXMLData.getTypeAlternativeTypes().contains(fullQualifiedTypeName);
+ return allBeansXMLData.getTypeAlternativeTypes().contains(fullQualifiedTypeName);
}
public List<INodeReference> getAlternatives(String fullQualifiedTypeName) {
List<INodeReference> result = new ArrayList<INodeReference>();
- Set<INodeReference> typeAlternatives = beansXMLData.getTypeAlternatives();
+ Set<INodeReference> typeAlternatives = allBeansXMLData.getTypeAlternatives();
synchronized (typeAlternatives) {
for (INodeReference r: typeAlternatives) {
if(fullQualifiedTypeName.equals(r.getValue())) result.add(r);
}
}
- Set<INodeReference> stereotypeAlternatives = beansXMLData.getStereotypeAlternatives();
+ Set<INodeReference> stereotypeAlternatives = allBeansXMLData.getStereotypeAlternatives();
synchronized (stereotypeAlternatives) {
for (INodeReference r: stereotypeAlternatives) {
if(fullQualifiedTypeName.equals(r.getValue())) result.add(r);
@@ -203,7 +210,7 @@
}
public Set<IBean> getResolvedBeans(Set<IBean> result, boolean attemptToResolveAmbiguousness) {
- if(result.size() < 2 || !attemptToResolveAmbiguousness) {
+ if(result.size() < 1 || !attemptToResolveAmbiguousness) {
return result;
}
@@ -212,6 +219,10 @@
Set<IBean> disabled = null;
while(it.hasNext()) {
IBean b = it.next();
+ if(!b.isEnabled() || b instanceof IDecorator || b instanceof IInterceptor) {
+ it.remove();
+ continue;
+ }
if(b.isAlternative()) {
if(b.isSelectedAlternative()) {
containsAlternatives = true;
@@ -582,7 +593,7 @@
public List<INodeReference> getDecoratorClasses() {
List<INodeReference> result = new ArrayList<INodeReference>();
- Set<INodeReference> decorators = beansXMLData.getDecorators();
+ Set<INodeReference> decorators = allBeansXMLData.getDecorators();
synchronized (decorators) {
result.addAll(decorators);
}
@@ -591,7 +602,7 @@
public List<INodeReference> getDecoratorClasses(String fullQualifiedTypeName) {
List<INodeReference> result = new ArrayList<INodeReference>();
- Set<INodeReference> decorators = beansXMLData.getDecorators();
+ Set<INodeReference> decorators = allBeansXMLData.getDecorators();
synchronized (decorators) {
for (INodeReference r: decorators) {
if(fullQualifiedTypeName.equals(r.getValue())) result.add(r);
@@ -602,7 +613,7 @@
public List<INodeReference> getInterceptorClasses() {
List<INodeReference> result = new ArrayList<INodeReference>();
- Set<INodeReference> interceptors = beansXMLData.getInterceptors();
+ Set<INodeReference> interceptors = allBeansXMLData.getInterceptors();
synchronized (interceptors) {
result.addAll(interceptors);
}
@@ -612,7 +623,7 @@
public List<INodeReference> getInterceptorClasses(
String fullQualifiedTypeName) {
List<INodeReference> result = new ArrayList<INodeReference>();
- Set<INodeReference> interceptors = beansXMLData.getInterceptors();
+ Set<INodeReference> interceptors = allBeansXMLData.getInterceptors();
synchronized (interceptors) {
for (INodeReference r: interceptors) {
if(fullQualifiedTypeName.equals(r.getValue())) result.add(r);
@@ -621,12 +632,24 @@
return result;
}
+ /**
+ * True if type qualifiedName is selected in this module, false otherwise.
+ *
+ * @param qualifiedName
+ * @return true if type qualifiedName is selected in this module
+ */
public boolean isTypeAlternative(String qualifiedName) {
- return beansXMLData.getTypeAlternativeTypes().contains(qualifiedName);
+ return projectBeansXMLData.getTypeAlternativeTypes().contains(qualifiedName);
}
+ /**
+ * True if stereotype qualifiedName is selected in this module, false otherwise.
+ *
+ * @param qualifiedName
+ * @return true if stereotype qualifiedName is selected in this module
+ */
public boolean isStereotypeAlternative(String qualifiedName) {
- return beansXMLData.getStereotypeAlternativeTypes().contains(qualifiedName);
+ return projectBeansXMLData.getStereotypeAlternativeTypes().contains(qualifiedName);
}
public Set<IType> getQualifierTypes() {
@@ -1239,20 +1262,27 @@
}
void rebuildXML() {
- beansXMLData.clean();
+ allBeansXMLData.clean();
+ projectBeansXMLData.clean();
Set<BeansXMLDefinition> beanXMLs = n.getDefinitions().getBeansXMLDefinitions();
for (BeansXMLDefinition b: beanXMLs) {
+ IPath p = b.getPath();
+ boolean t = (!p.lastSegment().endsWith(".jar") && p.segment(0).equals(getNature().getProject().getName()));
for (INodeReference r: b.getInterceptors()) {
- beansXMLData.addInterceptor(r);
+ allBeansXMLData.addInterceptor(r);
+ if(t) projectBeansXMLData.addInterceptor(r);
}
for (INodeReference r: b.getDecorators()) {
- beansXMLData.addDecorator(r);
+ allBeansXMLData.addDecorator(r);
+ if(t) projectBeansXMLData.addDecorator(r);
}
for (INodeReference r: b.getStereotypeAlternatives()) {
- beansXMLData.addStereotypeAlternative(r);
+ allBeansXMLData.addStereotypeAlternative(r);
+ if(t) projectBeansXMLData.addStereotypeAlternative(r);
}
for (INodeReference r: b.getTypeAlternatives()) {
- beansXMLData.addTypeAlternative(r);
+ allBeansXMLData.addTypeAlternative(r);
+ if(t) projectBeansXMLData.addTypeAlternative(r);
}
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/XMLNodeReference.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/XMLNodeReference.java 2011-07-12 16:38:40 UTC (rev 32859)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/XMLNodeReference.java 2011-07-12 16:54:14 UTC (rev 32860)
@@ -13,6 +13,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.PositionHolder;
import org.jboss.tools.common.text.INodeReference;
@@ -60,8 +61,12 @@
return object;
}
- public IFile getResource() {
- return (IFile)object.getAdapter(IFile.class);
+ public IResource getResource() {
+ IFile file = (IFile)object.getAdapter(IFile.class);
+ if(file == null) {
+ return EclipseResourceUtil.getProject(object);
+ }
+ return file;
}
}
14 years, 9 months
JBoss Tools SVN: r32859 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-07-12 12:38:40 -0400 (Tue, 12 Jul 2011)
New Revision: 32859
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
Log:
JBIDE-9319 - eap defaults to server deployment now
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2011-07-12 14:07:10 UTC (rev 32858)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2011-07-12 16:38:40 UTC (rev 32859)
@@ -38,6 +38,7 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.jst.server.core.IWebModule;
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.model.IURLProvider;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
@@ -47,6 +48,7 @@
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
/**
@@ -63,9 +65,14 @@
setAttribute("id", getAttribute("id", (String)"") + new Date().getTime()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
setUsername("admin"); //$NON-NLS-1$
setPassword("admin"); //$NON-NLS-1$
- setDeployLocationType(isAS50() ? IDeployableServer.DEPLOY_SERVER : IDeployableServer.DEPLOY_METADATA);
+ boolean defaultServerDeployment = isAS50() || isEAP(getServer());
+ setDeployLocationType(defaultServerDeployment ? IDeployableServer.DEPLOY_SERVER : IDeployableServer.DEPLOY_METADATA);
}
+ public static boolean isEAP(IServer server) {
+ return server.getServerType().getId().startsWith(IJBossToolingConstants.EAP_SERVER_PREFIX);
+ }
+
private boolean isAS50() {
return getServer().getServerType().getRuntimeType().getId().equals(SERVER_AS_50);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2011-07-12 14:07:10 UTC (rev 32858)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2011-07-12 16:38:40 UTC (rev 32859)
@@ -78,7 +78,7 @@
}
public static boolean isEAP(IRuntime rt) {
- return rt.getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap."); //$NON-NLS-1$
+ return rt.getRuntimeType().getId().startsWith(IJBossToolingConstants.EAP_RUNTIME_PREFIX);
}
@Override
14 years, 9 months
JBoss Tools SVN: r32858 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-07-12 10:07:10 -0400 (Tue, 12 Jul 2011)
New Revision: 32858
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlAbstractForEachTemplate.java
Log:
https://issues.jboss.org/browse/JBIDE-9294 , Possibility set repeat times was added.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlAbstractForEachTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlAbstractForEachTemplate.java 2011-07-12 13:19:35 UTC (rev 32857)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlAbstractForEachTemplate.java 2011-07-12 14:07:10 UTC (rev 32858)
@@ -31,8 +31,8 @@
*/
public abstract class JstlAbstractForEachTemplate extends VpeAbstractTemplate {
- protected final int TIMES_TO_ITERATE = 3;
-
+ private static int iterateTimes = 3;
+
public JstlAbstractForEachTemplate() {
super();
}
@@ -46,12 +46,19 @@
VpeChildrenInfo spanInfo = new VpeChildrenInfo(span);
creationData.addChildrenInfo(spanInfo);
- for(int i = 0; i < TIMES_TO_ITERATE; i++) {
+ for(int i = 0; i < iterateTimes; i++) {
for (Node child : children) {
spanInfo.addSourceChild(child);
}
}
return creationData;
}
+
+ public static int getIterateTimes() {
+ return iterateTimes;
+ }
+ public static void setIterateTimes(int newIterateTimes) {
+ iterateTimes = newIterateTimes;
+ }
}
14 years, 9 months
JBoss Tools SVN: r32857 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-12 09:19:35 -0400 (Tue, 12 Jul 2011)
New Revision: 32857
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java
Log:
[JBIDE-9215] cleaned imports
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-12 13:19:05 UTC (rev 32856)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-12 13:19:35 UTC (rev 32857)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal;
-import java.text.MessageFormat;
import java.util.HashMap;
import org.eclipse.core.runtime.CoreException;
@@ -22,8 +21,6 @@
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
-import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher;
import org.jboss.ide.eclipse.as.core.publishers.JSTPublisherXMLToucher;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
@@ -32,10 +29,8 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType;
import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server;
import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
-import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities;
14 years, 9 months
JBoss Tools SVN: r32856 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-12 09:19:05 -0400 (Tue, 12 Jul 2011)
New Revision: 32856
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java
Log:
[JBIDE-9215] cleaned imports
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2011-07-12 13:18:51 UTC (rev 32855)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2011-07-12 13:19:05 UTC (rev 32856)
@@ -31,7 +31,6 @@
import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
-import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities;
14 years, 9 months
JBoss Tools SVN: r32855 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-12 09:18:51 -0400 (Tue, 12 Jul 2011)
New Revision: 32855
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java
Log:
[JBIDE-9215] cleaned imports
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2011-07-12 13:18:18 UTC (rev 32854)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2011-07-12 13:18:51 UTC (rev 32855)
@@ -14,9 +14,7 @@
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
-import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.UnitedServerListener;
-import org.jboss.ide.eclipse.as.core.server.UnitedServerListenerManager;
import org.jboss.ide.eclipse.as.core.util.FileUtil;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
14 years, 9 months
JBoss Tools SVN: r32854 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-12 09:18:18 -0400 (Tue, 12 Jul 2011)
New Revision: 32854
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java
Log:
[JBIDE-9215] removed unneeded method
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java 2011-07-12 13:17:24 UTC (rev 32853)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java 2011-07-12 13:18:18 UTC (rev 32854)
@@ -57,13 +57,6 @@
protected abstract String getServerHome(IJBossServerRuntime runtime);
- private void setServerHome(String serverHome, IJBossServerRuntime runtime,
- ILaunchConfigurationWorkingCopy launchConfig) throws CoreException {
- if (!isCustomConfigLocation(runtime)) {
- JBossLaunchConfigProperties.setServerHome(serverHome, runtime, launchConfig);
- }
- }
-
protected boolean isCustomConfigLocation(IJBossServerRuntime runtime) {
return runtime.getConfigLocation().equals(IJBossRuntimeResourceConstants.SERVER);
}
14 years, 9 months
JBoss Tools SVN: r32853 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-12 09:17:24 -0400 (Tue, 12 Jul 2011)
New Revision: 32853
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java
Log:
[JBIDE-9215] cleaned imports
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java 2011-07-12 13:17:05 UTC (rev 32852)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java 2011-07-12 13:17:24 UTC (rev 32853)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.v7;
-import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -21,7 +20,6 @@
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.SubProgressMonitor;
import org.eclipse.debug.core.DebugEvent;
@@ -30,13 +28,10 @@
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.model.IProcess;
import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
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.extensions.events.ServerLogger;
-import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher;
-import org.jboss.ide.eclipse.as.core.publishers.JSTPublisherXMLToucher;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
@@ -44,10 +39,8 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
-import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler;
import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
-import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities;
public class DelegatingJBoss7ServerBehavior extends DelegatingServerBehavior {
14 years, 9 months
JBoss Tools SVN: r32852 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-12 09:17:05 -0400 (Tue, 12 Jul 2011)
New Revision: 32852
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
Log:
[JBIDE-9215] cleaned imports
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-07-12 13:16:25 UTC (rev 32851)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-07-12 13:17:05 UTC (rev 32852)
@@ -21,7 +21,6 @@
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.SubProgressMonitor;
import org.eclipse.debug.core.DebugEvent;
@@ -30,13 +29,10 @@
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.model.IProcess;
import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
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.extensions.events.ServerLogger;
-import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher;
-import org.jboss.ide.eclipse.as.core.publishers.JSTPublisherXMLToucher;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
@@ -44,10 +40,8 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
-import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler;
import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
-import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities;
/**
* @deprecated replaced by {@link DelegatingJBoss7ServerBehavior}
14 years, 9 months
JBoss Tools SVN: r32851 - trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-12 09:16:25 -0400 (Tue, 12 Jul 2011)
New Revision: 32851
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java
Log:
[JBIDE-9215] cleaned imports
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java 2011-07-12 13:16:08 UTC (rev 32850)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java 2011-07-12 13:16:25 UTC (rev 32851)
@@ -22,11 +22,9 @@
import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.SERVER_STATE;
import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.SHUTDOWN;
-import java.io.EOFException;
import java.io.File;
import java.io.IOException;
import java.net.UnknownHostException;
-import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import org.eclipse.core.runtime.IProgressMonitor;
14 years, 9 months