JBoss Tools SVN: r33955 - in trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core: internal and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-16 01:11:07 -0400 (Tue, 16 Aug 2011)
New Revision: 33955
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/Activator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitBehaviourDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitUtils.java
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/module/
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/module/GitProjectModuleFactoryDelegate.java
Log:
[JBIDE-9511] added stub publishers, started egit utils (that the publisher shall use)
Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/Activator.java (from rev 33923, trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/Activator.java)
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/Activator.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/Activator.java 2011-08-16 05:11:07 UTC (rev 33955)
@@ -0,0 +1,32 @@
+package org.jboss.ide.eclipse.as.egit.core.internal;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.egit.core";
+
+ private static BundleContext context;
+
+ static BundleContext getContext() {
+ return context;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext bundleContext) throws Exception {
+ Activator.context = bundleContext;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext bundleContext) throws Exception {
+ Activator.context = null;
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/Activator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitBehaviourDelegate.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitBehaviourDelegate.java 2011-08-16 05:11:07 UTC (rev 33955)
@@ -0,0 +1,64 @@
+package org.jboss.ide.eclipse.as.egit.core.internal;
+
+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.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.internal.IJBossBehaviourDelegate;
+
+public class EgitBehaviourDelegate implements IJBossBehaviourDelegate {
+
+ private static final String ID = "egit";
+
+ @Override
+ public String getBehaviourTypeId() {
+ return ID;
+ }
+
+ @Override
+ public void setActualBehaviour(DelegatingServerBehavior actualBehaviour) {
+ }
+
+ @Override
+ public void stop(boolean force) {
+ }
+
+ @Override
+ public void publishStart(IProgressMonitor monitor) throws CoreException {
+ }
+
+ @Override
+ public void publishFinish(IProgressMonitor monitor) throws CoreException {
+ }
+
+ @Override
+ public void onServerStarting() {
+ // do nothing
+ }
+
+ @Override
+ public void onServerStopping() {
+ // do nothing
+ }
+
+ @Override
+ public IStatus canChangeState(String launchMode) {
+ // do nothing
+ return Status.OK_STATUS;
+ }
+
+ /**
+ * remove from interface
+ */
+ @Override
+ public String getDefaultStopArguments() throws CoreException {
+ return null;
+ }
+
+ @Override
+ public void dispose() {
+ // do nothing
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitBehaviourDelegate.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitPublisher.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitPublisher.java 2011-08-16 05:11:07 UTC (rev 33955)
@@ -0,0 +1,30 @@
+package org.jboss.ide.eclipse.as.egit.core.internal;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+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.server.IJBossServerPublishMethod;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
+
+public class EgitPublisher implements IJBossServerPublisher {
+
+ @Override
+ public boolean accepts(String method, IServer server, IModule[] module) {
+ return false;
+ }
+
+ @Override
+ public int getPublishState() {
+ return 0;
+ }
+
+ @Override
+ public IStatus publishModule(IJBossServerPublishMethod method, IServer server, IModule[] module, int publishType,
+ IModuleResourceDelta[] delta, IProgressMonitor monitor) throws CoreException {
+ return null;
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitPublisher.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitUtils.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitUtils.java 2011-08-16 05:11:07 UTC (rev 33955)
@@ -0,0 +1,27 @@
+package org.jboss.ide.eclipse.as.egit.core.internal;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.egit.core.op.CommitOperation;
+
+public class EgitUtils {
+
+ public static void commit(IProject project) throws CoreException {
+
+ IFile[] commitables = new IFile[]{};
+ Collection<IFile> untracked = Collections.emptyList();
+ CommitOperation op = new CommitOperation(
+ commitables,
+ new ArrayList<IFile>(),
+ untracked,
+ "dummyAuthor",
+ "dummyCommitter",
+ "Initial commit");
+ op.execute(null);
+ }
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/module/GitProjectModuleFactoryDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/module/GitProjectModuleFactoryDelegate.java 2011-08-15 13:22:02 UTC (rev 33923)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/module/GitProjectModuleFactoryDelegate.java 2011-08-16 05:11:07 UTC (rev 33955)
@@ -1,28 +1,121 @@
-package org.jboss.ide.eclipse.as.egit.core.module;
+package org.jboss.ide.eclipse.as.egit.core.internal.module;
+import java.util.HashMap;
+
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
import org.eclipse.egit.core.project.RepositoryMapping;
+import org.eclipse.team.core.RepositoryProvider;
+import org.eclipse.team.internal.core.IRepositoryProviderListener;
+import org.eclipse.team.internal.core.RepositoryProviderManager;
import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.model.IModuleResource;
import org.eclipse.wst.server.core.model.ModuleDelegate;
+import org.eclipse.wst.server.core.util.ModuleFile;
import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate;
public class GitProjectModuleFactoryDelegate extends ProjectModuleFactoryDelegate {
-
+ public static final String FACTORY_ID = "org.jboss.ide.eclipse.as.egit.core.module.gitProjectModuleFactory"; //$NON-NLS-1$
+ public static final String MODULE_TYPE = "jbt.egit"; //$NON-NLS-1$
+ public static final String VERSION = "1.0"; //$NON-NLS-1$
+ private HashMap<String, IModule> moduleIdToModule;
+ private HashMap<IModule, GitProjectModuleDelegate> moduleToDelegate;
+ private IResourceChangeListener resourceListener;
public GitProjectModuleFactoryDelegate() {
- // TODO Auto-generated constructor stub
- System.out.println("blah");
}
+ public void initialize() {
+ moduleIdToModule = new HashMap<String, IModule>();
+ moduleToDelegate = new HashMap<IModule, GitProjectModuleDelegate>();
+ resourceListener = new IResourceChangeListener() {
+ public void resourceChanged(IResourceChangeEvent event) {
+ try {
+ event.getDelta().accept(new IResourceDeltaVisitor() {
+ public boolean visit(IResourceDelta delta) throws CoreException {
+ IResource r = delta.getResource();
+ if( r instanceof IProject ) {
+ incrementChanged((IProject)r);
+ }
+ return !(r instanceof IProject);
+ }
+ });
+ } catch( CoreException ce) {
+ // Um, in what circumstances does this happen? TODO
+ }
+ }
+ };
+ ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceListener, IResourceChangeEvent.POST_CHANGE | IResourceChangeEvent.PRE_DELETE);
+ RepositoryProviderManager.getInstance().addListener(new IRepositoryProviderListener() {
+ public void providerUnmapped(IProject project) {
+ if( moduleIdToModule != null ) {
+ IModule mod = moduleIdToModule.get(project.getName());
+ if( mod != null ) {
+ moduleIdToModule.remove(project.getName());
+ moduleToDelegate.remove(mod);
+ }
+ }
+ }
+ public void providerMapped(RepositoryProvider provider) {
+ clearCache(provider.getProject());
+ }
+ });
+ }
+ protected void incrementChanged(IProject p) {
+ IModule mod = moduleIdToModule.get(p.getName());
+ if( mod != null ) {
+ GitProjectModuleDelegate del = moduleToDelegate.get(mod);
+ del.updateTimestamp();
+ }
+ }
protected IModule createModule(IProject project) {
RepositoryMapping mapping = RepositoryMapping.getMapping(project);
- System.out.println(mapping);
+ if( mapping != null ) {
+ IModule module = createModule(project.getName(), project.getName(), MODULE_TYPE, VERSION, project);
+ moduleIdToModule.put(project.getName(), module);
+ moduleToDelegate.put(module, new GitProjectModuleDelegate(project));
+ return module;
+ }
return null;
}
@Override
public ModuleDelegate getModuleDelegate(IModule module) {
- // TODO Auto-generated method stub
- return null;
+ return moduleToDelegate.get(module);
}
+ public class GitProjectModuleDelegate extends ModuleDelegate {
+ private IProject project;
+ private long lastUpdated = System.currentTimeMillis();
+ public GitProjectModuleDelegate(IProject project) {
+ this.project = project;
+ }
+ public IModuleResource[] members() throws CoreException {
+ return new IModuleResource[]{
+ // This resource will be ignored, but, we need *SOMETHING* to sit here
+ new ModuleFile(project.getName(), new Path("/"), lastUpdated)
+ };
+ }
+
+ protected void updateTimestamp() {
+ lastUpdated = System.currentTimeMillis();
+ }
+ @Override
+ public IStatus validate() {
+ return Status.OK_STATUS;
+ }
+
+ @Override
+ public IModule[] getChildModules() {
+ return new IModule[0];
+ }
+ }
}
14 years, 8 months
JBoss Tools SVN: r33954 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-15 21:01:26 -0400 (Mon, 15 Aug 2011)
New Revision: 33954
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
Log:
https://issues.jboss.org/browse/JBIDE-9546
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-08-16 00:45:37 UTC (rev 33953)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-08-16 01:01:26 UTC (rev 33954)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -149,9 +148,9 @@
public List<INodeReference> getAlternatives(String fullQualifiedTypeName) {
List<INodeReference> result = new ArrayList<INodeReference>();
- Set<INodeReference> typeAlternatives = allBeansXMLData.getTypeAlternatives();
- Set<INodeReference> stereotypeAlternatives = allBeansXMLData.getStereotypeAlternatives();
synchronized (allBeansXMLData) {
+ Set<INodeReference> typeAlternatives = allBeansXMLData.getTypeAlternatives();
+ Set<INodeReference> stereotypeAlternatives = allBeansXMLData.getStereotypeAlternatives();
for (INodeReference r: typeAlternatives) {
if(fullQualifiedTypeName.equals(r.getValue())) result.add(r);
}
@@ -182,11 +181,11 @@
public Set<IBean> getBeans(String name, boolean attemptToResolveAmbiguousNames) {
Set<IBean> result = new HashSet<IBean>();
- Set<IBean> beans = beansByName.get(name);
- if(beans == null || beans.isEmpty()) {
- return result;
- }
synchronized (this) {
+ Set<IBean> beans = beansByName.get(name);
+ if(beans == null || beans.isEmpty()) {
+ return result;
+ }
result.addAll(beans);
}
return getResolvedBeans(result, attemptToResolveAmbiguousNames);
@@ -397,7 +396,6 @@
if(((ParametedType)t).isAssignableTo((ParametedType)type, false)) {
return true;
}
-
}
return false;
}
@@ -563,7 +561,7 @@
return result.toString();
}
- public Set<IBean> getBeans(IPath path) {
+ public synchronized Set<IBean> getBeans(IPath path) {
Set<IBean> result = new HashSet<IBean>();
Set<IBean> beans = beansByPath.get(path);
if(beans != null && !beans.isEmpty()) result.addAll(beans);
@@ -580,8 +578,8 @@
public List<INodeReference> getDecoratorClasses(String fullQualifiedTypeName) {
List<INodeReference> result = new ArrayList<INodeReference>();
- Set<INodeReference> decorators = allBeansXMLData.getDecorators();
synchronized (allBeansXMLData) {
+ Set<INodeReference> decorators = allBeansXMLData.getDecorators();
for (INodeReference r: decorators) {
if(fullQualifiedTypeName.equals(r.getValue())) result.add(r);
}
@@ -600,8 +598,8 @@
public List<INodeReference> getInterceptorClasses(
String fullQualifiedTypeName) {
List<INodeReference> result = new ArrayList<INodeReference>();
- Set<INodeReference> interceptors = allBeansXMLData.getInterceptors();
synchronized (allBeansXMLData) {
+ Set<INodeReference> interceptors = allBeansXMLData.getInterceptors();
for (INodeReference r: interceptors) {
if(fullQualifiedTypeName.equals(r.getValue())) result.add(r);
}
@@ -673,7 +671,7 @@
/* (non-Javadoc)
* @see org.jboss.tools.cdi.core.IBeanManager#getInterceptors()
*/
- public IInterceptor[] getInterceptors() {
+ public synchronized IInterceptor[] getInterceptors() {
return interceptors.toArray(new IInterceptor[interceptors.size()]);
}
@@ -775,24 +773,26 @@
Set<IObserverMethod> result = new HashSet<IObserverMethod>();
IParametedType eventType = getEventType(injectionPoint);
-
+
if(eventType != null) {
- for (IBean ib: allBeans) {
- if(!(ib instanceof IClassBean)) continue;
- IClassBean b = (IClassBean)ib;
- Set<IObserverMethod> ms = b.getObserverMethods();
- for (IObserverMethod m: ms) {
- IObserverMethod om = (IObserverMethod)m;
- Set<IParameter> params = om.getObservedParameters();
- if(!params.isEmpty()) {
- IParameter param = params.iterator().next();
- IParametedType paramType = param.getType();
- if(((ParametedType)eventType).isAssignableTo((ParametedType)paramType, true)
- && areMatchingEventQualifiers(param, injectionPoint)) {
- result.add(om);
+ synchronized(this) {
+ for (IBean ib: allBeans) {
+ if(!(ib instanceof IClassBean)) continue;
+ IClassBean b = (IClassBean)ib;
+ Set<IObserverMethod> ms = b.getObserverMethods();
+ for (IObserverMethod m: ms) {
+ IObserverMethod om = (IObserverMethod)m;
+ Set<IParameter> params = om.getObservedParameters();
+ if(!params.isEmpty()) {
+ IParameter param = params.iterator().next();
+ IParametedType paramType = param.getType();
+ if(((ParametedType)eventType).isAssignableTo((ParametedType)paramType, true)
+ && areMatchingEventQualifiers(param, injectionPoint)) {
+ result.add(om);
+ }
}
- }
- }
+ }
+ }
}
}
return result;
@@ -828,25 +828,27 @@
if(observedEventParameter.getBeanMethod() instanceof IObserverMethod) {
IParametedType paramType = observedEventParameter.getType();
- for (IBean ib: allBeans) {
- if(!(ib instanceof IClassBean)) {
- continue;
- }
- IClassBean b = (IClassBean)ib;
- Set<IInjectionPoint> ps = b.getInjectionPoints();
- for (IInjectionPoint p: ps) {
- if(p instanceof IInjectionPointField) {
- IParametedType eventType = getEventType(p);
- if(eventType != null && ((ParametedType)eventType).isAssignableTo((ParametedType)paramType, true)) {
- if(areMatchingEventQualifiers(observedEventParameter, p)) {
- result.put(((IInjectionPointField)p).getField(), p);
- }
+ synchronized(this) {
+ for (IBean ib: allBeans) {
+ if(!(ib instanceof IClassBean)) {
+ continue;
+ }
+ IClassBean b = (IClassBean)ib;
+ Set<IInjectionPoint> ps = b.getInjectionPoints();
+ for (IInjectionPoint p: ps) {
+ if(p instanceof IInjectionPointField) {
+ IParametedType eventType = getEventType(p);
+ if(eventType != null && ((ParametedType)eventType).isAssignableTo((ParametedType)paramType, true)) {
+ if(areMatchingEventQualifiers(observedEventParameter, p)) {
+ result.put(((IInjectionPointField)p).getField(), p);
+ }
+ }
}
}
}
- }
+ }
}
-
+
return new HashSet<IInjectionPoint>(result.values());
}
@@ -960,7 +962,7 @@
return qualifiersByPath.get(path);
}
- public Set<String> getScopeNames() {
+ public synchronized Set<String> getScopeNames() {
Set<String> result = new HashSet<String>();
result.addAll(scopes.keySet());
return result;
@@ -999,7 +1001,7 @@
CDICorePlugin.fire(new CDIProjectChangeEvent(this));
}
- void rebuildAnnotationTypes() {
+ synchronized void rebuildAnnotationTypes() {
stereotypes.clear();
stereotypesByPath.clear();
interceptorBindings.clear();
@@ -1134,59 +1136,47 @@
//Prevented double bean from library common for this and used project
return;
}
- String name = bean.getName();
- if(name != null && name.length() > 0) {
- Set<IBean> bs = beansByName.get(name);
- if(bs == null) {
- bs = new HashSet<IBean>();
- synchronized (this) {
+ synchronized(this) {
+ String name = bean.getName();
+ if(name != null && name.length() > 0) {
+ Set<IBean> bs = beansByName.get(name);
+ if(bs == null) {
+ bs = new HashSet<IBean>();
beansByName.put(name, bs);
}
- }
- synchronized (this) {
bs.add(bean);
namedBeans.add(bean);
}
- }
- IPath path = bean.getSourcePath();
- Set<IBean> bs = beansByPath.get(path);
- if(bs == null) {
- bs = new HashSet<IBean>();
- synchronized (this) {
+ IPath path = bean.getSourcePath();
+ Set<IBean> bs = beansByPath.get(path);
+ if(bs == null) {
+ bs = new HashSet<IBean>();
beansByPath.put(path, bs);
}
- }
- synchronized (this) {
- bs.add(bean);
- }
- if(bean.isAlternative()) {
synchronized (this) {
+ bs.add(bean);
+ }
+ if(bean.isAlternative()) {
alternatives.add(bean);
}
- }
- if(bean instanceof IDecorator) {
- synchronized (this) {
+ if(bean instanceof IDecorator) {
decorators.add((IDecorator)bean);
}
- }
- if(bean instanceof IInterceptor) {
- synchronized (this) {
+ if(bean instanceof IInterceptor) {
interceptors.add((IInterceptor)bean);
}
- }
- if(bean instanceof IClassBean) {
- IClassBean c = (IClassBean)bean;
- IType t = c.getBeanClass();
- if(t != null && !classBeans.containsKey(t)) {
- classBeans.put(t, c);
+ if(bean instanceof IClassBean) {
+ IClassBean c = (IClassBean)bean;
+ IType t = c.getBeanClass();
+ if(t != null && !classBeans.containsKey(t)) {
+ classBeans.put(t, c);
+ }
}
- }
- synchronized (this) {
allBeans.add(bean);
}
}
- void buildInjectionPoinsByType() {
+ synchronized void buildInjectionPoinsByType() {
injectionPointsByType.clear();
for (IBean b: allBeans) {
@@ -1207,28 +1197,30 @@
}
void rebuildXML() {
- allBeansXMLData.clean();
- projectBeansXMLData.clean();
- Set<BeansXMLDefinition> beanXMLs = n.getAllBeanXMLDefinitions();
- 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()) {
- allBeansXMLData.addInterceptor(r);
- if(t) projectBeansXMLData.addInterceptor(r);
+ synchronized(allBeansXMLData) {
+ allBeansXMLData.clean();
+ projectBeansXMLData.clean();
+ Set<BeansXMLDefinition> beanXMLs = n.getAllBeanXMLDefinitions();
+ 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()) {
+ allBeansXMLData.addInterceptor(r);
+ if(t) projectBeansXMLData.addInterceptor(r);
+ }
+ for (INodeReference r: b.getDecorators()) {
+ allBeansXMLData.addDecorator(r);
+ if(t) projectBeansXMLData.addDecorator(r);
+ }
+ for (INodeReference r: b.getStereotypeAlternatives()) {
+ allBeansXMLData.addStereotypeAlternative(r);
+ if(t) projectBeansXMLData.addStereotypeAlternative(r);
+ }
+ for (INodeReference r: b.getTypeAlternatives()) {
+ allBeansXMLData.addTypeAlternative(r);
+ if(t) projectBeansXMLData.addTypeAlternative(r);
+ }
}
- for (INodeReference r: b.getDecorators()) {
- allBeansXMLData.addDecorator(r);
- if(t) projectBeansXMLData.addDecorator(r);
- }
- for (INodeReference r: b.getStereotypeAlternatives()) {
- allBeansXMLData.addStereotypeAlternative(r);
- if(t) projectBeansXMLData.addStereotypeAlternative(r);
- }
- for (INodeReference r: b.getTypeAlternatives()) {
- allBeansXMLData.addTypeAlternative(r);
- if(t) projectBeansXMLData.addTypeAlternative(r);
- }
}
}
@@ -1303,7 +1295,7 @@
type = getNature().getType(s);
if(type != null) qualifiers.add(type);
}
-
+
return getBeans(attemptToResolveAmbiguousDependency, beanType, qualifiers.toArray(new IType[0]));
}
@@ -1343,10 +1335,8 @@
context.addBeanXML(f.getFullPath(), def);
}
}
-
-
+
context.applyWorkingCopy();
return old.isEmpty() ? null : old.iterator().next();
}
-
}
\ No newline at end of file
14 years, 8 months
JBoss Tools SVN: r33953 - in trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test: el and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-08-15 20:45:37 -0400 (Mon, 15 Aug 2011)
New Revision: 33953
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELReferencesQueryParticipantTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9473
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2011-08-16 00:33:27 UTC (rev 33952)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2011-08-16 00:45:37 UTC (rev 33953)
@@ -56,7 +56,8 @@
TestSuite suite = new TestSuite("Seam UI tests");
suite.addTestSuite(ELExprPartitionerTest.class);
- suite.addTestSuite(ELReferencesQueryParticipantTest.class);
+ //suite.addTestSuite(ELReferencesQueryParticipantTest.class);
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(ELReferencesQueryParticipantTest.class), "org.jboss.tools.seam.ui.test", new String[]{"projects/numberguess"}, new String[]{"numberguess"}));
suite.addTestSuite(OpenSeamComponentDialogTest.class);
suite.addTest(SeamComponentsViewAllTests.suite());
suite.addTest(SeamProjectNewWizardTest.suite());
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELReferencesQueryParticipantTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELReferencesQueryParticipantTest.java 2011-08-16 00:33:27 UTC (rev 33952)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELReferencesQueryParticipantTest.java 2011-08-16 00:45:37 UTC (rev 33953)
@@ -5,8 +5,9 @@
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.QualifiedName;
import org.jboss.tools.jst.web.kb.refactoring.ELReferencesQueryParticipant;
import org.jboss.tools.jst.web.kb.test.QueryParticipantTestUtils;
import org.jboss.tools.jst.web.kb.test.QueryParticipantTestUtils.MatchStructure;
@@ -15,52 +16,12 @@
public class ELReferencesQueryParticipantTest extends TestCase{
TestProjectProvider provider = null;
IProject project = null;
- boolean makeCopy = false;
- private static final String PROJECT_NAME = "numberguess";
- public static final QualifiedName IS_KB_NATURES_CHECK_NEED = new QualifiedName(
- "", "Is KB natures check"); //$NON-NLS-1$
- public static final QualifiedName IS_JSF_NATURES_CHECK_NEED = new QualifiedName(
- "", "Is JSF natures check"); //$NON-NLS-1$
- public static final QualifiedName IS_JSF_CHECK_NEED = new QualifiedName(
- "", "Is JSF check"); //$NON-NLS-1$
- private String isKbNatureCheck = null;
- private String isJsfNatureCheck = null;
- private String isJsfCheck = null;
-
public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.seam.ui.test", "projects/" + PROJECT_NAME, PROJECT_NAME, makeCopy);
- project = provider.getProject();
- Throwable exception = null;
-
- assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception);
- if (project != null) {
- isKbNatureCheck = project.getPersistentProperty(IS_KB_NATURES_CHECK_NEED);
- project.setPersistentProperty(IS_KB_NATURES_CHECK_NEED, //$NON-NLS-1$
- Boolean.toString(false));
- isJsfNatureCheck = project.getPersistentProperty(IS_JSF_NATURES_CHECK_NEED);
- project.setPersistentProperty(IS_JSF_NATURES_CHECK_NEED, //$NON-NLS-1$
- Boolean.toString(false));
- isJsfCheck = project.getPersistentProperty(IS_JSF_CHECK_NEED);
- project.setPersistentProperty(IS_JSF_CHECK_NEED, //$NON-NLS-1$
- Boolean.toString(false));
- }
+ IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember("numberguess");
+ this.project = project.getProject();
}
- protected void tearDown() throws Exception {
- if (project != null) {
- project.setPersistentProperty(IS_KB_NATURES_CHECK_NEED, //$NON-NLS-1$
- isKbNatureCheck);
- project.setPersistentProperty(IS_JSF_NATURES_CHECK_NEED, //$NON-NLS-1$
- isJsfNatureCheck);
- project.setPersistentProperty(IS_JSF_CHECK_NEED, //$NON-NLS-1$
- isJsfCheck);
- }
- if(provider != null) {
- provider.dispose();
- }
- }
-
public void testELReferencesQueryParticipantForType() throws CoreException{
ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>();
14 years, 8 months
JBoss Tools SVN: r33952 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-15 20:33:27 -0400 (Mon, 15 Aug 2011)
New Revision: 33952
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java
Log:
JBIDE-9483
https://issues.jboss.org/browse/JBIDE-9483
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java 2011-08-16 00:32:59 UTC (rev 33951)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java 2011-08-16 00:33:27 UTC (rev 33952)
@@ -198,26 +198,8 @@
}
private boolean updateServicesInSrcs() {
- Set<IFolder> fs = EclipseResourceUtil.getSourceFolders(project.getProject());
- IJavaProject javaProject = EclipseResourceUtil.getJavaProject(project.getProject());
- if(javaProject == null) {
- return false;
- }
- IClasspathEntry[] es = null;
- try {
- es = javaProject.getResolvedClasspath(true);
- } catch (CoreException e) {
- CDICorePlugin.getDefault().logError(e);
- return false;
- }
- for (int i = 0; i < es.length; i++) {
- if(es[i].getEntryKind() == IClasspathEntry.CPE_PROJECT) {
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(es[i].getPath().lastSegment());
- if(p != null && p.isAccessible()) {
- fs.addAll(EclipseResourceUtil.getSourceFolders(p.getProject()));
- }
- }
- }
+ Set<IFolder> fs = EclipseResourceUtil.getAllVisibleSourceFolders(project.getProject());
+
Map<FileAnyImpl, Long> newServices = new HashMap<FileAnyImpl, Long>();
boolean result = false;
for (IFolder folder: fs) {
14 years, 8 months
JBoss Tools SVN: r33951 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-15 20:32:59 -0400 (Mon, 15 Aug 2011)
New Revision: 33951
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
Log:
JBIDE-9483
https://issues.jboss.org/browse/JBIDE-9483
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2011-08-16 00:26:17 UTC (rev 33950)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2011-08-16 00:32:59 UTC (rev 33951)
@@ -860,7 +860,50 @@
}
return folders;
}
+
+ private static class SourceFoldersCollector {
+ IProject project;
+ Set<IFolder> folders = new HashSet<IFolder>();
+ Set<IProject> processed = new HashSet<IProject>();
+ SourceFoldersCollector(IProject project) {
+ this.project = project;
+ process(project);
+ }
+
+ void process(IProject project) {
+ if(processed.contains(project)) {
+ return;
+ }
+ processed.add(project);
+ folders.addAll(getSourceFolders(project));
+ IJavaProject javaProject = getJavaProject(project);
+ if(javaProject == null) {
+ return;
+ }
+ IClasspathEntry[] es = null;
+ try {
+ es = javaProject.getResolvedClasspath(true);
+ } catch (CoreException e) {
+ ModelPlugin.getDefault().logError(e);
+ return;
+ }
+ for (int i = 0; i < es.length; i++) {
+ if(es[i].getEntryKind() == IClasspathEntry.CPE_PROJECT
+ && (project == this.project || es[i].isExported())) {
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(es[i].getPath().lastSegment());
+ if(p != null && p.isAccessible()) {
+ process(p);
+ }
+ }
+ }
+ }
+ }
+
+ public static Set<IFolder> getAllVisibleSourceFolders(IProject project) {
+ return new SourceFoldersCollector(project).folders;
+ }
+
public static void openResource(IResource resource) {
XModelObject o = getObjectByResource(resource);
if(o == null) o = createObjectForResource(resource);
14 years, 8 months
JBoss Tools SVN: r33950 - trunk/deltacloud/tests/org.jboss.tools.deltacloud.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-15 20:26:17 -0400 (Mon, 15 Aug 2011)
New Revision: 33950
Modified:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.ui.bot.test/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.ui.bot.test/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-9470 test failures in org.jboss.tools.deltacloud.ui.bot.test
fixed most of the problems here but one problem left is how to configure delta cloud server to use in this test when it ran on hudson.
Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.ui.bot.test
___________________________________________________________________
Modified: svn:ignore
- target
buildlog.latest.txt
bin
build
+ target
buildlog.latest.txt
bin
build
swtbot.properties
screenshots
Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.ui.bot.test/pom.xml
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.ui.bot.test/pom.xml 2011-08-15 23:57:12 UTC (rev 33949)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.ui.bot.test/pom.xml 2011-08-16 00:26:17 UTC (rev 33950)
@@ -11,4 +11,48 @@
<artifactId>org.jboss.tools.deltacloud.ui.bot.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
+
+ <properties>
+ <systemProperties>-Dswtbot.test.properties.file=./swtbot.properties</systemProperties>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <useUIThread>false</useUIThread>
+ <skip>${swtbot.test.skip}</skip>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.jboss.tools.deltacloud.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${maven.antrun.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>default-swtbot-config</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <echo file="swtbot.properties" append="false">JAVA=1.6,${jboss.tools.jre.6}
+SS=password
+ </echo>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
14 years, 8 months
JBoss Tools SVN: r33949 - in trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test: src/org/jboss/tools/smooks/ui/bot/tests and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-15 19:57:12 -0400 (Mon, 15 Aug 2011)
New Revision: 33949
Added:
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/requirements.properties
Modified:
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/Project.java
Log:
https://issues.jboss.org/browse/JBIDE-9460 test failures in org.jboss.tools.smooks.ui.bot.test
added dependencies into pom.xml to install smooks when tests started by maven
-Pjbosstools-nightly-staging-composite
should be added to maven parameters to install smooks from nightly composite update site
Modified: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml 2011-08-15 23:48:41 UTC (rev 33948)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml 2011-08-15 23:57:12 UTC (rev 33949)
@@ -15,6 +15,7 @@
<properties>
<emma.filter>org.jboss.tools.smooks.*</emma.filter>
<emma.instrument.bundles>org.jboss.tools.smooks.ui,org.jboss.tools.smooks.core</emma.instrument.bundles>
+ <systemProperties>-Djbosstools.test.smooks.1.2.4=${requirement.build.root}/smooks-1.2.4</systemProperties>
</properties>
<build>
@@ -24,6 +25,19 @@
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<useUIThread>false</useUIThread>
+ <product>org.eclipse.sdk.ide</product>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.jboss.tools.smooks.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.sdk.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
</configuration>
</plugin>
</plugins>
Added: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/requirements.properties
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/requirements.properties (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/requirements.properties 2011-08-15 23:57:12 UTC (rev 33949)
@@ -0,0 +1 @@
+requirements=smooks-1.2.4
\ No newline at end of file
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/requirements.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/Project.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/Project.java 2011-08-15 23:48:41 UTC (rev 33948)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/tests/Project.java 2011-08-15 23:57:12 UTC (rev 33949)
@@ -1,10 +1,18 @@
package org.jboss.tools.smooks.ui.bot.tests;
+import org.eclipse.swt.widgets.MessageBox;
+
public class Project {
// Smooks project
public static final String PROJECT_NAME = "smookstest1";
- public static final String SMOOKS_PATH = "/home/jpeterka/lib/smooks-1.2.4";
+ public static final String SMOOKS_PATH_VAR_NAME = "jbosstools.test.smooks.1.2.4";
+ public static final String SMOOKS_PATH;
public static final String SMOOKS_LIBNAME = "smooks-1.2.4";
-
+ static {
+ SMOOKS_PATH = System.getProperty(SMOOKS_PATH_VAR_NAME);
+ if(SMOOKS_PATH==null) {
+ throw new IllegalStateException(java.text.MessageFormat.format("System property {''0''} is not defined", SMOOKS_PATH_VAR_NAME));
+ }
+ }
}
14 years, 8 months
JBoss Tools SVN: r33948 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-15 19:48:41 -0400 (Mon, 15 Aug 2011)
New Revision: 33948
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/requirements.properties
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-9461 test failures in org.jboss.tools.cdi.bot.test
configured CDI SWT Bot Tests to run from maven for CDI Version from nightly composite update site. This approachg should work considering that component build first builds and publishes result to composite nightly update site.
to run locally
svn co https://svn.jboss.org/repos/jbosstools/trunk/build/
svn co https://svn.jboss.org/repos/jbosstools/trunk/requirements
svn co https://svn.jboss.org/repos/jbosstools/trunk/cdi
cd cdi/tests/org.jboss.tools.cdi.bot.test
mvn clean integration-test -Pjbosstools-nightly-staging-composite -Djboss.tools.jre.6=/usr/lib/jvm/java-6-openjdk
to run on hudson build should inject jboss.tools.jre.6 through maven properties
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.bot.test
___________________________________________________________________
Modified: svn:ignore
- target
buildlog.latest.txt
bin
build
+ target
buildlog.latest.txt
bin
build
screenshots
swtbot.properties
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml 2011-08-15 23:38:14 UTC (rev 33947)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml 2011-08-15 23:48:41 UTC (rev 33948)
@@ -9,5 +9,63 @@
<groupId>org.jboss.tools.cdi.tests</groupId>
<artifactId>org.jboss.tools.cdi.bot.test</artifactId>
- <packaging>eclipse-plugin</packaging>
+ <packaging>eclipse-test-plugin</packaging>
+ <properties>
+ <systemProperties>-Dswtbot.test.properties.file=./swtbot.properties</systemProperties>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <useUIThread>false</useUIThread>
+ <skip>${swtbot.test.skip}</skip>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.jst.server_ui.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.jboss.ide.eclipse.as.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.jboss.tools.cdi.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.jboss.tools.richfaces.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${maven.antrun.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>default-swtbot-config</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <echo file="swtbot.properties" append="false">SERVER=JBOSS_AS,6.0,default,${requirement.build.root}/jboss-6.0.0.Final
+JAVA=1.6,${jboss.tools.jre.6}
+ </echo>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/requirements.properties
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/requirements.properties (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/requirements.properties 2011-08-15 23:48:41 UTC (rev 33948)
@@ -0,0 +1 @@
+requirements=jbossas-6.0.0.Final
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/requirements.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 8 months
JBoss Tools SVN: r33947 - in trunk/requirements: jbossas-6.0.0.Final and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-15 19:38:14 -0400 (Mon, 15 Aug 2011)
New Revision: 33947
Added:
trunk/requirements/jbossas-6.0.0.Final/
trunk/requirements/jbossas-6.0.0.Final/build.properties
trunk/requirements/smooks-1.2.4/
trunk/requirements/smooks-1.2.4/build.properties
Log:
Requirements added to use in SWTBot Tests:
- JBossAS 6.0.0.Final
- smooks 1.2.4 to use in smooks tests
Added: trunk/requirements/jbossas-6.0.0.Final/build.properties
===================================================================
--- trunk/requirements/jbossas-6.0.0.Final/build.properties (rev 0)
+++ trunk/requirements/jbossas-6.0.0.Final/build.properties 2011-08-15 23:38:14 UTC (rev 33947)
@@ -0,0 +1,11 @@
+#jbossas.build.uri=http://downloads.sourceforge.net/sourceforge/jboss
+jbossas600.build.uri=http://downloads.sourceforge.net/project/jboss/JBoss/JBoss-6.0.0.Final
+
+jboss600.build.uri=${jbossas.build.uri}
+jboss600.build.name=jboss-as-distribution-6.0.0.Final
+jboss600.build.archive=${jboss600.build.name}.zip
+jboss600.build.archive.md5=81ed7c2c274881963467c11f204eedfc
+
+build.uri=${jbossas600.build.uri}
+build.archive=${jboss600.build.archive}
+md5=${jboss600.build.archive.md5}
Added: trunk/requirements/smooks-1.2.4/build.properties
===================================================================
--- trunk/requirements/smooks-1.2.4/build.properties (rev 0)
+++ trunk/requirements/smooks-1.2.4/build.properties 2011-08-15 23:38:14 UTC (rev 33947)
@@ -0,0 +1,9 @@
+#jbossas.build.uri=http://downloads.sourceforge.net/sourceforge/jboss
+smooks124.build.uri=http://downloads.sourceforge.net/project/smooks/Smooks\ v1.2/Smooks\ v1.2
+smooks124.build.name=smooks-1.2.4
+smooks124.build.archive=${smooks124.build.name}.zip
+smooks124.build.archive.md5=d0fe4ce1965f24eee8e3f894882d0d50
+
+build.uri=${smooks124.build.uri}
+build.archive=${smooks124.build.archive}
+md5=${smooks124.build.archive.md5}
14 years, 8 months
JBoss Tools SVN: r33946 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-15 19:33:40 -0400 (Mon, 15 Aug 2011)
New Revision: 33946
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java
Log:
fix for tests in context of tool installed into Eclipse SDK. It means Java perspective named as "Java (default)". So it tries find in table requested perspective first and it it is not there adds prefix " (default)". This change should not harm anyone, but it lets run SWTBot tests from maven.
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java 2011-08-15 23:20:20 UTC (rev 33945)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java 2011-08-15 23:33:40 UTC (rev 33946)
@@ -157,7 +157,11 @@
bot.menu("Window").menu("Open Perspective").menu("Other...").click();
SWTBotShell shell = bot.shell("Open Perspective");
shell.activate();
- bot.table().select(perspective.getName());
+ if(bot.table().containsItem(perspective.getName())) {
+ bot.table().select(perspective.getName());
+ } else {
+ bot.table().select(perspective.getName()+ " (default)");
+ }
bot.button("OK").click();
log.info("Perspective switched to '" + perspective.getName() + "'");
}
14 years, 8 months