September 2012 - jbosstools-commits

JBoss Tools SVN: r43485 - in workspace/akazakov/db: org.jboss.tools.cdi.db/.settings and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-09-06 18:59:09 -0400 (Thu, 06 Sep 2012) New Revision: 43485 Added: workspace/akazakov/db/org.jboss.tools.cdi.db/.settings/ workspace/akazakov/db/org.jboss.tools.cdi.db/.settings/org.eclipse.jdt.core.prefs Modified: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDbPlugin.java workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/BeanEntity.java workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/TypeEntity.java workspace/akazakov/db/org.jboss.tools.common.db/.classpath Log: https://issues.jboss.org/browse/JBIDE-12446 Added: workspace/akazakov/db/org.jboss.tools.cdi.db/.settings/org.eclipse.jdt.core.prefs =================================================================== --- workspace/akazakov/db/org.jboss.tools.cdi.db/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ workspace/akazakov/db/org.jboss.tools.cdi.db/.settings/org.eclipse.jdt.core.prefs 2012-09-06 22:59:09 UTC (rev 43485) @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Property changes on: workspace/akazakov/db/org.jboss.tools.cdi.db/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDbPlugin.java =================================================================== --- workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDbPlugin.java 2012-09-06 22:54:04 UTC (rev 43484) +++ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDbPlugin.java 2012-09-06 22:59:09 UTC (rev 43485) @@ -28,15 +28,22 @@ * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) */ + @Override public void start(BundleContext bundleContext) throws Exception { super.start(bundleContext); Display.getDefault().asyncExec(new Runnable() { + @Override public void run() { try { CDIDBManager.getInstance().start(); - } catch (InstantiationException | IllegalAccessException - | ClassNotFoundException | SQLException e) { + } catch (InstantiationException e) { logError(e); + } catch (ClassNotFoundException e) { + logError(e); + } catch (SQLException e) { + logError(e); + } catch (IllegalAccessException e) { + logError(e); } } }); @@ -46,6 +53,7 @@ * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) */ + @Override public void stop(BundleContext bundleContext) throws Exception { CDIDBManager.getInstance().stop(); super.stop(bundleContext); Modified: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/BeanEntity.java =================================================================== --- workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/BeanEntity.java 2012-09-06 22:54:04 UTC (rev 43484) +++ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/BeanEntity.java 2012-09-06 22:59:09 UTC (rev 43485) @@ -10,16 +10,23 @@ ******************************************************************************/ package org.jboss.tools.cdi.db.entity; +import java.util.List; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + /** * @author Alexey Kazakov */ @Entity public class BeanEntity { - private static final long serialVersionUID = 1L; - private long id; - private String name; + private long index; + private List<TypeEntity> types; + private List<TypeEntity> qualifiers; /** * @return the id @@ -38,18 +45,40 @@ this.id = id; } + @Column + public long getIndex() { + return index; + } + + public void setIndex(long index) { + this.index = index; + } + /** - * @return the name + * @return the types */ - @Column - public String getName() { - return name; + public List<TypeEntity> getTypes() { + return types; } /** - * @param name the name to set + * @param types the types to set */ - public void setName(String name) { - this.name = name; + public void setTypes(List<TypeEntity> types) { + this.types = types; } + + /** + * @return the qualifiers + */ + public List<TypeEntity> getQualifiers() { + return qualifiers; + } + + /** + * @param qualifiers the qualifiers to set + */ + public void setQualifiers(List<TypeEntity> qualifiers) { + this.qualifiers = qualifiers; + } } \ No newline at end of file Modified: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/TypeEntity.java =================================================================== --- workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/TypeEntity.java 2012-09-06 22:54:04 UTC (rev 43484) +++ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/TypeEntity.java 2012-09-06 22:59:09 UTC (rev 43485) @@ -10,9 +10,43 @@ ******************************************************************************/ package org.jboss.tools.cdi.db.entity; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + /** * @author Alexey Kazakov */ +@Entity public class TypeEntity { + private long id; + private long index; + + /** + * @return the id + */ + @Id + @GeneratedValue + @Column + public long getId() { + return id; + } + + /** + * @param id the id to set + */ + public void setId(long id) { + this.id = id; + } + + @Column + public long getIndex() { + return index; + } + + public void setIndex(long index) { + this.index = index; + } } \ No newline at end of file Modified: workspace/akazakov/db/org.jboss.tools.common.db/.classpath =================================================================== --- workspace/akazakov/db/org.jboss.tools.common.db/.classpath 2012-09-06 22:54:04 UTC (rev 43484) +++ workspace/akazakov/db/org.jboss.tools.common.db/.classpath 2012-09-06 22:59:09 UTC (rev 43485) @@ -3,22 +3,22 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> - <classpathentry kind="lib" path="lib/derby.jar"/> - <classpathentry kind="lib" path="lib/derbyclient.jar"/> - <classpathentry kind="lib" path="lib/derbynet.jar"/> - <classpathentry kind="lib" path="lib/derbytools.jar"/> - <classpathentry kind="lib" path="lib/antlr-2.7.7.jar"/> - <classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/> - <classpathentry kind="lib" path="lib/hibernate-commons-annotations-4.0.1.Final.jar"/> - <classpathentry kind="lib" path="lib/hibernate-core-4.1.6.Final.jar"/> - <classpathentry kind="lib" path="lib/hibernate-entitymanager-4.1.6.Final.jar" sourcepath="/home/igels/Downloads/Java/JBoss/Hibernate/hibernate-release-4.1.6.Final/project"/> - <classpathentry kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.1.Final.jar" sourcepath="/home/igels/Downloads/Java/JBoss/Hibernate/geronimo-jpa_2.0_spec-1.1-sources.jar"> + <classpathentry exported="true" kind="lib" path="lib/derby.jar"/> + <classpathentry exported="true" kind="lib" path="lib/derbyclient.jar"/> + <classpathentry exported="true" kind="lib" path="lib/derbynet.jar"/> + <classpathentry exported="true" kind="lib" path="lib/derbytools.jar"/> + <classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/> + <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/> + <classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-4.0.1.Final.jar"/> + <classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.6.Final.jar"/> + <classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-4.1.6.Final.jar" sourcepath="/home/igels/Downloads/Java/JBoss/Hibernate/hibernate-release-4.1.6.Final/project"/> + <classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.1.Final.jar" sourcepath="/home/igels/Downloads/Java/JBoss/Hibernate/geronimo-jpa_2.0_spec-1.1-sources.jar"> <attributes> <attribute name="javadoc_location" value="jar:file:/home/igels/Downloads/Java/JBoss/Hibernate/geronimo-jpa_2.0_spec-1.1-javadoc.jar!/"/> </attributes> </classpathentry> - <classpathentry kind="lib" path="lib/javassist-3.15.0-GA.jar"/> - <classpathentry kind="lib" path="lib/jboss-logging-3.1.0.GA.jar"/> - <classpathentry kind="lib" path="lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/> + <classpathentry exported="true" kind="lib" path="lib/javassist-3.15.0-GA.jar"/> + <classpathentry exported="true" kind="lib" path="lib/jboss-logging-3.1.0.GA.jar"/> + <classpathentry exported="true" kind="lib" path="lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/> <classpathentry kind="output" path="bin"/> </classpath>

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43484 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2012-09-06 18:54:04 -0400 (Thu, 06 Sep 2012) New Revision: 43484 Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDICache.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIAnnotationElement.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java Log: JBIDE-12446 https://issues.jboss.org/browse/JBIDE-12446 Maps are moved from CDIProject into a separate class. Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIAnnotationElement.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIAnnotationElement.java 2012-09-06 22:33:24 UTC (rev 43483) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIAnnotationElement.java 2012-09-06 22:54:04 UTC (rev 43484) @@ -39,8 +39,12 @@ public void setDefinition(AnnotationDefinition definition) { this.definition = definition; - } + } + public AnnotationDefinition getDefinition() { + return definition; + } + public Collection<IMethod> getNonBindingMethods() { if(nonbindingMethods == null) { Collection<IMethod> result = new ArrayList<IMethod>(); Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDICache.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDICache.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDICache.java 2012-09-06 22:54:04 UTC (rev 43484) @@ -0,0 +1,390 @@ +/******************************************************************************* + * Copyright (c) 2012 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.tools.cdi.internal.core.impl; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.IPath; +import org.eclipse.jdt.core.IType; +import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.IClassBean; +import org.jboss.tools.cdi.core.IDecorator; +import org.jboss.tools.cdi.core.IInjectionPoint; +import org.jboss.tools.cdi.core.IInterceptor; +import org.jboss.tools.cdi.core.IInterceptorBinding; +import org.jboss.tools.cdi.core.IQualifier; +import org.jboss.tools.cdi.core.IScope; +import org.jboss.tools.cdi.core.IStereotype; +import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition; +import org.jboss.tools.common.java.IParametedType; + +public class CDICache implements Cloneable { + + static Collection<IBean> EMPTY = Collections.emptyList(); + + private Map<String, StereotypeElement> stereotypes = new HashMap<String, StereotypeElement>(); + private Map<IPath, StereotypeElement> stereotypesByPath = new HashMap<IPath, StereotypeElement>(); + private Map<String, InterceptorBindingElement> interceptorBindings = new HashMap<String, InterceptorBindingElement>(); + private Map<IPath, InterceptorBindingElement> interceptorBindingsByPath = new HashMap<IPath, InterceptorBindingElement>(); + private Map<String, QualifierElement> qualifiers = new HashMap<String, QualifierElement>(); + private Map<IPath, QualifierElement> qualifiersByPath = new HashMap<IPath, QualifierElement>(); + private Map<String, ScopeElement> scopes = new HashMap<String, ScopeElement>(); + private Map<IPath, ScopeElement> scopesByPath = new HashMap<IPath, ScopeElement>(); + + private Set<IBean> allBeans = new HashSet<IBean>(); + private Set<IBean> declaredBeans = new HashSet<IBean>(); + private Map<IPath, List<IBean>> beansByPath = new HashMap<IPath, List<IBean>>(); + private Map<String, Set<IBean>> beansByName = new HashMap<String, Set<IBean>>(); + private List<Set<IBean>> beansByTypes = new ArrayList<Set<IBean>>(); + private Set<IBean> namedBeans = new HashSet<IBean>(); + protected Map<IType, IClassBean> classBeans = new HashMap<IType, IClassBean>(); + private Set<IBean> alternatives = new HashSet<IBean>(); + private Set<IDecorator> decorators = new HashSet<IDecorator>(); + private Set<IInterceptor> interceptors = new HashSet<IInterceptor>(); + + protected Set<IType> allTypes = new HashSet<IType>(); + protected Map<TypeDefinition, ClassBean> definitionToClassbeans = new HashMap<TypeDefinition, ClassBean>(); + + private Map<String, Set<IInjectionPoint>> injectionPointsByType = new HashMap<String, Set<IInjectionPoint>>(); + + private static int BEANS_BY_TYPE_SIZE = 367; + + public CDICache() { + for (int i = 0; i < BEANS_BY_TYPE_SIZE; i++) beansByTypes.add(new HashSet<IBean>()); + } + + private static int OBJECT_INDEX = Math.abs("java.lang.Object".hashCode()) % BEANS_BY_TYPE_SIZE; + + private static int toTypeIndex(IType type) { + return Math.abs(type.getFullyQualifiedName().hashCode()) % BEANS_BY_TYPE_SIZE; + } + + public synchronized IBean[] getBeans() { + return allBeans.toArray(new IBean[allBeans.size()]); + } + + public Collection<IBean> getAllBeans() { + return allBeans; + } + + public synchronized Collection<IBean> getDeclaredBeans() { + return new ArrayList<IBean>(declaredBeans); + } + + public IBean[] getBeansByLegalType(IParametedType type) { + if(type.getType() == null) return new IBean[0]; + int index = toTypeIndex(type.getType()); + Collection<IBean> bs = index == OBJECT_INDEX ? allBeans : beansByTypes.get(index); + synchronized (this) { + return bs.toArray(new IBean[bs.size()]); + } + } + + public synchronized IQualifier[] getQualifiers() { + return qualifiers.values().toArray(new IQualifier[qualifiers.size()]); + } + + public synchronized IStereotype[] getStereotypes() { + return stereotypes.values().toArray(new IStereotype[stereotypes.size()]); + } + + public synchronized IBean[] getAlternatives() { + return alternatives.toArray(new IBean[alternatives.size()]); + } + + public synchronized IDecorator[] getDecorators() { + return decorators.toArray(new IDecorator[decorators.size()]); + } + + public synchronized IInterceptor[] getInterceptors() { + return interceptors.toArray(new IInterceptor[interceptors.size()]); + } + + public synchronized StereotypeElement getStereotype(IPath path) { + return stereotypesByPath.get(path); + } + + public StereotypeElement getStereotype(String qualifiedName) { + return stereotypes.get(qualifiedName.replace('$', '.')); + } + + public synchronized IInterceptorBinding[] getInterceptorBindings() { + return interceptorBindings.values().toArray(new IInterceptorBinding[interceptorBindings.size()]); + } + + /* + * (non-Javadoc) + * @see org.jboss.tools.cdi.core.IBeanManager#getInterceptorBinding(java.lang.String) + */ + public InterceptorBindingElement getInterceptorBinding(String qualifiedName) { + return interceptorBindings.get(qualifiedName.replace('$', '.')); + } + + /* + * (non-Javadoc) + * @see org.jboss.tools.cdi.core.IBeanManager#getInterceptorBinding(org.eclipse.core.runtime.IPath) + */ + public IInterceptorBinding getInterceptorBinding(IPath path) { + return interceptorBindingsByPath.get(path); + } + + public QualifierElement getQualifier(String qualifiedName) { + return qualifiers.get(qualifiedName.replace('$', '.')); + } + + public QualifierElement getQualifier(IPath path) { + return qualifiersByPath.get(path); + } + + public synchronized Set<String> getScopeNames() { + Set<String> result = new HashSet<String>(); + result.addAll(scopes.keySet()); + return result; + } + + public ScopeElement getScope(String qualifiedName) { + return scopes.get(qualifiedName.replace('$', '.')); + } + + public IScope getScope(IPath path) { + return scopesByPath.get(path); + } + + public CDICache getModifiedCopy(IFile file, Collection<IBean> beans) { + CDICache p = null; + try { + p = (CDICache)clone(); + } catch (CloneNotSupportedException e) { + e.printStackTrace(); + return null; + } + p.allBeans = new HashSet<IBean>(); + synchronized(this) { + p.allBeans.addAll(allBeans); + } + Collection<IBean> oldBeans = getBeans(file.getFullPath()); + p.allBeans.removeAll(oldBeans); + p.allBeans.addAll(beans); + + p.beansByTypes = new ArrayList<Set<IBean>>(); + for (int i = 0; i < BEANS_BY_TYPE_SIZE; i++) { + Set<IBean> bs = new HashSet<IBean>(beansByTypes.get(i)); + bs.removeAll(oldBeans); + bs.addAll(beans); + p.beansByTypes.add(bs); + } + + Set<IBean> oldNamedBeans = null; + for (IBean b: oldBeans) { + if(b.getName() != null) { + if(oldNamedBeans == null) oldNamedBeans = new HashSet<IBean>(); + oldNamedBeans.add(b); + } + } + Set<IBean> newNamedBeans = null; + for (IBean b: beans) { + if(b.getName() != null) { + if(newNamedBeans == null) newNamedBeans = new HashSet<IBean>(); + newNamedBeans.add(b); + } + } + if(newNamedBeans != null || oldNamedBeans != null) { + p.namedBeans = new HashSet<IBean>(); + p.beansByName = new HashMap<String, Set<IBean>>(); + synchronized(this) { + p.namedBeans.addAll(namedBeans); + if(oldNamedBeans != null) p.namedBeans.removeAll(oldNamedBeans); + if(newNamedBeans != null) p.namedBeans.addAll(newNamedBeans); + for (String n: beansByName.keySet()) { + Set<IBean> bs = new HashSet<IBean>(beansByName.get(n)); + p.beansByName.put(n, bs); + } + if(oldNamedBeans != null) { + for (IBean b: oldNamedBeans) { + String n = b.getName(); + Set<IBean> bs = p.beansByName.get(n); + if(bs != null && bs.contains(b)) { + bs.remove(b); + } + } + } + if(newNamedBeans != null) { + for (IBean b: newNamedBeans) { + String n = b.getName(); + Set<IBean> bs = p.beansByName.get(n); + if(bs == null) { + bs = new HashSet<IBean>(); + p.beansByName.put(n, bs); + } + bs.add(b); + } + } + } + } + + return p; + } + + public synchronized Collection<IBean> getBeans(IPath path) { + return (beansByPath.containsKey(path)) ? new ArrayList<IBean>(beansByPath.get(path)) : EMPTY; + } + + public Set<IInjectionPoint> getInjections(String fullyQualifiedTypeName) { + Set<IInjectionPoint> result = injectionPointsByType.get(fullyQualifiedTypeName); + if(result == null) result = Collections.emptySet(); + return result; + } + + public Collection<IBean> getNamedBeans() { + return namedBeans; + } + + public boolean containsType(IType t) { + return allTypes.contains(t); + } + + public Collection<IType> getAllTypes() { + return allTypes; + } + + public Collection<IBean> getBeans(String name) { + return beansByName.containsKey(name) ? beansByName.get(name) : EMPTY; + } + + public synchronized void addBean(IBean bean, boolean isDeclaredByThisProject) { + String name = bean.getName(); + IPath path = bean.getSourcePath(); + List<IBean> bs = beansByPath.get(path); + if(bs == null) { + bs = new ArrayList<IBean>(); + beansByPath.put(path, bs); + } + bs.add(bean); + buildInjectionPoinsByType(bean); + boolean isAbstract = (bean instanceof ClassBean) && !((ClassBean)bean).getDefinition().hasBeanConstructor(); + if(isAbstract) { + return; + } + if(name != null && name.length() > 0) { + Set<IBean> bsn = beansByName.get(name); + if(bsn == null) { + bsn = new HashSet<IBean>(); + beansByName.put(name, bsn); + } + bsn.add(bean); + namedBeans.add(bean); + } + if(bean.isAlternative()) { + alternatives.add(bean); + } + if(bean instanceof IDecorator) { + decorators.add((IDecorator)bean); + } + 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); + } + } + allBeans.add(bean); + if(isDeclaredByThisProject) { + declaredBeans.add(bean); + } + for (IParametedType t: bean.getLegalTypes()) { + if(t.getType() != null && t.getType().exists()) { + int index = toTypeIndex(t.getType()); + if(index != OBJECT_INDEX) { + beansByTypes.get(index).add(bean); + } + } + } + } + + synchronized void buildInjectionPoinsByType(IBean b) { + Collection<IInjectionPoint> ps = b.getInjectionPoints(); + for (IInjectionPoint p: ps) { + IParametedType t = p.getType(); + if(t == null || t.getType() == null) continue; + String n = t.getType().getFullyQualifiedName(); + Set<IInjectionPoint> s = injectionPointsByType.get(n); + if(s == null) { + s = new HashSet<IInjectionPoint>(); + injectionPointsByType.put(n, s); + } + s.add(p); + } + } + + public synchronized void clean() { + beansByPath.clear(); + beansByName.clear(); + namedBeans.clear(); + alternatives.clear(); + decorators.clear(); + interceptors.clear(); + allBeans.clear(); + declaredBeans.clear(); + injectionPointsByType.clear(); + + for (int i = 0; i < BEANS_BY_TYPE_SIZE; i++) beansByTypes.get(i).clear(); + } + + public synchronized void cleanAnnotations() { + stereotypes.clear(); + stereotypesByPath.clear(); + interceptorBindings.clear(); + qualifiers.clear(); + qualifiersByPath.clear(); + interceptorBindingsByPath.clear(); + scopes.clear(); + scopesByPath.clear(); + } + + public void add(StereotypeElement s) { + stereotypes.put(s.getDefinition().getQualifiedName().replace('$', '.'), s); + if(s.getDefinition().getResource() != null && s.getDefinition().getResource().getFullPath() != null) { + stereotypesByPath.put(s.getDefinition().getResource().getFullPath(), s); + } + } + + public void add(InterceptorBindingElement s) { + interceptorBindings.put(s.getDefinition().getQualifiedName().replace('$', '.'), s); + if(s.getDefinition().getResource() != null && s.getDefinition().getResource().getFullPath() != null) { + interceptorBindingsByPath.put(s.getDefinition().getResource().getFullPath(), s); + } + } + + public void add(QualifierElement s) { + qualifiers.put(s.getDefinition().getQualifiedName().replace('$', '.'), s); + if(s.getDefinition().getResource() != null && s.getDefinition().getResource().getFullPath() != null) { + qualifiersByPath.put(s.getDefinition().getResource().getFullPath(), s); + } + } + + public void add(ScopeElement s) { + scopes.put(s.getDefinition().getQualifiedName().replace('$', '.'), s); + if(s.getDefinition().getResource() != null && s.getDefinition().getResource().getFullPath() != null) { + scopesByPath.put(s.getDefinition().getResource().getFullPath(), s); + } + } +} \ No newline at end of file Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDICache.java ___________________________________________________________________ Added: svn:mime-type + text/plain 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 2012-09-06 22:33:24 UTC (rev 43483) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2012-09-06 22:54:04 UTC (rev 43484) @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -30,7 +29,6 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.jdt.core.IField; import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.IMemberValuePair; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; @@ -86,36 +84,12 @@ CDICoreNature n; private ICDIProject declaringProject = this; - private Map<String, StereotypeElement> stereotypes = new HashMap<String, StereotypeElement>(); - private Map<IPath, StereotypeElement> stereotypesByPath = new HashMap<IPath, StereotypeElement>(); - private Map<String, InterceptorBindingElement> interceptorBindings = new HashMap<String, InterceptorBindingElement>(); - private Map<IPath, InterceptorBindingElement> interceptorBindingsByPath = new HashMap<IPath, InterceptorBindingElement>(); - private Map<String, QualifierElement> qualifiers = new HashMap<String, QualifierElement>(); - private Map<IPath, QualifierElement> qualifiersByPath = new HashMap<IPath, QualifierElement>(); - private Map<String, ScopeElement> scopes = new HashMap<String, ScopeElement>(); - private Map<IPath, ScopeElement> scopesByPath = new HashMap<IPath, ScopeElement>(); + private CDICache cache = new CDICache(); - private Set<IBean> allBeans = new HashSet<IBean>(); - private Set<IBean> declaredBeans = new HashSet<IBean>(); - private Map<IPath, List<IBean>> beansByPath = new HashMap<IPath, List<IBean>>(); - private Map<String, Set<IBean>> beansByName = new HashMap<String, Set<IBean>>(); - private List<Set<IBean>> beansByTypes = new ArrayList<Set<IBean>>(); - private Set<IBean> namedBeans = new HashSet<IBean>(); - private Map<IType, IClassBean> classBeans = new HashMap<IType, IClassBean>(); - private Set<IBean> alternatives = new HashSet<IBean>(); - private Set<IDecorator> decorators = new HashSet<IDecorator>(); - private Set<IInterceptor> interceptors = new HashSet<IInterceptor>(); - - private Set<IType> allTypes = new HashSet<IType>(); - private Map<TypeDefinition, ClassBean> definitionToClassbeans = new HashMap<TypeDefinition, ClassBean>(); - - private Map<String, Set<IInjectionPoint>> injectionPointsByType = new HashMap<String, Set<IInjectionPoint>>(); - BeansXMLData allBeansXMLData = new BeansXMLData(); BeansXMLData projectBeansXMLData = new BeansXMLData(); public CDIProject() { - for (int i = 0; i < BEANS_BY_TYPE_SIZE; i++) beansByTypes.add(new HashSet<IBean>()); } public CDIProject getModifiedCopy(IFile file, Collection<IBean> beans) { @@ -126,71 +100,11 @@ e.printStackTrace(); return null; } - p.declaringProject = this; - p.allBeans = new HashSet<IBean>(); - synchronized(this) { - p.allBeans.addAll(allBeans); + synchronized (cache) { + p.cache = cache.getModifiedCopy(file, beans); } - Collection<IBean> oldBeans = getBeans(file.getFullPath()); - p.allBeans.removeAll(oldBeans); - p.allBeans.addAll(beans); - - p.beansByTypes = new ArrayList<Set<IBean>>(); - for (int i = 0; i < BEANS_BY_TYPE_SIZE; i++) { - Set<IBean> bs = new HashSet<IBean>(beansByTypes.get(i)); - bs.removeAll(oldBeans); - bs.addAll(beans); - p.beansByTypes.add(bs); - } + p.declaringProject = this; - Set<IBean> oldNamedBeans = null; - for (IBean b: oldBeans) { - if(b.getName() != null) { - if(oldNamedBeans == null) oldNamedBeans = new HashSet<IBean>(); - oldNamedBeans.add(b); - } - } - Set<IBean> newNamedBeans = null; - for (IBean b: beans) { - if(b.getName() != null) { - if(newNamedBeans == null) newNamedBeans = new HashSet<IBean>(); - newNamedBeans.add(b); - } - } - if(newNamedBeans != null || oldNamedBeans != null) { - p.namedBeans = new HashSet<IBean>(); - p.beansByName = new HashMap<String, Set<IBean>>(); - synchronized(this) { - p.namedBeans.addAll(namedBeans); - if(oldNamedBeans != null) p.namedBeans.removeAll(oldNamedBeans); - if(newNamedBeans != null) p.namedBeans.addAll(newNamedBeans); - for (String n: beansByName.keySet()) { - Set<IBean> bs = new HashSet<IBean>(beansByName.get(n)); - p.beansByName.put(n, bs); - } - if(oldNamedBeans != null) { - for (IBean b: oldNamedBeans) { - String n = b.getName(); - Set<IBean> bs = p.beansByName.get(n); - if(bs != null && bs.contains(b)) { - bs.remove(b); - } - } - } - if(newNamedBeans != null) { - for (IBean b: newNamedBeans) { - String n = b.getName(); - Set<IBean> bs = p.beansByName.get(n); - if(bs == null) { - bs = new HashSet<IBean>(); - p.beansByName.put(n, bs); - } - bs.add(b); - } - } - } - } - return p; } @@ -213,12 +127,12 @@ * (non-Javadoc) * @see org.jboss.tools.cdi.core.IBeanManager#getBeans() */ - public synchronized IBean[] getBeans() { - return allBeans.toArray(new IBean[allBeans.size()]); + public IBean[] getBeans() { + return cache.getBeans(); } - public synchronized Collection<IBean> getDeclaredBeans() { - return new ArrayList<IBean>(declaredBeans); + public Collection<IBean> getDeclaredBeans() { + return cache.getDeclaredBeans(); } public List<INodeReference> getAlternativeClasses() { @@ -264,15 +178,13 @@ public IClassBean getBeanClass(IType type) { IPath path = type.getPath(); - synchronized (this) { - List<IBean> bs = beansByPath.get(path); - if(bs != null) { - for (IBean b: bs) { - if(b instanceof IClassBean) { - IClassBean result = (IClassBean)b; - if(type.getFullyQualifiedName().equals(result.getBeanClass().getFullyQualifiedName())) { - return result; - } + synchronized (cache) { + Collection<IBean> bs = cache.getBeans(path); + for (IBean b: bs) { + if(b instanceof IClassBean) { + IClassBean result = (IClassBean)b; + if(type.getFullyQualifiedName().equals(result.getBeanClass().getFullyQualifiedName())) { + return result; } } } @@ -282,9 +194,9 @@ public Collection<IBean> getBeans(String name, boolean attemptToResolveAmbiguousNames) { Set<IBean> result = new HashSet<IBean>(); - synchronized (this) { - Set<IBean> beans = beansByName.get(name); - if(beans == null || beans.isEmpty()) { + synchronized (cache) { + Collection<IBean> beans = cache.getBeans(name); + if(beans.isEmpty()) { return result; } result.addAll(beans); @@ -380,7 +292,7 @@ Set<IQualifierDeclaration> qs = new HashSet<IQualifierDeclaration>(); if(qualifiers != null) for (IQualifierDeclaration d: qualifiers) qs.add(d); - for (IBean b: getBeansByLegalType(type)) { + for (IBean b: cache.getBeansByLegalType(type)) { if(containsType(b.getLegalTypes(), type)) { try { Collection<IQualifierDeclaration> qsb = b.getQualifierDeclarations(true); @@ -396,22 +308,6 @@ return getResolvedBeans(result, attemptToResolveAmbiguousDependency); } - static int BEANS_BY_TYPE_SIZE = 367; - static int OBJECT_INDEX = Math.abs("java.lang.Object".hashCode()) % BEANS_BY_TYPE_SIZE; - - static int toTypeIndex(IType type) { - return Math.abs(type.getFullyQualifiedName().hashCode()) % BEANS_BY_TYPE_SIZE; - } - - private IBean[] getBeansByLegalType(IParametedType type) { - if(type.getType() == null) return new IBean[0]; - int index = toTypeIndex(type.getType()); - Collection<IBean> bs = index == OBJECT_INDEX ? allBeans : beansByTypes.get(index); - synchronized (this) { - return bs.toArray(new IBean[bs.size()]); - } - } - /* * (non-Javadoc) * @see org.jboss.tools.cdi.core.IBeanManager#getBeans(boolean, org.jboss.tools.cdi.core.IInjectionPoint) @@ -430,8 +326,8 @@ boolean isObjectType = jType != null && "java.lang.Object".equals(jType.getFullyQualifiedName()); if(isObjectType && injectionPoint.getAnnotation(CDIConstants.ANY_QUALIFIER_TYPE_NAME) != null) { - synchronized(this) { - result.addAll(allBeans); + synchronized(cache) { + result.addAll(cache.getAllBeans()); } return getResolvedBeans(result, attemptToResolveAmbiguousDependency); } @@ -472,7 +368,7 @@ String injectionPointName = injectionPoint.getBeanName(); - for (IBean b: getBeansByLegalType(type)) { + for (IBean b: cache.getBeansByLegalType(type)) { if(isObjectType || containsType(b.getLegalTypes(), type)) { try { if(delegateInjectionPoint && b == injectionPoint.getClassBean()) { @@ -745,22 +641,23 @@ return result.toString(); } - public synchronized Collection<IBean> getBeans(IPath path) { - return (beansByPath.containsKey(path)) ? new ArrayList<IBean>(beansByPath.get(path)) : new ArrayList<IBean>(0); + public Collection<IBean> getBeans(IPath path) { + return cache.getBeans(path); } static int q = 0; - public synchronized Set<IBean> getBeans(IJavaElement element) { + public Set<IBean> getBeans(IJavaElement element) { Set<IBean> result = new HashSet<IBean>(); - for (IBean bean: allBeans) { + synchronized (cache) { + for (IBean bean: cache.getAllBeans()) { if(bean instanceof IJavaReference) { - IMember m = ((IJavaReference)bean).getSourceMember(); if(((IJavaReference)bean).getSourceMember().equals(element)) { result.add(bean); } } } + } return result; } @@ -836,37 +733,37 @@ * (non-Javadoc) * @see org.jboss.tools.cdi.core.IBeanManager#getQualifiers() */ - public synchronized IQualifier[] getQualifiers() { - return qualifiers.values().toArray(new IQualifier[qualifiers.size()]); + public IQualifier[] getQualifiers() { + return cache.getQualifiers(); } /* * (non-Javadoc) * @see org.jboss.tools.cdi.core.IBeanManager#getStereotypes() */ - public synchronized IStereotype[] getStereotypes() { - return stereotypes.values().toArray(new IStereotype[stereotypes.size()]); + public IStereotype[] getStereotypes() { + return cache.getStereotypes(); } /* (non-Javadoc) * @see org.jboss.tools.cdi.core.IBeanManager#getAlternatives() */ - public synchronized IBean[] getAlternatives() { - return alternatives.toArray(new IBean[alternatives.size()]); + public IBean[] getAlternatives() { + return cache.getAlternatives(); } /* (non-Javadoc) * @see org.jboss.tools.cdi.core.IBeanManager#getDecorators() */ - public synchronized IDecorator[] getDecorators() { - return decorators.toArray(new IDecorator[decorators.size()]); + public IDecorator[] getDecorators() { + return cache.getDecorators(); } /* (non-Javadoc) * @see org.jboss.tools.cdi.core.IBeanManager#getInterceptors() */ - public synchronized IInterceptor[] getInterceptors() { - return interceptors.toArray(new IInterceptor[interceptors.size()]); + public IInterceptor[] getInterceptors() { + return cache.getInterceptors(); } public boolean isNormalScope(IType annotationType) { @@ -971,8 +868,8 @@ Collection<IObserverMethod> result = new ArrayList<IObserverMethod>(); IParametedType eventType = getEventType(injectionPoint); if(eventType != null) { - synchronized(this) { - for (IBean b: allBeans) { + synchronized(cache) { + for (IBean b: cache.getAllBeans()) { if(b instanceof IClassBean) { collectObserverMethods((IClassBean)b, eventType, injectionPoint, result); } @@ -1045,8 +942,8 @@ Map<IField, IInjectionPoint> result = new HashMap<IField, IInjectionPoint>(); if(observedEventParameter.getBeanMethod() instanceof IObserverMethod) { - synchronized(this) { - for (IBean b: allBeans) { + synchronized(cache) { + for (IBean b: cache.getAllBeans()) { if(b instanceof IClassBean) { collectObserverEvents((IClassBean)b, observedEventParameter, result); } @@ -1144,7 +1041,7 @@ * @see org.jboss.tools.cdi.core.IBeanManager#getStereotype(java.lang.String) */ public StereotypeElement getStereotype(String qualifiedName) { - return stereotypes.get(qualifiedName.replace('$', '.')); + return cache.getStereotype(qualifiedName); } /* @@ -1152,7 +1049,7 @@ * @see org.jboss.tools.cdi.core.IBeanManager#getStereotype(org.eclipse.core.runtime.IPath) */ public StereotypeElement getStereotype(IPath path) { - return stereotypesByPath.get(path); + return cache.getStereotype(path); } /* @@ -1160,16 +1057,15 @@ * @see org.jboss.tools.cdi.core.IBeanManager#getStereotype(org.eclipse.jdt.core.IType) */ public StereotypeElement getStereotype(IType type) { - IPath path = type.getPath(); - return stereotypesByPath.get(path); + return getStereotype(type.getPath()); } /* * (non-Javadoc) * @see org.jboss.tools.cdi.core.IBeanManager#getInterceptorBindings() */ - public synchronized IInterceptorBinding[] getInterceptorBindings() { - return interceptorBindings.values().toArray(new IInterceptorBinding[interceptorBindings.size()]); + public IInterceptorBinding[] getInterceptorBindings() { + return cache.getInterceptorBindings(); } /* @@ -1177,7 +1073,7 @@ * @see org.jboss.tools.cdi.core.IBeanManager#getInterceptorBinding(java.lang.String) */ public InterceptorBindingElement getInterceptorBinding(String qualifiedName) { - return interceptorBindings.get(qualifiedName.replace('$', '.')); + return cache.getInterceptorBinding(qualifiedName); } /* @@ -1185,32 +1081,32 @@ * @see org.jboss.tools.cdi.core.IBeanManager#getInterceptorBinding(org.eclipse.core.runtime.IPath) */ public IInterceptorBinding getInterceptorBinding(IPath path) { - return interceptorBindingsByPath.get(path); + return cache.getInterceptorBinding(path); } public QualifierElement getQualifier(String qualifiedName) { - return qualifiers.get(qualifiedName.replace('$', '.')); + return cache.getQualifier(qualifiedName); } public QualifierElement getQualifier(IPath path) { - return qualifiersByPath.get(path); + return cache.getQualifier(path); } - public synchronized Set<String> getScopeNames() { - Set<String> result = new HashSet<String>(); - result.addAll(scopes.keySet()); - return result; + public Set<String> getScopeNames() { + return cache.getScopeNames(); } public ScopeElement getScope(String qualifiedName) { - return scopes.get(qualifiedName.replace('$', '.')); + return cache.getScope(qualifiedName); } public IScope getScope(IPath path) { - return scopesByPath.get(path); + return cache.getScope(path); } - public synchronized void update(boolean updateDependent) { + public void update(boolean updateDependent) { + synchronized (cache) { + rebuildXML(); rebuildAnnotationTypes(); rebuildBeans(); @@ -1240,52 +1136,39 @@ } } CDICorePlugin.fire(new CDIProjectChangeEvent(this)); + + } } - synchronized void rebuildAnnotationTypes() { - stereotypes.clear(); - stereotypesByPath.clear(); - interceptorBindings.clear(); - qualifiers.clear(); - qualifiersByPath.clear(); - interceptorBindingsByPath.clear(); - scopes.clear(); - scopesByPath.clear(); + void rebuildAnnotationTypes() { + synchronized (cache) { + + cache.cleanAnnotations(); List<AnnotationDefinition> ds = n.getAllAnnotations(); for (AnnotationDefinition d: ds) { if((d.getKind() & AnnotationDefinition.STEREOTYPE) > 0) { StereotypeElement s = new StereotypeElement(); initAnnotationElement(s, d); - stereotypes.put(d.getQualifiedName().replace('$', '.'), s); - if(d.getResource() != null && d.getResource().getFullPath() != null) { - stereotypesByPath.put(d.getResource().getFullPath(), s); - } + cache.add(s); } if((d.getKind() & AnnotationDefinition.INTERCEPTOR_BINDING) > 0) { InterceptorBindingElement s = new InterceptorBindingElement(); initAnnotationElement(s, d); - interceptorBindings.put(d.getQualifiedName().replace('$', '.'), s); - if(d.getResource() != null && d.getResource().getFullPath() != null) { - interceptorBindingsByPath.put(d.getResource().getFullPath(), s); - } + cache.add(s); } if((d.getKind() & AnnotationDefinition.QUALIFIER) > 0) { QualifierElement s = new QualifierElement(); initAnnotationElement(s, d); - qualifiers.put(d.getQualifiedName().replace('$', '.'), s); - if(d.getResource() != null && d.getResource().getFullPath() != null) { - qualifiersByPath.put(d.getResource().getFullPath(), s); - } + cache.add(s); } if((d.getKind() & AnnotationDefinition.SCOPE) > 0) { ScopeElement s = new ScopeElement(); initAnnotationElement(s, d); - scopes.put(d.getQualifiedName().replace('$', '.'), s); - if(d.getResource() != null && d.getResource().getFullPath() != null) { - scopesByPath.put(d.getResource().getFullPath(), s); - } + cache.add(s); } } + + } } private void initAnnotationElement(CDIAnnotationElement s, AnnotationDefinition d) { @@ -1314,7 +1197,7 @@ ImplementationCollector ic = new ImplementationCollector(typeDefinitions); for (TypeDefinition typeDefinition : typeDefinitions) { - ClassBean bean = definitionToClassbeans.get(typeDefinition); + ClassBean bean = cache.definitionToClassbeans.get(typeDefinition); if(bean != null && (bean.getDefinition() == typeDefinition) && (updateLevel == 0 || (updateLevel == 1 && typeDefinition.getType().isBinary()))) { //Type definitions are rebuilt when changed, otherwise old bean should be reused. @@ -1375,23 +1258,11 @@ } } - synchronized (this) { - beansByPath.clear(); - beansByName.clear(); - namedBeans.clear(); - alternatives.clear(); - decorators.clear(); - interceptors.clear(); - allBeans.clear(); - declaredBeans.clear(); - injectionPointsByType.clear(); - - for (int i = 0; i < BEANS_BY_TYPE_SIZE; i++) beansByTypes.get(i).clear(); - } + cache.clean(); - classBeans = newClassBeans; - definitionToClassbeans = newDefinitionToClassbeans; - allTypes = newAllTypes; + cache.classBeans = newClassBeans; + cache.definitionToClassbeans = newDefinitionToClassbeans; + cache.allTypes = newAllTypes; for (IBean bean: beans) { addBean(bean); } @@ -1413,7 +1284,7 @@ */ private int getUpdateLevel(Set<IType> newAllTypes) { int result = 0; - for (IType t: allTypes) { + for (IType t: cache.getAllTypes()) { if(!t.exists() || !newAllTypes.contains(t)) { if(t.isBinary()) { return 2; @@ -1423,7 +1294,7 @@ } } for (IType t: newAllTypes) { - if(!allTypes.contains(t)) { + if(!cache.containsType(t)) { if(t.isBinary()) { return 2; } else { @@ -1439,75 +1310,9 @@ //Prevented double bean from library common for this and used project return; } - synchronized(this) { - String name = bean.getName(); - IPath path = bean.getSourcePath(); - List<IBean> bs = beansByPath.get(path); - if(bs == null) { - bs = new ArrayList<IBean>(); - beansByPath.put(path, bs); - } - bs.add(bean); - buildInjectionPoinsByType(bean); - boolean isAbstract = (bean instanceof ClassBean) && !((ClassBean)bean).getDefinition().hasBeanConstructor(); - if(isAbstract) { - return; - } - if(name != null && name.length() > 0) { - Set<IBean> bsn = beansByName.get(name); - if(bsn == null) { - bsn = new HashSet<IBean>(); - beansByName.put(name, bsn); - } - bsn.add(bean); - namedBeans.add(bean); - } - if(bean.isAlternative()) { - alternatives.add(bean); - } - if(bean instanceof IDecorator) { - decorators.add((IDecorator)bean); - } - 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); - } - } - allBeans.add(bean); - if(bean.getDeclaringProject() == this) { - declaredBeans.add(bean); - } - for (IParametedType t: bean.getLegalTypes()) { - if(t.getType() != null && t.getType().exists()) { - int index = toTypeIndex(t.getType()); - if(index != OBJECT_INDEX) { - beansByTypes.get(index).add(bean); - } - } - } - } + cache.addBean(bean, bean.getDeclaringProject() == this); } - synchronized void buildInjectionPoinsByType(IBean b) { - Collection<IInjectionPoint> ps = b.getInjectionPoints(); - for (IInjectionPoint p: ps) { - IParametedType t = p.getType(); - if(t == null || t.getType() == null) continue; - String n = t.getType().getFullyQualifiedName(); - Set<IInjectionPoint> s = injectionPointsByType.get(n); - if(s == null) { - s = new HashSet<IInjectionPoint>(); - injectionPointsByType.put(n, s); - } - s.add(p); - } - } - void rebuildXML() { synchronized(allBeansXMLData) { allBeansXMLData.clean(); @@ -1543,10 +1348,10 @@ public Collection<IBean> getNamedBeans(boolean attemptToResolveAmbiguousNames) { //TODO use a cache for named beans with attemptToResolveAmbiguousNames==true Collection<IBean> result = new HashSet<IBean>(); - synchronized (this) { + synchronized (cache) { if(attemptToResolveAmbiguousNames) { Set<String> names = new HashSet<String>(); - for (IBean bean : namedBeans) { + for (IBean bean : cache.getNamedBeans()) { if(!names.contains(bean.getName())) { Collection<IBean> beans = getBeans(bean.getName(), attemptToResolveAmbiguousNames); if(beans.isEmpty()) { @@ -1558,7 +1363,7 @@ } } } else { - result.addAll(namedBeans); + result.addAll(cache.getNamedBeans()); } } return result; @@ -1573,7 +1378,7 @@ Collection<IBean> result = new HashSet<IBean>(); IParametedType type = beanType; - for (IBean b: getBeansByLegalType(type)) { + for (IBean b: cache.getBeansByLegalType(type)) { if(containsType(b.getLegalTypes(), type)) { try { Collection<IQualifierDeclaration> qsb = b.getQualifierDeclarations(true); @@ -1608,9 +1413,7 @@ } public Set<IInjectionPoint> getInjections(String fullyQualifiedTypeName) { - Set<IInjectionPoint> result = injectionPointsByType.get(fullyQualifiedTypeName); - if(result == null) result = Collections.emptySet(); - return result; + return cache.getInjections(fullyQualifiedTypeName); } /**

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43483 - workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2012-09-06 18:33:24 -0400 (Thu, 06 Sep 2012) New Revision: 43483 Modified: workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/AbstractDBManager.java Log: JBIDE-12446 https://issues.jboss.org/browse/JBIDE-12446 Modified: workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/AbstractDBManager.java =================================================================== --- workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/AbstractDBManager.java 2012-09-06 21:49:50 UTC (rev 43482) +++ workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/AbstractDBManager.java 2012-09-06 22:33:24 UTC (rev 43483) @@ -57,9 +57,14 @@ public EntityManager createEntityManager() { try { start(); - } catch (InstantiationException | IllegalAccessException - | ClassNotFoundException | SQLException e) { + } catch (InstantiationException e) { CommonDbPlugin.getDefault().logError(e); + } catch (IllegalAccessException e) { + CommonDbPlugin.getDefault().logError(e); + } catch (ClassNotFoundException e) { + CommonDbPlugin.getDefault().logError(e); + } catch (SQLException e) { + CommonDbPlugin.getDefault().logError(e); } EntityManager em = emf.createEntityManager(); return em;

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43482 - in workspace/snjeza/org.jboss.tools.arquillian.updatesite: features and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2012-09-06 17:49:50 -0400 (Thu, 06 Sep 2012) New Revision: 43482 Added: workspace/snjeza/org.jboss.tools.arquillian.updatesite/.project workspace/snjeza/org.jboss.tools.arquillian.updatesite/features/org.jboss.tools.arquillian.feature_1.0.1.201209062348.jar workspace/snjeza/org.jboss.tools.arquillian.updatesite/plugins/org.jboss.tools.arquillian.core_1.0.1.201209062348.jar workspace/snjeza/org.jboss.tools.arquillian.updatesite/plugins/org.jboss.tools.arquillian.ui_1.0.1.201209062348.jar Removed: workspace/snjeza/org.jboss.tools.arquillian.updatesite/features/org.jboss.tools.arquillian.feature_1.0.0.201209041750.jar workspace/snjeza/org.jboss.tools.arquillian.updatesite/plugins/org.jboss.tools.arquillian.core_1.0.0.201209041750.jar workspace/snjeza/org.jboss.tools.arquillian.updatesite/plugins/org.jboss.tools.arquillian.ui_1.0.0.201209041750.jar Modified: workspace/snjeza/org.jboss.tools.arquillian.updatesite/artifacts.jar workspace/snjeza/org.jboss.tools.arquillian.updatesite/content.jar workspace/snjeza/org.jboss.tools.arquillian.updatesite/site.xml Log: Finishing New Arquillian JUnit Test Case wizard Added: workspace/snjeza/org.jboss.tools.arquillian.updatesite/.project =================================================================== --- workspace/snjeza/org.jboss.tools.arquillian.updatesite/.project (rev 0) +++ workspace/snjeza/org.jboss.tools.arquillian.updatesite/.project 2012-09-06 21:49:50 UTC (rev 43482) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.arquillian.updatesite</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.UpdateSiteBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.UpdateSiteNature</nature> + </natures> +</projectDescription> Modified: workspace/snjeza/org.jboss.tools.arquillian.updatesite/artifacts.jar =================================================================== (Binary files differ) Modified: workspace/snjeza/org.jboss.tools.arquillian.updatesite/content.jar =================================================================== (Binary files differ) Deleted: workspace/snjeza/org.jboss.tools.arquillian.updatesite/features/org.jboss.tools.arquillian.feature_1.0.0.201209041750.jar =================================================================== (Binary files differ) Added: workspace/snjeza/org.jboss.tools.arquillian.updatesite/features/org.jboss.tools.arquillian.feature_1.0.1.201209062348.jar =================================================================== (Binary files differ) Property changes on: workspace/snjeza/org.jboss.tools.arquillian.updatesite/features/org.jboss.tools.arquillian.feature_1.0.1.201209062348.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: workspace/snjeza/org.jboss.tools.arquillian.updatesite/plugins/org.jboss.tools.arquillian.core_1.0.0.201209041750.jar =================================================================== (Binary files differ) Added: workspace/snjeza/org.jboss.tools.arquillian.updatesite/plugins/org.jboss.tools.arquillian.core_1.0.1.201209062348.jar =================================================================== (Binary files differ) Property changes on: workspace/snjeza/org.jboss.tools.arquillian.updatesite/plugins/org.jboss.tools.arquillian.core_1.0.1.201209062348.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: workspace/snjeza/org.jboss.tools.arquillian.updatesite/plugins/org.jboss.tools.arquillian.ui_1.0.0.201209041750.jar =================================================================== (Binary files differ) Added: workspace/snjeza/org.jboss.tools.arquillian.updatesite/plugins/org.jboss.tools.arquillian.ui_1.0.1.201209062348.jar =================================================================== (Binary files differ) Property changes on: workspace/snjeza/org.jboss.tools.arquillian.updatesite/plugins/org.jboss.tools.arquillian.ui_1.0.1.201209062348.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: workspace/snjeza/org.jboss.tools.arquillian.updatesite/site.xml =================================================================== --- workspace/snjeza/org.jboss.tools.arquillian.updatesite/site.xml 2012-09-06 20:45:24 UTC (rev 43481) +++ workspace/snjeza/org.jboss.tools.arquillian.updatesite/site.xml 2012-09-06 21:49:50 UTC (rev 43482) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <site> - <feature url="features/org.jboss.tools.arquillian.feature_1.0.0.201209041750.jar" id="org.jboss.tools.arquillian.feature" version="1.0.0.201209041750"> + <feature url="features/org.jboss.tools.arquillian.feature_1.0.1.201209062348.jar" id="org.jboss.tools.arquillian.feature" version="1.0.1.201209062348"> <category name="org.jboss.tools.arquillian"/> </feature> <category-def name="org.jboss.tools.arquillian" label="Arquillian Support"/>

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43481 - in workspace/akazakov/db: org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-09-06 16:45:24 -0400 (Thu, 06 Sep 2012) New Revision: 43481 Added: workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/persistence.xml workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDBManager.java workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/BeanEntity.java workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/TypeEntity.java workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/AbstractDBManager.java Modified: workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/MANIFEST.MF workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDbPlugin.java workspace/akazakov/db/org.jboss.tools.common.db/META-INF/MANIFEST.MF Log: Share project "org.jboss.tools.cdi.db" into "https://svn.jboss.org/repos/jbosstools" https://issues.jboss.org/browse/JBIDE-12446 Modified: workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/MANIFEST.MF =================================================================== --- workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/MANIFEST.MF 2012-09-06 19:44:48 UTC (rev 43480) +++ workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/MANIFEST.MF 2012-09-06 20:45:24 UTC (rev 43481) @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Db +Bundle-Name: CDI DB Bundle-SymbolicName: org.jboss.tools.cdi.db;singleton:=true Bundle-Version: 1.4.0.qualifier Bundle-Activator: org.jboss.tools.cdi.db.CDIDbPlugin @@ -10,3 +10,5 @@ org.jboss.tools.cdi.core Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-Vendor: Red Hat, Inc. +Bundle-ClassPath: . Added: workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/persistence.xml =================================================================== --- workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/persistence.xml (rev 0) +++ workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/persistence.xml 2012-09-06 20:45:24 UTC (rev 43481) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<persistence xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" + version="2.0"> + + <persistence-unit name="orgJbossToolsCdiDbEntityManagerFactory" transaction-type="RESOURCE_LOCAL"> + <provider>org.hibernate.ejb.HibernatePersistence</provider> +  + <properties> + <property name="javax.persistence.jdbc.driver" value="org.apache.derby.jdbc.ClientDriver"/> + + <property name="hibernate.dialect" value="org.hibernate.dialect.DerbyDialect"/> +  + <property name="hibernate.hbm2ddl.auto" value="create"> + <property name="hibernate.show_sql" value="true"/> + <property name="hibernate.format_sql" value="true"/> +  + </properties> + </persistence-unit> + +</persistence> \ No newline at end of file Property changes on: workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/persistence.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDBManager.java =================================================================== --- workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDBManager.java (rev 0) +++ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDBManager.java 2012-09-06 20:45:24 UTC (rev 43481) @@ -0,0 +1,66 @@ +/******************************************************************************* + * Copyright (c) 2012 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.tools.cdi.db; + +import java.io.File; + +import org.eclipse.core.runtime.IPath; +import org.jboss.tools.cdi.db.entity.BeanEntity; +import org.jboss.tools.cdi.db.entity.TypeEntity; +import org.jboss.tools.common.db.AbstractDBManager; + +/** + * @author Alexey Kazakov + */ +public class CDIDBManager extends AbstractDBManager { + + private static final String ENTITY_MANAGER_FACTORY_NAME = "orgJbossToolsCdiDbEntityManagerFactory"; + private static final String DB_NAME = "DB/derbyDB"; + + private static final CDIDBManager instance = new CDIDBManager(); + + private CDIDBManager() { + } + + public static CDIDBManager getInstance() { + return instance; + } + + /* (non-Javadoc) + * @see org.jboss.tools.common.db.AbstractDBManager#getEntityManagerFactoryName() + */ + @Override + protected String getEntityManagerFactoryName() { + return ENTITY_MANAGER_FACTORY_NAME; + } + + /* (non-Javadoc) + * @see org.jboss.tools.common.db.AbstractDBManager#getDBPath() + */ + @Override + protected String getDBPath() { + CDIDbPlugin plugin = CDIDbPlugin.getDefault(); + //The plug-in instance can be null at shutdown, when the plug-in is stopped. + IPath path = plugin.getStateLocation(); + File file = new File(path.toFile(), DB_NAME); + String location = file.getAbsolutePath(); + return location; + } + + /* + * (non-Javadoc) + * @see org.jboss.tools.common.db.AbstractDBManager#getAnnotatedClasses() + */ + @Override + protected Class[] getAnnotatedClasses() { + return new Class[]{BeanEntity.class, TypeEntity.class}; + } +} \ No newline at end of file Property changes on: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDBManager.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDbPlugin.java =================================================================== --- workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDbPlugin.java 2012-09-06 19:44:48 UTC (rev 43480) +++ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDbPlugin.java 2012-09-06 20:45:24 UTC (rev 43481) @@ -1,5 +1,8 @@ package org.jboss.tools.cdi.db; +import java.sql.SQLException; + +import org.eclipse.swt.widgets.Display; import org.jboss.tools.common.log.BaseUIPlugin; import org.osgi.framework.BundleContext; @@ -18,24 +21,34 @@ * The constructor */ public CDIDbPlugin() { + plugin = this; } /* * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; + public void start(BundleContext bundleContext) throws Exception { + super.start(bundleContext); + Display.getDefault().asyncExec(new Runnable() { + public void run() { + try { + CDIDBManager.getInstance().start(); + } catch (InstantiationException | IllegalAccessException + | ClassNotFoundException | SQLException e) { + logError(e); + } + } + }); } /* * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); + public void stop(BundleContext bundleContext) throws Exception { + CDIDBManager.getInstance().stop(); + super.stop(bundleContext); } /** Added: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/BeanEntity.java =================================================================== --- workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/BeanEntity.java (rev 0) +++ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/BeanEntity.java 2012-09-06 20:45:24 UTC (rev 43481) @@ -0,0 +1,55 @@ +/******************************************************************************* + * Copyright (c) 2012 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.tools.cdi.db.entity; + +/** + * @author Alexey Kazakov + */ +@Entity +public class BeanEntity { + + private static final long serialVersionUID = 1L; + + private long id; + private String name; + + /** + * @return the id + */ + @Id + @GeneratedValue + @Column + public long getId() { + return id; + } + + /** + * @param id the id to set + */ + public void setId(long id) { + this.id = id; + } + + /** + * @return the name + */ + @Column + public String getName() { + return name; + } + + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } +} \ No newline at end of file Property changes on: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/BeanEntity.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/TypeEntity.java =================================================================== --- workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/TypeEntity.java (rev 0) +++ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/TypeEntity.java 2012-09-06 20:45:24 UTC (rev 43481) @@ -0,0 +1,18 @@ +/******************************************************************************* + * Copyright (c) 2012 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.tools.cdi.db.entity; + +/** + * @author Alexey Kazakov + */ +public class TypeEntity { + +} \ No newline at end of file Property changes on: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/entity/TypeEntity.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: workspace/akazakov/db/org.jboss.tools.common.db/META-INF/MANIFEST.MF =================================================================== --- workspace/akazakov/db/org.jboss.tools.common.db/META-INF/MANIFEST.MF 2012-09-06 19:44:48 UTC (rev 43480) +++ workspace/akazakov/db/org.jboss.tools.common.db/META-INF/MANIFEST.MF 2012-09-06 20:45:24 UTC (rev 43481) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: CommonDb Bundle-SymbolicName: org.jboss.tools.common.db;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 3.4.0.qualifier Bundle-Activator: org.jboss.tools.common.db.CommonDbPlugin Bundle-Vendor: Red Hat, Inc. Require-Bundle: org.eclipse.core.runtime, @@ -10,7 +10,354 @@ org.jboss.tools.common Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy -Export-Package: org.jboss.tools.common.db +Export-Package: antlr, + antlr.ASdebug, + antlr.actions.cpp, + antlr.actions.csharp, + antlr.actions.java, + antlr.actions.python, + antlr.build, + antlr.collections, + antlr.collections.impl, + antlr.debug, + antlr.debug.misc, + antlr.preprocessor, + javassist, + javassist.bytecode, + javassist.bytecode.analysis, + javassist.bytecode.annotation, + javassist.bytecode.stackmap, + javassist.compiler, + javassist.compiler.ast, + javassist.convert, + javassist.expr, + javassist.runtime, + javassist.scopedpool, + javassist.tools, + javassist.tools.reflect, + javassist.tools.rmi, + javassist.tools.web, + javassist.util, + javassist.util.proxy, + javax.persistence, + javax.persistence.criteria, + javax.persistence.metamodel, + javax.persistence.spi, + javax.transaction, + javax.transaction.xa, + org.apache.derby.authentication, + org.apache.derby.catalog, + org.apache.derby.catalog.types, + org.apache.derby.client, + org.apache.derby.client.am, + org.apache.derby.client.am.stmtcache, + org.apache.derby.client.net, + org.apache.derby.database, + org.apache.derby.diag, + org.apache.derby.drda, + org.apache.derby.iapi.db, + org.apache.derby.iapi.error, + org.apache.derby.iapi.jdbc, + org.apache.derby.iapi.reference, + org.apache.derby.iapi.security, + org.apache.derby.iapi.services.cache, + org.apache.derby.iapi.services.classfile, + org.apache.derby.iapi.services.compiler, + org.apache.derby.iapi.services.context, + org.apache.derby.iapi.services.crypto, + org.apache.derby.iapi.services.daemon, + org.apache.derby.iapi.services.diag, + org.apache.derby.iapi.services.i18n, + org.apache.derby.iapi.services.info, + org.apache.derby.iapi.services.io, + org.apache.derby.iapi.services.jmx, + org.apache.derby.iapi.services.loader, + org.apache.derby.iapi.services.locks, + org.apache.derby.iapi.services.memory, + org.apache.derby.iapi.services.monitor, + org.apache.derby.iapi.services.property, + org.apache.derby.iapi.services.stream, + org.apache.derby.iapi.services.timer, + org.apache.derby.iapi.services.uuid, + org.apache.derby.iapi.sql, + org.apache.derby.iapi.sql.compile, + org.apache.derby.iapi.sql.conn, + org.apache.derby.iapi.sql.depend, + org.apache.derby.iapi.sql.dictionary, + org.apache.derby.iapi.sql.execute, + org.apache.derby.iapi.sql.execute.xplain, + org.apache.derby.iapi.store.access, + org.apache.derby.iapi.store.access.conglomerate, + org.apache.derby.iapi.store.access.xa, + org.apache.derby.iapi.store.raw, + org.apache.derby.iapi.store.raw.data, + org.apache.derby.iapi.store.raw.log, + org.apache.derby.iapi.store.raw.xact, + org.apache.derby.iapi.store.replication.master, + org.apache.derby.iapi.store.replication.slave, + org.apache.derby.iapi.tools.i18n, + org.apache.derby.iapi.types, + org.apache.derby.iapi.util, + org.apache.derby.impl.db, + org.apache.derby.impl.drda, + org.apache.derby.impl.io, + org.apache.derby.impl.io.vfmem, + org.apache.derby.impl.jdbc, + org.apache.derby.impl.jdbc.authentication, + org.apache.derby.impl.load, + org.apache.derby.impl.services.bytecode, + org.apache.derby.impl.services.cache, + org.apache.derby.impl.services.daemon, + org.apache.derby.impl.services.jce, + org.apache.derby.impl.services.jmx, + org.apache.derby.impl.services.jmxnone, + org.apache.derby.impl.services.locks, + org.apache.derby.impl.services.monitor, + org.apache.derby.impl.services.reflect, + org.apache.derby.impl.services.stream, + org.apache.derby.impl.services.timer, + org.apache.derby.impl.services.uuid, + org.apache.derby.impl.sql, + org.apache.derby.impl.sql.catalog, + org.apache.derby.impl.sql.compile, + org.apache.derby.impl.sql.conn, + org.apache.derby.impl.sql.depend, + org.apache.derby.impl.sql.execute, + org.apache.derby.impl.sql.execute.rts, + org.apache.derby.impl.sql.execute.xplain, + org.apache.derby.impl.store.access, + org.apache.derby.impl.store.access.btree, + org.apache.derby.impl.store.access.btree.index, + org.apache.derby.impl.store.access.conglomerate, + org.apache.derby.impl.store.access.heap, + org.apache.derby.impl.store.access.sort, + org.apache.derby.impl.store.raw, + org.apache.derby.impl.store.raw.data, + org.apache.derby.impl.store.raw.log, + org.apache.derby.impl.store.raw.xact, + org.apache.derby.impl.store.replication, + org.apache.derby.impl.store.replication.buffer, + org.apache.derby.impl.store.replication.master, + org.apache.derby.impl.store.replication.net, + org.apache.derby.impl.store.replication.slave, + org.apache.derby.impl.tools.dblook, + org.apache.derby.impl.tools.ij, + org.apache.derby.impl.tools.planexporter, + org.apache.derby.impl.tools.sysinfo, + org.apache.derby.io, + org.apache.derby.jdbc, + org.apache.derby.mbeans, + org.apache.derby.mbeans.drda, + org.apache.derby.osgi, + org.apache.derby.security, + org.apache.derby.shared.common.error, + org.apache.derby.shared.common.i18n, + org.apache.derby.tools, + org.apache.derby.vti, + org.dom4j, + org.dom4j.bean, + org.dom4j.datatype, + org.dom4j.dom, + org.dom4j.dtd, + org.dom4j.io, + org.dom4j.jaxb, + org.dom4j.rule, + org.dom4j.rule.pattern, + org.dom4j.swing, + org.dom4j.tree, + org.dom4j.util, + org.dom4j.xpath, + org.dom4j.xpp, + org.hibernate, + org.hibernate.action.internal, + org.hibernate.action.spi, + org.hibernate.annotations, + org.hibernate.annotations.common, + org.hibernate.annotations.common.annotationfactory, + org.hibernate.annotations.common.reflection, + org.hibernate.annotations.common.reflection.java, + org.hibernate.annotations.common.reflection.java.generics, + org.hibernate.annotations.common.util, + org.hibernate.annotations.common.util.impl, + org.hibernate.bytecode.buildtime.internal, + org.hibernate.bytecode.buildtime.spi, + org.hibernate.bytecode.instrumentation.internal, + org.hibernate.bytecode.instrumentation.internal.javassist, + org.hibernate.bytecode.instrumentation.spi, + org.hibernate.bytecode.internal.javassist, + org.hibernate.bytecode.spi, + org.hibernate.cache, + org.hibernate.cache.internal, + org.hibernate.cache.spi, + org.hibernate.cache.spi.access, + org.hibernate.cache.spi.entry, + org.hibernate.cfg, + org.hibernate.cfg.annotations, + org.hibernate.cfg.annotations.reflection, + org.hibernate.cfg.beanvalidation, + org.hibernate.classic, + org.hibernate.collection.internal, + org.hibernate.collection.spi, + org.hibernate.context, + org.hibernate.context.internal, + org.hibernate.context.spi, + org.hibernate.criterion, + org.hibernate.dialect, + org.hibernate.dialect.function, + org.hibernate.dialect.lock, + org.hibernate.dialect.pagination, + org.hibernate.dialect.resolver, + org.hibernate.ejb, + org.hibernate.ejb.cfg.spi, + org.hibernate.ejb.connection, + org.hibernate.ejb.criteria, + org.hibernate.ejb.criteria.expression, + org.hibernate.ejb.criteria.expression.function, + org.hibernate.ejb.criteria.path, + org.hibernate.ejb.criteria.predicate, + org.hibernate.ejb.event, + org.hibernate.ejb.instrument, + org.hibernate.ejb.internal, + org.hibernate.ejb.metamodel, + org.hibernate.ejb.packaging, + org.hibernate.ejb.util, + org.hibernate.engine, + org.hibernate.engine.internal, + org.hibernate.engine.jdbc, + org.hibernate.engine.jdbc.batch.internal, + org.hibernate.engine.jdbc.batch.spi, + org.hibernate.engine.jdbc.internal, + org.hibernate.engine.jdbc.internal.proxy, + org.hibernate.engine.jdbc.spi, + org.hibernate.engine.loading.internal, + org.hibernate.engine.profile, + org.hibernate.engine.query.spi, + org.hibernate.engine.query.spi.sql, + org.hibernate.engine.spi, + org.hibernate.engine.transaction.internal, + org.hibernate.engine.transaction.internal.jdbc, + org.hibernate.engine.transaction.internal.jta, + org.hibernate.engine.transaction.spi, + org.hibernate.engine.transaction.synchronization.internal, + org.hibernate.engine.transaction.synchronization.spi, + org.hibernate.event.internal, + org.hibernate.event.service.internal, + org.hibernate.event.service.spi, + org.hibernate.event.spi, + org.hibernate.exception, + org.hibernate.exception.internal, + org.hibernate.exception.spi, + org.hibernate.hql.internal, + org.hibernate.hql.internal.antlr, + org.hibernate.hql.internal.ast, + org.hibernate.hql.internal.ast.exec, + org.hibernate.hql.internal.ast.tree, + org.hibernate.hql.internal.ast.util, + org.hibernate.hql.internal.classic, + org.hibernate.hql.spi, + org.hibernate.id, + org.hibernate.id.enhanced, + org.hibernate.id.factory, + org.hibernate.id.factory.internal, + org.hibernate.id.factory.spi, + org.hibernate.id.insert, + org.hibernate.id.uuid, + org.hibernate.integrator.internal, + org.hibernate.integrator.spi, + org.hibernate.internal, + org.hibernate.internal.jaxb, + org.hibernate.internal.jaxb.cfg, + org.hibernate.internal.jaxb.mapping.hbm, + org.hibernate.internal.jaxb.mapping.orm, + org.hibernate.internal.util, + org.hibernate.internal.util.beans, + org.hibernate.internal.util.collections, + org.hibernate.internal.util.compare, + org.hibernate.internal.util.config, + org.hibernate.internal.util.io, + org.hibernate.internal.util.jndi, + org.hibernate.internal.util.xml, + org.hibernate.jdbc, + org.hibernate.jmx, + org.hibernate.loader, + org.hibernate.loader.collection, + org.hibernate.loader.criteria, + org.hibernate.loader.custom, + org.hibernate.loader.custom.sql, + org.hibernate.loader.entity, + org.hibernate.loader.hql, + org.hibernate.lob, + org.hibernate.mapping, + org.hibernate.metadata, + org.hibernate.metamodel, + org.hibernate.metamodel.binding, + org.hibernate.metamodel.domain, + org.hibernate.metamodel.relational, + org.hibernate.metamodel.relational.state, + org.hibernate.metamodel.source, + org.hibernate.metamodel.source.annotations, + org.hibernate.metamodel.source.annotations.attribute, + org.hibernate.metamodel.source.annotations.attribute.type, + org.hibernate.metamodel.source.annotations.entity, + org.hibernate.metamodel.source.annotations.global, + org.hibernate.metamodel.source.annotations.xml, + org.hibernate.metamodel.source.annotations.xml.filter, + org.hibernate.metamodel.source.annotations.xml.mocker, + org.hibernate.metamodel.source.binder, + org.hibernate.metamodel.source.hbm, + org.hibernate.metamodel.source.internal, + org.hibernate.param, + org.hibernate.persister.collection, + org.hibernate.persister.entity, + org.hibernate.persister.internal, + org.hibernate.persister.spi, + org.hibernate.pretty, + org.hibernate.property, + org.hibernate.proxy, + org.hibernate.proxy.dom4j, + org.hibernate.proxy.map, + org.hibernate.proxy.pojo, + org.hibernate.proxy.pojo.javassist, + org.hibernate.secure.internal, + org.hibernate.service, + org.hibernate.service.classloading.internal, + org.hibernate.service.classloading.spi, + org.hibernate.service.config.internal, + org.hibernate.service.config.spi, + org.hibernate.service.internal, + org.hibernate.service.jdbc.connections.internal, + org.hibernate.service.jdbc.connections.spi, + org.hibernate.service.jdbc.dialect.internal, + org.hibernate.service.jdbc.dialect.spi, + org.hibernate.service.jmx.internal, + org.hibernate.service.jmx.spi, + org.hibernate.service.jndi, + org.hibernate.service.jndi.internal, + org.hibernate.service.jndi.spi, + org.hibernate.service.jta.platform.internal, + org.hibernate.service.jta.platform.spi, + org.hibernate.service.spi, + org.hibernate.sql, + org.hibernate.sql.ordering.antlr, + org.hibernate.stat, + org.hibernate.stat.internal, + org.hibernate.stat.spi, + org.hibernate.tool.hbm2ddl, + org.hibernate.tool.instrument, + org.hibernate.tool.instrument.javassist, + org.hibernate.transaction, + org.hibernate.transform, + org.hibernate.tuple, + org.hibernate.tuple.component, + org.hibernate.tuple.entity, + org.hibernate.type, + org.hibernate.type.descriptor, + org.hibernate.type.descriptor.java, + org.hibernate.type.descriptor.sql, + org.hibernate.usertype, + org.jboss.logging, + org.jboss.tools.common.db, + org.jboss.tools.common.db.test Bundle-ClassPath: ., lib/antlr-2.7.7.jar, lib/derby.jar, Added: workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/AbstractDBManager.java =================================================================== --- workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/AbstractDBManager.java (rev 0) +++ workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/AbstractDBManager.java 2012-09-06 20:45:24 UTC (rev 43481) @@ -0,0 +1,104 @@ +/******************************************************************************* + * Copyright (c) 2012 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.tools.common.db; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; + +import org.hibernate.ejb.Ejb3Configuration; + +/** + * @author Alexey Kazakov + */ +public abstract class AbstractDBManager { + + protected static final String driver = "org.apache.derby.jdbc.ClientDriver"; + protected static final String protocol = "jdbc:derby:"; + + protected boolean started; + protected String url; + + protected EntityManagerFactory emf; + + protected abstract String getEntityManagerFactoryName(); + + protected abstract String getDBPath(); + + protected abstract Class[] getAnnotatedClasses(); + + public synchronized void start() throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException { + if(started) { + return; + } + CommonDbPlugin.getDefault().getBundle().loadClass(driver).newInstance(); + Properties props = new Properties(); + url = protocol + getDBPath(); + Connection conn = DriverManager.getConnection(url + ";create=true", props); + conn.close(); + started = true; + init(); + } + + public EntityManager createEntityManager() { + try { + start(); + } catch (InstantiationException | IllegalAccessException + | ClassNotFoundException | SQLException e) { + CommonDbPlugin.getDefault().logError(e); + } + EntityManager em = emf.createEntityManager(); + return em; + } + + private void init() { + Map<String, Object> configOverrides = new HashMap<String, Object>(); + configOverrides.put("javax.persistence.jdbc.url", url); + +// emf = Persistence.createEntityManagerFactory(entityManagerFactoryName, configOverrides); + + Ejb3Configuration cfg = new Ejb3Configuration(); + Ejb3Configuration configured = cfg.configure(getEntityManagerFactoryName(), configOverrides); + Class[] annotatedClasses = getAnnotatedClasses(); + for (Class annotatedClass : annotatedClasses) { + configured.addAnnotatedClass(annotatedClass); + } +// configured.setProperty("javax.persistence.jdbc.driver", driver); +// configured.setProperty("hibernate.dialect", "org.hibernate.dialect.DerbyDialect"); +// configured.setProperty("hibernate.hbm2ddl.auto", "create"); +// configured.setProperty("hibernate.show_sql", "true"); +// configured.setProperty("hibernate.format_sql", "true"); + emf = configured.buildEntityManagerFactory(); + } + + public synchronized void stop() { + if(!started) { + return; + } + try { + emf.close(); + DriverManager.getConnection(url); + } catch (SQLException e) { + if (((e.getErrorCode() != 50000) || (!"XJ015".equals(e.getSQLState()) ))) { + //"Derby did not shut down normally" + CommonDbPlugin.getDefault().logError(e); + } else { + started = false; + } + } + } +} \ No newline at end of file Property changes on: workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/AbstractDBManager.java ___________________________________________________________________ Added: svn:mime-type + text/plain

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43480 - workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2012-09-06 15:44:48 -0400 (Thu, 06 Sep 2012) New Revision: 43480 Modified: workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/CommonDbPlugin.java workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/DBManager.java Log: JBIDE-12446 https://issues.jboss.org/browse/JBIDE-12446 Modified: workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/CommonDbPlugin.java =================================================================== --- workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/CommonDbPlugin.java 2012-09-06 19:38:55 UTC (rev 43479) +++ workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/CommonDbPlugin.java 2012-09-06 19:44:48 UTC (rev 43480) @@ -30,9 +30,14 @@ public void run() { try { DBManager.getInstance().start(); - } catch (InstantiationException | IllegalAccessException - | ClassNotFoundException | SQLException e) { + } catch (InstantiationException e) { logError(e); + } catch (IllegalAccessException e) { + logError(e); + } catch (ClassNotFoundException e) { + logError(e); + } catch (SQLException e) { + logError(e); } } }); Modified: workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/DBManager.java =================================================================== --- workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/DBManager.java 2012-09-06 19:38:55 UTC (rev 43479) +++ workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/DBManager.java 2012-09-06 19:44:48 UTC (rev 43480) @@ -72,9 +72,14 @@ public EntityManager createEntityManager() { try { start(); - } catch (InstantiationException | IllegalAccessException - | ClassNotFoundException | SQLException e) { + } catch (InstantiationException e) { CommonDbPlugin.getDefault().logError(e); + } catch (IllegalAccessException e) { + CommonDbPlugin.getDefault().logError(e); + } catch (ClassNotFoundException e) { + CommonDbPlugin.getDefault().logError(e); + } catch (SQLException e) { + CommonDbPlugin.getDefault().logError(e); } EntityManager em = emf.createEntityManager(); return em;

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43479 - trunk/build/target-platform.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-09-06 15:38:55 -0400 (Thu, 06 Sep 2012) New Revision: 43479 Modified: trunk/build/target-platform/multiple.target.p2mirror.xml Log: update multiple.target.p2mirror.xml with new IU versions Modified: trunk/build/target-platform/multiple.target.p2mirror.xml =================================================================== --- trunk/build/target-platform/multiple.target.p2mirror.xml 2012-09-06 19:38:48 UTC (rev 43478) +++ trunk/build/target-platform/multiple.target.p2mirror.xml 2012-09-06 19:38:55 UTC (rev 43479) @@ -53,16 +53,16 @@ <iu id="org.apache.lucene" version="1.9.1.v201101211617"/> <iu id="org.junit" version="4.10.0.v4_10_0_v20120426-0900"/> <iu id="org.junit" version="3.8.2.v3_8_2_v20100427-1100"/> -<iu id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120530-0009"/> -<iu id="org.eclipse.m2e.feature.feature.group" version="1.1.0.20120530-0009"/> -<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/> -<iu id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201206251206"/> +<iu id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/> +<iu id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/> +<iu id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120830-0951"/> +<iu id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125"/> <iu id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/> <iu id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/> <iu id="ch.qos.logback.slf4j" version="1.0.0.v20120123-1500"/> <iu id="org.slf4j.api" version="1.6.4.v20120130-2120"/> -<iu id="com.ning.async-http-client" version="1.6.5.20120529-1956"/> -<iu id="org.jboss.netty" version="3.2.5.Final-20120529-1956"/> +<iu id="com.ning.async-http-client" version="1.6.5.20120903-0645"/> +<iu id="org.jboss.netty" version="3.2.5.Final-20120903-0645"/> <iu id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.101.v20120524-1717"/> <iu id="org.eclipse.equinox.p2.discovery" version="1.0.200.v20120524-1717"/> <iu id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110808-1657"/> @@ -76,7 +76,7 @@ <iu id="org.hamcrest.text" version="1.1.0.v20090501071000"/> <iu id="org.hamcrest.library" version="1.1.0.v20090501071000"/> <iu id="org.hamcrest.integration" version="1.1.0.v20090501071000"/> -<iu id="org.apache.lucene.core" version="3.5.0.v20120319-2345"/> +<iu id="org.apache.lucene.core" version="3.5.0.v20120725-1805"/> <iu id="org.apache.lucene.highlighter" version="3.5.0.v20120319-2345"/> <iu id="org.apache.lucene.memory" version="3.5.0.v20120319-2345"/> <iu id="org.apache.lucene.misc" version="3.5.0.v20120319-2345"/> @@ -86,88 +86,88 @@ <iu id="org.eclipse.emf.workspace.feature.group" version="1.6.0.v20120328-0001-37708s734E377I3B4C2"/> <iu id="org.eclipse.emf.validation.feature.group" version="1.6.0.v20120328-0001-479-9oB56N5BBR6LCA6"/> <iu id="org.eclipse.emf.transaction.feature.group" version="1.6.0.v20120328-0001-377-8s734C3E7D15D6B"/> -<iu id="org.eclipse.emf.feature.group" version="2.8.0.v20120608-0554"/> -<iu id="org.eclipse.emf.ecore.feature.group" version="2.8.0.v20120606-0717"/> -<iu id="org.eclipse.emf.codegen.feature.group" version="2.8.0.v20120608-0554"/> -<iu id="org.eclipse.emf.common.feature.group" version="2.8.0.v20120606-0717"/> -<iu id="org.eclipse.emf.databinding.feature.group" version="1.2.0.v20120608-0554"/> -<iu id="org.eclipse.emf.codegen.ecore.feature.group" version="2.8.0.v20120608-0554"/> -<iu id="org.eclipse.emf.ecore.edit.feature.group" version="2.8.0.v20120608-0554"/> -<iu id="org.eclipse.emf.ecore.editor.feature.group" version="2.8.0.v20120608-0554"/> -<iu id="org.eclipse.emf.ecore.feature.group" version="2.8.0.v20120606-0717"/> -<iu id="org.eclipse.emf.edit.feature.group" version="2.8.0.v20120608-0554"/> -<iu id="org.eclipse.xsd.edit.feature.group" version="2.7.0.v20120319-0555"/> -<iu id="org.eclipse.xsd.ecore.converter.feature.group" version="2.7.0.v20120319-0555"/> -<iu id="org.eclipse.xsd.editor.feature.group" version="2.7.0.v20120319-0555"/> -<iu id="org.eclipse.xsd.mapping.editor.feature.group" version="2.7.0.v20120319-0555"/> -<iu id="org.eclipse.xsd.mapping.feature.group" version="2.7.0.v20120319-0555"/> -<iu id="org.eclipse.xsd.feature.group" version="2.8.0.v20120319-0555"/> -<iu id="org.eclipse.graphiti.feature.feature.group" version="0.9.0.v20120613-0805"/> -<iu id="org.eclipse.draw2d.feature.group" version="3.8.0.201206112118"/> -<iu id="org.eclipse.gef.feature.group" version="3.8.0.201206112118"/> -<iu id="org.eclipse.zest.feature.group" version="1.4.0.201206112118"/> -<iu id="org.eclipse.uml2.feature.group" version="4.0.0.v20120604-0919"/> -<iu id="org.eclipse.uml2.doc.feature.group" version="4.0.0.v20120604-0919"/> +<iu id="org.eclipse.emf.feature.group" version="2.8.0.v20120820-0827"/> +<iu id="org.eclipse.emf.ecore.feature.group" version="2.8.0.v20120530-0726"/> +<iu id="org.eclipse.emf.codegen.feature.group" version="2.8.0.v20120820-0827"/> +<iu id="org.eclipse.emf.common.feature.group" version="2.8.0.v20120530-0726"/> +<iu id="org.eclipse.emf.databinding.feature.group" version="1.2.0.v20120820-0827"/> +<iu id="org.eclipse.emf.codegen.ecore.feature.group" version="2.8.0.v20120820-0827"/> +<iu id="org.eclipse.emf.ecore.edit.feature.group" version="2.8.0.v20120820-0827"/> +<iu id="org.eclipse.emf.ecore.editor.feature.group" version="2.8.0.v20120820-0827"/> +<iu id="org.eclipse.emf.ecore.feature.group" version="2.8.0.v20120530-0726"/> +<iu id="org.eclipse.emf.edit.feature.group" version="2.8.0.v20120820-0827"/> +<iu id="org.eclipse.xsd.edit.feature.group" version="2.7.0.v20120820-0827"/> +<iu id="org.eclipse.xsd.ecore.converter.feature.group" version="2.7.0.v20120820-0827"/> +<iu id="org.eclipse.xsd.editor.feature.group" version="2.7.0.v20120820-0827"/> +<iu id="org.eclipse.xsd.mapping.editor.feature.group" version="2.7.0.v20120820-0827"/> +<iu id="org.eclipse.xsd.mapping.feature.group" version="2.7.0.v20120820-0827"/> +<iu id="org.eclipse.xsd.feature.group" version="2.8.0.v20120820-0827"/> +<iu id="org.eclipse.graphiti.feature.feature.group" version="0.10.0.v20120822-0712"/> +<iu id="org.eclipse.draw2d.feature.group" version="3.9.0.201208201742"/> +<iu id="org.eclipse.gef.feature.group" version="3.9.0.201208201742"/> +<iu id="org.eclipse.zest.feature.group" version="1.5.0.201208201742"/> +<iu id="org.eclipse.uml2.feature.group" version="4.1.0.v20120820-1018"/> +<iu id="org.eclipse.uml2.doc.feature.group" version="4.0.0.v20120820-1018"/> <iu id="com.ibm.icu.base" version="4.4.2.v20110831"/> -<iu id="org.eclipse.platform.feature.group" version="4.2.0.v20120608-135145-9JF7BHV8FyMteji0Oi_ePMz0xuZ8TVo7lV0z0ecb"/> -<iu id="org.eclipse.platform.ide" version="4.2.0.I20120608-1400"/> -<iu id="org.eclipse.platform.sdk" version="4.2.0.I20120608-1400"/> -<iu id="org.eclipse.sdk.feature.group" version="4.2.0.v20120528-1648-7T7oDFDPz-3FepgRqG6kkFFY0UF4_otgmt0XcoU3Zh27X"/> -<iu id="org.eclipse.sdk.ide" version="4.2.0.I20120608-1400"/> -<iu id="org.eclipse.cvs.feature.group" version="1.3.200.v20120525-1249-7B79FJJAkF7BF7SDL5EAJT"/> -<iu id="org.eclipse.jdt.feature.group" version="3.8.0.v20120525-1249-8-8nFqlFNOfwKDRGz-pXLdGxEM83"/> -<iu id="org.eclipse.equinox.server.core.feature.group" version="1.2.0.v20120522-1841-7K7VFMRF7RZHQYI0Yh8U-ov"/> -<iu id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20120522-1813-7P7OG2BFLWUl7UmbVUO9iCm"/> -<iu id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.8.0.v20120522-1841-7X7eGb7FPGjtJjv1kjS_NdG"/> -<iu id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20120522-1813-85FAcGbBFoYTldHrOJw3cF4q"/> -<iu id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.100.v20120524-0542-4-Bh9oB58A5N9L28PCQ"/> -<iu id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.2.0.v20120524-0542-62DG9JXTlSiz-UbcP0w0KGe8CBOP"/> -<iu id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20120524-0542-9N89H_mGMMn84Osz0TAoT279BRQD"/> -<iu id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.8.0.v20120522-1841-9Q7dFszFYGis9uYGz0QodZP3fH0t"/> -<iu id="org.eclipse.equinox.sdk.feature.group" version="3.8.0.v20120522-1841-7M7fA78g5_y-eMftHxcd13UXuq5J"/> +<iu id="org.eclipse.platform.feature.group" version="4.3.0.v20120727-171144-9KF7CHf5FyMxeLi-Iz-9z0MtZ4Q8crIZAVOC36vw"/> +<iu id="org.eclipse.platform.ide" version="4.3.0.I20120810-1300"/> +<iu id="org.eclipse.platform.sdk" version="4.3.0.I20120810-1300"/> +<iu id="org.eclipse.sdk.feature.group" version="4.3.0.v20120727-171144-7V7n-DQ22xfxjVXG5scgUeFwckedrIGOKmbqr1IW4X2Vx"/> +<iu id="org.eclipse.sdk.ide" version="4.3.0.I20120810-1300"/> +<iu id="org.eclipse.cvs.feature.group" version="1.4.0.v20120730-104118-7B79FKsAkF7BF7YAJ5DADR33"/> +<iu id="org.eclipse.jdt.feature.group" version="3.9.0.v20120730-103744-8-8sFsJFNOfwKDRof2XLLkiPe834"/> +<iu id="org.eclipse.equinox.server.core.feature.group" version="1.2.0.v20120522-1841-7K7VFPZF7RZHQYI3Ye8U-npC3"/> +<iu id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20120712-135254-7P7OG2BFLWUl7UmbVUO9iCm"/> +<iu id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.8.0.v20120522-1841-7X7eGb7FPGjtJjv5gnS_NfK9L"/> +<iu id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20120522-1813-85FAcGeJFoYTldHrSJo3cL2cB3"/> +<iu id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.100.v20120727-170929-4-Bh9oB58A5N9L28PCQ"/> +<iu id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.2.0.v20120727-170929-62DG9JXTlnuNxj_D_tr8ntb4l116"/> +<iu id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20120524-0542-9N89HcuGMMn84OtVe6oi86mqVQDR"/> +<iu id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.8.0.v20120522-1841-9Q7dFszFYGis9uaOz0QodZP3fU3v"/> +<iu id="org.eclipse.equinox.sdk.feature.group" version="3.8.0.v20120522-1841-7M7fA78g5_yLw2FwEmCaw5gZ1Bbh"/> <iu id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.0.200.v20120522-1841-79-FKsEVVFNVFsVk7O6G6"/> <iu id="org.eclipse.equinox.server.jetty.feature.group" version="1.1.0.v20120522-1841-8077C0F8NcJTbL1ab47MJ5"/> -<iu id="org.eclipse.equinox.server.p2.feature.group" version="1.2.0.v20120522-1841-7z7_FfoFTy21Yu4Ydp_WohB38"/> +<iu id="org.eclipse.equinox.server.p2.feature.group" version="1.2.0.v20120522-1841-7z7_FfoFTy21Yu4hgu_dskz0FU"/> <iu id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.101.v20120522-1841-42F9w9oB58B5KBB2ADHO"/> -<iu id="org.eclipse.rcp.feature.group" version="4.2.0.v20120528-1648-7IAPA7BrHQicRpNdOz-Obz-rlRCA"/> -<iu id="org.eclipse.pde.feature.group" version="3.8.0.v20120525-1249-7c7vFitFFt6Zr5a12MM4IKMFZ"/> -<iu id="org.eclipse.help.feature.group" version="1.4.0.v20120608-133537-8P7vFOTFK_Qj4JmDIQXL8Tn"/> +<iu id="org.eclipse.rcp.feature.group" version="4.3.0.v20120727-171144-7IAQA8BrHQisRz-ZiOxKu7_z02rn"/> +<iu id="org.eclipse.pde.feature.group" version="3.8.0.v20120525-1249-7c7wFqhFFt6Zr5aOvRLz0BJI0D"/> +<iu id="org.eclipse.help.feature.group" version="2.0.0.v20120727-171144-8T7WFLIFK_Qj4LmbHWT0RR95F"/> <iu id="org.eclipse.update.ui" version="3.3.0.v20120523-1742"/> -<iu id="org.eclipse.update.core" version="3.2.600.v20120530-1204"/> -<iu id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.10.0.v201201161512-7707DCcNBHJDWIYG_Ni"/> -<iu id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.10.0.v201201161512-7C7h90Et1axo7RlVkOfDNlAf45E"/> -<iu id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.10.0.v201201161512-7H7C7QCcNBHLCcJaFWRa"/> -<iu id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.10.0.v201201161512-4127w312312232267"/> -<iu id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.10.0.v201201161512-7B7C7LCcNBGTBfLREXcc"/> -<iu id="org.eclipse.datatools.enablement.feature.feature.group" version="1.10.0.v201201161512-7J9Q0BWxeMcYB5KWfz-eG7qiq-sX"/> -<iu id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.10.0.v201201161512-77798fBmKDQ2MoTTLwdv9ILX"/> -<iu id="org.eclipse.datatools.enablement.hsqldb.feature.feature.group" version="1.10.0.v201201161512-67E0AqGBM7KfNTHwKO9ILX"/> -<iu id="org.eclipse.datatools.enablement.ibm.feature.feature.group" version="1.10.0.v201201161512-7F47WFC7sRdqScnobkd4"/> -<iu id="org.eclipse.datatools.enablement.jdbc.feature.feature.group" version="1.10.0.v201201161512-4-29oB5885QBB8HKW"/> -<iu id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.10.0.v201201161512-2-07w312218332612"/> -<iu id="org.eclipse.datatools.enablement.msft.feature.feature.group" version="1.10.0.v201201161512-544AkF7AL7MDMAQ8O"/> -<iu id="org.eclipse.datatools.enablement.mysql.feature.feature.group" version="1.10.0.v201201161512-5477AkF7AK7_AMENEA"/> -<iu id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.10.0.v201201161512-7A7T7CDZRDKHF_HnGjOX"/> -<iu id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group" version="1.10.0.v201201161512-3368s7356485C59AB"/> -<iu id="org.eclipse.datatools.enablement.oracle.feature.feature.group" version="1.10.0.v201201161512-548fAkF7AL7RBJANAI"/> -<iu id="org.eclipse.datatools.enablement.postgresql.feature.feature.group" version="1.10.0.v201201161512-553AkF7AK8PCRBQBP"/> -<iu id="org.eclipse.datatools.enablement.sap.feature.feature.group" version="1.10.0.v201201161512-540AkF7AJ7YEJBU7S"/> -<iu id="org.eclipse.datatools.enablement.sybase.feature.feature.group" version="1.10.0.v201201161512-7E46F9NiNc1QBgyT6T6"/> -<iu id="org.eclipse.datatools.enablement.ingres.feature.feature.group" version="1.10.0.v201201161512-540AkF78Z7UCRAQDB"/> -<iu id="org.eclipse.datatools.enablement.sqlite.feature.feature.group" version="1.10.0.v201201161512-542AkF7AJ7SAKAPBF"/> -<iu id="org.eclipse.datatools.sqldevtools.feature.feature.group" version="1.10.0.v201201161512-7N8B7CFDsn4hwBXz-0AGu5i6V36H"/> -<iu id="org.eclipse.datatools.sqldevtools.results.feature.feature.group" version="1.10.0.v201201161512-57B78AkF7BD7QFE9VEG"/> -<iu id="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group" version="1.10.0.v201201161512-7A-78F7RZHQSIqWjN1Zr"/> -<iu id="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group" version="1.10.0.v201201161512-279-78B089G8S_IRTJrXkO2_s"/> -<iu id="org.eclipse.datatools.sqldevtools.data.feature.feature.group" version="1.10.0.v201201161512-644BgJ9ECCLFTAfMO"/> -<iu id="org.eclipse.datatools.sqldevtools.parsers.feature.feature.group" version="1.10.0.v201201161512-623BgJ9EE9ZJRDZLA"/> -<iu id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group" version="1.10.0.v201201161512-79-78EVVFNOGnTeK-SY"/> -<iu id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature.feature.group" version="1.10.0.v201201161512-4208375LG5BJ93413"/> -<iu id="org.eclipse.datatools.intro.feature.group" version="1.10.0.v201201161512-26-7w312116392911"/> -<iu id="org.eclipse.datatools.doc.user.feature.group" version="1.10.0.v201201161512-47C08w95FFAK89FHEC7"/> -<iu id="org.eclipse.datatools.common.doc.user.feature.group" version="1.10.0.v201201161512-26-311A16321A3557"/> -<iu id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.10.0.v201201161512-37D-7733L3D753L7BBF"/> -<iu id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.10.0.v201201161512-37D-7733L3D753L7BBF"/> +<iu id="org.eclipse.update.core" version="3.2.600.v20120820-205746"/> +<iu id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.10.1.v201208161415-7707FCcNBHLCgLUEdUb"/> +<iu id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.10.1.v201208161415-7C7h94Et1axpBXkXlTa6YkKdDy4"/> +<iu id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.10.1.v201208161415-7H7C7SCcNBHLCfLcEbRW"/> +<iu id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.10.1.v201208161415-4127w312312232267"/> +<iu id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.10.1.v201208161415-7B7C7NCcNBGUBnIZDaUY"/> +<iu id="org.eclipse.datatools.enablement.feature.feature.group" version="1.10.1.v201208161415-7J9Q7FBWxeNcZB5LWgyhH7patz0v"/> +<iu id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.10.1.v201208161415-77798gBmKDQ2MoTULxcy9IIQ"/> +<iu id="org.eclipse.datatools.enablement.hsqldb.feature.feature.group" version="1.10.1.v201208161415-67E1AqGBM7KfNUHxJR9IIQ"/> +<iu id="org.eclipse.datatools.enablement.ibm.feature.feature.group" version="1.10.1.v201208161415-7F47WFC7sRdqScnobkd4"/> +<iu id="org.eclipse.datatools.enablement.jdbc.feature.feature.group" version="1.10.1.v201208161415-4-29oB5895RAE8HHP"/> +<iu id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.10.1.v201208161415-2-07w312218332612"/> +<iu id="org.eclipse.datatools.enablement.msft.feature.feature.group" version="1.10.1.v201208161415-544AkF7AL7MDMAQ8O"/> +<iu id="org.eclipse.datatools.enablement.mysql.feature.feature.group" version="1.10.1.v201208161415-5477AkF7AK7_AMENEA"/> +<iu id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.10.1.v201208161415-7A7T7CDZRDKHF_HnGjOX"/> +<iu id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group" version="1.10.1.v201208161415-3368s7356485C59AB"/> +<iu id="org.eclipse.datatools.enablement.oracle.feature.feature.group" version="1.10.1.v201208161415-548fAkF7AL7RBJANAI"/> +<iu id="org.eclipse.datatools.enablement.postgresql.feature.feature.group" version="1.10.1.v201208161415-553AkF7AK8PCRBQBP"/> +<iu id="org.eclipse.datatools.enablement.sap.feature.feature.group" version="1.10.1.v201208161415-540AkF7AJ7YEJBU7S"/> +<iu id="org.eclipse.datatools.enablement.sybase.feature.feature.group" version="1.10.1.v201208161415-7E46F9NiNc1QBgyT6T6"/> +<iu id="org.eclipse.datatools.enablement.ingres.feature.feature.group" version="1.10.1.v201208161415-540AkF78Z7UCRAQDB"/> +<iu id="org.eclipse.datatools.enablement.sqlite.feature.feature.group" version="1.10.1.v201208161415-542AkF7AJ7SAKAPBF"/> +<iu id="org.eclipse.datatools.sqldevtools.feature.feature.group" version="1.10.1.v201208161415-7N8B7JFDsn5iz-Aex68NyGpC_AgL"/> +<iu id="org.eclipse.datatools.sqldevtools.results.feature.feature.group" version="1.10.1.v201208161415-57B79AkF7BD7SGC9ZEH"/> +<iu id="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group" version="1.10.1.v201208161415-7A-78F7RZHQTIyWmM1_s"/> +<iu id="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group" version="1.10.1.v201208161415-279078B089G8S_IRUJz-XnN2at"/> +<iu id="org.eclipse.datatools.sqldevtools.data.feature.feature.group" version="1.10.1.v201208161415-645BgJ9EDBTHPAhQU"/> +<iu id="org.eclipse.datatools.sqldevtools.parsers.feature.feature.group" version="1.10.1.v201208161415-623BgJ9EE9ZJRDZLA"/> +<iu id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group" version="1.10.1.v201208161415-79-78EVVFNQGpRkHz0Sm"/> +<iu id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature.feature.group" version="1.10.1.v201208161415-4208375LG5BJ93413"/> +<iu id="org.eclipse.datatools.intro.feature.group" version="1.10.1.v201208161415-26-7w312116392911"/> +<iu id="org.eclipse.datatools.doc.user.feature.group" version="1.10.1.v201208161415-47C08w95FFAK89FHEC7"/> +<iu id="org.eclipse.datatools.common.doc.user.feature.group" version="1.10.1.v201208161415-26-311A16321A3557"/> +<iu id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.10.1.v201208161415-37D-7733L3D753L7BBF"/> +<iu id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.10.1.v201208161415-37D-7733L3D753L7BBF"/> <iu id="org.eclipse.rse.feature.group" version="3.4.0.201205300905-7L7IFBV83omxZWwIDyHWipb2Sz-f"/> <iu id="org.eclipse.rse.ssh.feature.group" version="3.0.400.201205300905-7A4FEc7F7BF7RJ77g7R"/> <iu id="org.eclipse.rse.terminals.feature.group" version="1.2.0.201205300905-773Eo7H89G8OJ8Db8NB27"/> @@ -181,7 +181,7 @@ <iu id="org.eclipse.tm.terminal.serial.feature.group" version="2.1.100.201205300905-308Z312316411A16"/> <iu id="org.eclipse.tm.terminal.feature.group" version="3.2.0.201205300905-41-312316411A16"/> <iu id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.100.201205300905-308Z312316411A16"/> -<iu id="org.eclipse.jsf.feature.source.feature.group" version="3.4.0.v201111022140-7E7JFBZF9JgLWZLz0U0QoZm3357"/> +<iu id="org.eclipse.jsf.feature.source.feature.group" version="3.4.1.v201208241503-7E7JFBjF9JgLWgMhh4X6Ps"/> <iu id="org.eclipse.jst.jee" version="1.0.500.v201202020745"/> <iu id="org.eclipse.wst.common.frameworks" version="1.2.200.v201203141800"/> <iu id="org.eclipse.wst.common.project.facet.ui" version="1.4.300.v201111030424"/> @@ -189,48 +189,48 @@ <iu id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/> <iu id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/> <iu id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/> -<iu id="org.eclipse.jpt.common.feature.feature.group" version="1.2.0.v201203150000-66-AkF7BF7PBN7778"/> -<iu id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.2.0.v201203150000-33-8s7357395D3333"/> -<iu id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version="3.2.0.v201203150000-7M7J4F7RZHQYIwMz0JyOWFD7"/> -<iu id="org.eclipse.jpt.jpa.feature.feature.group" version="3.2.0.v201203150000-7S7K8aFBBoPaoQNZZRKUVFD7"/> +<iu id="org.eclipse.jpt.common.feature.feature.group" version="1.2.1.v201208222210-663AkF7BF7cFFFFB7"/> +<iu id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.2.1.v201208222210-3318s73573J777753"/> +<iu id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version="3.2.1.v201208222210-7M7J78F7RZHQYJAQsS4SVFD7"/> +<iu id="org.eclipse.jpt.jpa.feature.feature.group" version="3.2.1.v201208222210-7S7K8gFBBoPapQieUcW_TFD7"/> <iu id="org.eclipse.persistence.jpa.feature.group" version="2.4.0.v20120608-r11652"/> -<iu id="org.eclipse.jsf.feature.feature.group" version="3.4.0.v201111022140-7E7JFBZF9JgLWZLz0U0QoZm3357"/> +<iu id="org.eclipse.jsf.feature.feature.group" version="3.4.1.v201208241503-7E7JFBjF9JgLWgMhh4X6Ps"/> <iu id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/> <iu id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.4.0.v201108110300-52FShAkF7BA8O8J9OC8"/> <iu id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.4.0.v201107072300-7b7JIM0FSK2WM1PS9Ar7AKUz0TrWn"/> <iu id="org.eclipse.jst.enterprise_userdoc.feature.feature.group" version="3.3.100.v201105122000-62FUGBgJ9EA9aEeHRHc"/> -<iu id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.2.200.v201105111126-20A77w312215172822"/> -<iu id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.100.v20110810_1722-777HFL5CcNBDmBfJVFHJD6"/> +<iu id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.2.201.v201208241503-20A87w312319352614"/> +<iu id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.101.v20120821_1416-777HFL6CcNBDmBjKOFHIEB"/> <iu id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.200.v20120517_1442-20A77w31231628a2553"/> <iu id="org.eclipse.jst.server_core.feature.feature.group" version="3.4.0.v20120503_1042-31FEe8s73554A4Fa2153"/> <iu id="org.eclipse.jst.server_ui.feature.feature.group" version="3.4.0.v20120503_1042-7A77FHr9xFcC2CFLZBCJMHLg7D64"/> <iu id="org.eclipse.jst.server_userdoc.feature.feature.group" version="3.3.100.v20110303-2-Eo7w3121162A3329"/> -<iu id="org.eclipse.jst.web_core.feature.feature.group" version="3.4.0.v201111022313-7Q7EGVtFE9LeAJKiyp_z-Rsyivz-0sSxz003877"/> -<iu id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.7.v201203021447-46DF9oB5896E6J7G7E3357"/> -<iu id="org.eclipse.jst.web_ui.feature.feature.group" version="3.4.0.v201111022313-7F7DFSgC25TrkWsplelWwGPu4Ajn5UiEiyuqxZp4"/> -<iu id="org.eclipse.jst.web_userdoc.feature.feature.group" version="3.4.0.v201111022313-2107w31211938"/> +<iu id="org.eclipse.jst.web_core.feature.feature.group" version="3.4.1.v201208160300-7Q7EGVwFE9LeAJKuz0oawQtyivz-0sSxz003877"/> +<iu id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.8.v201208241503-46DI9oB58B5TBH8K5E"/> +<iu id="org.eclipse.jst.web_ui.feature.feature.group" version="3.4.1.v201208231800-7F7DFSlC25UrkX4qvgnXz0LZCANyQ0Tu--0sw0wF"/> +<iu id="org.eclipse.jst.web_userdoc.feature.feature.group" version="3.4.1.v201208231800-2117w312319373364"/> <iu id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/> <iu id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/> <iu id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.200.v201109042201-5-F8NAkF7BB7U8PEK8K"/> <iu id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.2.0.v201204151854-7E7AF70F8NcJS_KqT5TpXq"/> <iu id="org.eclipse.jst.ws.jaxws_userdoc.feature.feature.group" version="1.0.200.v201205012246-3-DF8s73573D795LAF"/> -<iu id="org.eclipse.wst.common_core.feature.feature.group" version="3.4.0.v201107190500-7B7EFMSF7RZHOjIpQz-P-QS"/> +<iu id="org.eclipse.wst.common_core.feature.feature.group" version="3.4.1.v201208162200-7B7EFMTF7RZHOjItPz-R0QS"/> <iu id="org.eclipse.wst.common.fproj.feature.group" version="3.4.0.v201202292300-377F8N8s735555393B7B"/> -<iu id="org.eclipse.wst.common_ui.feature.feature.group" version="3.4.0.v201203141800-7C7AFeBEdhOawe9e8mNfykJqRz00Q0RT"/> -<iu id="org.eclipse.wst.jsdt.feature.feature.group" version="1.4.0.v201111090639-7H7DFeHFC7sRemSZgYbe4"/> -<iu id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.101.v20111212_1019-51F8OAkF79S8JCTA597K"/> +<iu id="org.eclipse.wst.common_ui.feature.feature.group" version="3.4.1.v201208170300-7C7AFeEEdhOaweJhCnQfykJuQz00S1RT"/> +<iu id="org.eclipse.wst.jsdt.feature.feature.group" version="1.4.1.v201208171701-7H7DFg0FC7sReqSyfqesWi"/> +<iu id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.201.v20120821_1517-51F9xAkF7AL8QDRl8GAT"/> <iu id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.100.v20110810_1722-33Et8s73563B6Ha3113"/> -<iu id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.100.v20110810_1722-7B7AFGHAtMcLXxbGc-IjRefCA84"/> -<iu id="org.eclipse.wst.server_userdoc.feature.feature.group" version="3.3.0.v20110512-20DF7w312215222664"/> -<iu id="org.eclipse.wst.web_core.feature.feature.group" version="3.4.0.v201203141800-7E7HFSgAJz-mw9oH21HGMpHiKb_kVAz0D"/> -<iu id="org.eclipse.wst.web_ui.feature.feature.group" version="3.4.0.v201203141800-7O7MFsGEMkBJz0rWbgfTLwn-4WKIocbP_pkka3Il"/> +<iu id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.101.v20120817_1533-7B7AFJQAtMduXxeIc0IpSdC97A9"/> +<iu id="org.eclipse.wst.server_userdoc.feature.feature.group" version="3.3.200.v20120830_2320-20Eo7w31231941a3363"/> +<iu id="org.eclipse.wst.web_core.feature.feature.group" version="3.4.1.v201208170345-7E7HFSlAJz-mw9qA03HKTuLiq_snjZB2o"/> +<iu id="org.eclipse.wst.web_ui.feature.feature.group" version="3.4.1.v201208170345-7O7MFsPEMkBJz0wtb-ccsarPSceUIHO9hKl7gJbS"/> <iu id="org.eclipse.wst.web_userdoc.feature.feature.group" version="3.3.0.v201102200555-31Eo8s734B3E4H7799"/> <iu id="org.eclipse.wst.ws_core.feature.feature.group" version="3.4.0.v201108230503-7L7RFoGFGtGd-xhuy-rRwz-2766"/> -<iu id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.4.0.v201203150412-7I7CFkWEtEoXHw284K6n3-oEz-uotfK5qz-68n73"/> +<iu id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.4.1.v201208172041-7I7CFkXEtEoXHw684K6n3-z-F3stz0lKFx169q5z"/> <iu id="org.eclipse.wst.ws_userdoc.feature.feature.group" version="3.1.300.v201102200555-44FR79oB5855Q8IBD7G"/> <iu id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.301.v201102200555-2407w312123151655"/> -<iu id="org.eclipse.wst.xml_core.feature.feature.group" version="3.4.0.v201111021744-7C7OFm4F7RZHQRIpOz-P2Xk"/> -<iu id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.4.0.v201111021744-7H7GFeBDxumUpsl5liePhK3loz-m62J4rSz011R1"/> +<iu id="org.eclipse.wst.xml_core.feature.feature.group" version="3.4.1.v201208170345-7C7OFm5F7RZHQRIsOz-Nz-_n"/> +<iu id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.4.1.v201208170345-7H7GFeFDxumUpsw5rgjWnKDrsz0p4ymwiRz011T2"/> <iu id="org.eclipse.wst.xml_userdoc.feature.feature.group" version="3.3.0.v201102071641-50FYwAkF7B77UBZFDBL"/> <iu id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="2.0.100.v201203131922-7A7K0CcNBGPCTJ_FUOb"/> <iu id="org.eclipse.wst.xsl.feature.feature.group" version="1.3.100.v201111021744-7T7ZFUaFIqUoJuvaKoCpQDKaGVPc"/> @@ -242,36 +242,36 @@ <iu id="org.eclipse.egit.mylyn.feature.group" version="2.0.0.201206130900-r"/> <iu id="org.eclipse.mylyn.github.feature.feature.group" version="2.0.0.201206130900-r"/> <iu id="com.sun.syndication" version="0.9.0.v200803061811"/> -<iu id="org.eclipse.mylyn.commons.core" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.discovery.ui" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.discovery.core" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.commons.ui" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.commons.net" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.commons.screenshots" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn_feature.feature.group" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.ide_feature.feature.group" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.tasks.ide.feature.group" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.commons.feature.group" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.commons.compatibility.feature.group" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.commons.identity.feature.group" version="1.0.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.commons.notifications.feature.group" version="1.0.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.commons.repositories.feature.group" version="1.0.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.commons.repositories.http.feature.group" version="1.0.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.context_feature.feature.group" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.discovery.feature.group" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.java_feature.feature.group" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.monitor.feature.group" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.pde_feature.feature.group" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.team_feature.feature.group" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.wikitext_feature.feature.group" version="1.7.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.cvs.feature.group" version="1.0.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.git.feature.group" version="1.0.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.versions.feature.group" version="1.0.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.commons.sdk.feature.group" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.tasks.ui" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.tasks.core" version="3.8.0.v20120612-0600"/> -<iu id="org.eclipse.mylyn.tasks.bugs" version="3.8.0.v20120612-0600"/> +<iu id="org.eclipse.mylyn.commons.core" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.discovery.ui" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.discovery.core" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.commons.ui" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.commons.net" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.commons.screenshots" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn_feature.feature.group" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.ide_feature.feature.group" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.tasks.ide.feature.group" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.commons.feature.group" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.commons.compatibility.feature.group" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.commons.identity.feature.group" version="1.0.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.commons.notifications.feature.group" version="1.0.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.commons.repositories.feature.group" version="1.0.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.commons.repositories.http.feature.group" version="1.0.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.context_feature.feature.group" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.discovery.feature.group" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.java_feature.feature.group" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.monitor.feature.group" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.pde_feature.feature.group" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.team_feature.feature.group" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.wikitext_feature.feature.group" version="1.7.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.cvs.feature.group" version="1.0.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.git.feature.group" version="1.0.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.versions.feature.group" version="1.0.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.commons.sdk.feature.group" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.tasks.ui" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.tasks.core" version="3.8.1.v20120725-0100"/> +<iu id="org.eclipse.mylyn.tasks.bugs" version="3.8.1.v20120725-0100"/> <iu id="com.atlassian.connector.commons" version="4.0.0.v20120628"/> <iu id="com.atlassian.connector.eclipse.bamboo.core" version="3.0.6.v20120628"/> <iu id="com.atlassian.connector.eclipse.bamboo.ui" version="3.0.6.v20120628"/> @@ -296,20 +296,20 @@ <iu id="com.atlassian.connector.eclipse.ui" version="3.0.6.v20120628"/> <iu id="com.thoughtworks.xstream" version="1.3.1.v201111240924"/> <iu id="org.xmlpull" version="1.1.3.4_v201201052148"/> -<iu id="org.eclipse.ui" version="3.103.0.v20120521-2329"/> +<iu id="org.eclipse.ui" version="3.103.0.v20120705-114351"/> <iu id="org.eclipse.core.runtime" version="3.8.0.v20120521-2346"/> -<iu id="org.eclipse.core.resources" version="3.8.0.v20120522-2034"/> -<iu id="org.eclipse.ui.ide" version="3.8.0.v20120521-2329"/> -<iu id="org.eclipse.ui.workbench.texteditor" version="3.8.0.v20120523-1310"/> -<iu id="org.eclipse.jface.text" version="3.8.0.v20120531-0600"/> -<iu id="org.eclipse.osgi" version="3.8.0.v20120529-1548"/> +<iu id="org.eclipse.core.resources" version="3.8.100.v20120718-082558"/> +<iu id="org.eclipse.ui.ide" version="3.8.1.v20120807-142514"/> +<iu id="org.eclipse.ui.workbench.texteditor" version="3.8.100.v20120705-111822"/> +<iu id="org.eclipse.jface.text" version="3.8.100.v20120705-111822"/> +<iu id="org.eclipse.osgi" version="3.8.100.v20120725-183140"/> <iu id="org.eclipse.core.filesystem" version="1.3.200.v20120522-2012"/> -<iu id="org.eclipse.ui.forms" version="3.5.200.v20120521-2329"/> -<iu id="org.eclipse.ui.editors" version="3.8.0.v20120523-1540"/> -<iu id="org.eclipse.team.core" version="3.6.100.v20120524-0627"/> -<iu id="org.eclipse.team.ui" version="3.6.200.v20120522-1148"/> -<iu id="org.eclipse.jface" version="3.8.0.v20120521-2329"/> -<iu id="org.eclipse.compare" version="3.5.300.v20120522-1148"/> +<iu id="org.eclipse.ui.forms" version="3.5.200.v20120705-114351"/> +<iu id="org.eclipse.ui.editors" version="3.8.0.v20120705-111822"/> +<iu id="org.eclipse.team.core" version="3.6.100.v20120705-111700"/> +<iu id="org.eclipse.team.ui" version="3.6.200.v20120705-111700"/> +<iu id="org.eclipse.jface" version="3.8.0.v20120803-145312"/> +<iu id="org.eclipse.compare" version="3.5.400.v20120808-124256"/> <iu id="org.apache.axis" version="1.4.0.v201005080400"/> <iu id="org.apache.commons.io" version="2.0.1.v201105210651"/> <iu id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/> @@ -329,13 +329,13 @@ <iu id="org.eclipse.swtbot.ide.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/> <iu id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/> <iu id="org.eclipse.swtbot.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/> -<iu id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="4.2.0.v20120611-793-87iDWCFP8ZDTAN72TPI4jrXA"/> -<iu id="org.eclipse.birt.feature.group" version="4.2.0.v20120611-C_BC7CGWoJMfAnw8Y8QVz0nD0JPl"/> -<iu id="org.eclipse.birt.integration.wtp.feature.group" version="4.2.0.v20120613-1143-51-7w3123172402254"/> -<iu id="org.eclipse.birt.chart.feature.group" version="4.2.0.v20120611-828i2FQCnvK_6W8GmbB8"/> -<iu id="org.eclipse.birt.chart.integration.wtp.feature.group" version="4.2.0.v20120613-1143-51-7w3123172402254"/> -<iu id="com.google.gdt.eclipse.suite.e42.feature.feature.group" version="3.0.1.v201206290132-rel-r42"/> -<iu id="com.google.gwt.eclipse.sdkbundle.e42.feature.feature.group" version="2.4.0.v201206290132-rel-r42"/> +<iu id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="4.2.1.v20120820-793187qD_Cz0RBQLXOVGu3BTF-Oc"/> +<iu id="org.eclipse.birt.feature.group" version="4.2.1.v20120820-ChBG8RGYgRQlJ7iVBW4z0tnDWYPt"/> +<iu id="org.eclipse.birt.integration.wtp.feature.group" version="4.2.1.v20120904-1129-5107w31231A150223A"/> +<iu id="org.eclipse.birt.chart.feature.group" version="4.2.1.v20120820-828i7DFQCnvK_6tK4mbB8"/> +<iu id="org.eclipse.birt.chart.integration.wtp.feature.group" version="4.2.1.v20120904-1129-5107w31231A150223A"/> +<iu id="com.google.gdt.eclipse.suite.e42.feature.feature.group" version="3.1.0.v201208080121-rel-r42"/> +<iu id="com.google.gwt.eclipse.sdkbundle.e42.feature.feature.group" version="2.4.0.v201208080121-rel-r42"/> <iu id="net.jeeeyul.eclipse.themes.feature.feature.group" version="1.5.0.201209040005"/> </p2.mirror> </target>

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43478 - trunk/build/target-platform.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-09-06 15:38:48 -0400 (Thu, 06 Sep 2012) New Revision: 43478 Modified: trunk/build/target-platform/pom.xml Log: DO NOT VALIDATE unified.target until multiple.target is built and published, or it will fail to resolve deps Modified: trunk/build/target-platform/pom.xml =================================================================== --- trunk/build/target-platform/pom.xml 2012-09-06 19:33:52 UTC (rev 43477) +++ trunk/build/target-platform/pom.xml 2012-09-06 19:38:48 UTC (rev 43478) @@ -45,11 +45,10 @@ <configuration> <targetFiles> <param>multiple.target</param> -  - <param>unified.target</param> -  +  +  +  +  </targetFiles> <failOnError>true</failOnError> </configuration>

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43477 - in workspace/akazakov/db/org.jboss.tools.cdi.db: META-INF and 6 other directories.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-09-06 15:33:52 -0400 (Thu, 06 Sep 2012) New Revision: 43477 Added: workspace/akazakov/db/org.jboss.tools.cdi.db/.classpath workspace/akazakov/db/org.jboss.tools.cdi.db/.project workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/ workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/MANIFEST.MF workspace/akazakov/db/org.jboss.tools.cdi.db/build.properties workspace/akazakov/db/org.jboss.tools.cdi.db/src/ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDbPlugin.java workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/DBCDIProject.java Log: Share project "org.jboss.tools.cdi.db" into "https://svn.jboss.org/repos/jbosstools" https://issues.jboss.org/browse/JBIDE-12446 Added: workspace/akazakov/db/org.jboss.tools.cdi.db/.classpath =================================================================== --- workspace/akazakov/db/org.jboss.tools.cdi.db/.classpath (rev 0) +++ workspace/akazakov/db/org.jboss.tools.cdi.db/.classpath 2012-09-06 19:33:52 UTC (rev 43477) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: workspace/akazakov/db/org.jboss.tools.cdi.db/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: workspace/akazakov/db/org.jboss.tools.cdi.db/.project =================================================================== --- workspace/akazakov/db/org.jboss.tools.cdi.db/.project (rev 0) +++ workspace/akazakov/db/org.jboss.tools.cdi.db/.project 2012-09-06 19:33:52 UTC (rev 43477) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.cdi.db</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Property changes on: workspace/akazakov/db/org.jboss.tools.cdi.db/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/MANIFEST.MF =================================================================== --- workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/MANIFEST.MF (rev 0) +++ workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/MANIFEST.MF 2012-09-06 19:33:52 UTC (rev 43477) @@ -0,0 +1,12 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Db +Bundle-SymbolicName: org.jboss.tools.cdi.db;singleton:=true +Bundle-Version: 1.4.0.qualifier +Bundle-Activator: org.jboss.tools.cdi.db.CDIDbPlugin +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.jboss.tools.common.db, + org.jboss.tools.cdi.core +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Property changes on: workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/MANIFEST.MF ___________________________________________________________________ Added: svn:mime-type + text/plain Added: workspace/akazakov/db/org.jboss.tools.cdi.db/build.properties =================================================================== --- workspace/akazakov/db/org.jboss.tools.cdi.db/build.properties (rev 0) +++ workspace/akazakov/db/org.jboss.tools.cdi.db/build.properties 2012-09-06 19:33:52 UTC (rev 43477) @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . Property changes on: workspace/akazakov/db/org.jboss.tools.cdi.db/build.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDbPlugin.java =================================================================== --- workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDbPlugin.java (rev 0) +++ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDbPlugin.java 2012-09-06 19:33:52 UTC (rev 43477) @@ -0,0 +1,49 @@ +package org.jboss.tools.cdi.db; + +import org.jboss.tools.common.log.BaseUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class CDIDbPlugin extends BaseUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.tools.cdi.db"; //$NON-NLS-1$ + + // The shared instance + private static CDIDbPlugin plugin; + + /** + * The constructor + */ + public CDIDbPlugin() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static CDIDbPlugin getDefault() { + return plugin; + } +} \ No newline at end of file Property changes on: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDbPlugin.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/DBCDIProject.java =================================================================== --- workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/DBCDIProject.java (rev 0) +++ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/DBCDIProject.java 2012-09-06 19:33:52 UTC (rev 43477) @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2012 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.tools.cdi.db; + +import java.util.Collection; + +import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.IInjectionPoint; +import org.jboss.tools.cdi.internal.core.impl.CDIProject; + +/** + * @author Alexey Kazakov + */ +public class DBCDIProject extends CDIProject { + + /* (non-Javadoc) + * @see org.jboss.tools.cdi.internal.core.impl.CDIProject#getBeans(boolean, org.jboss.tools.cdi.core.IInjectionPoint) + */ + @Override + public Collection<IBean> getBeans( + boolean attemptToResolveAmbiguousDependency, + IInjectionPoint injectionPoint) { + return super.getBeans(attemptToResolveAmbiguousDependency, injectionPoint); + } +} \ No newline at end of file Property changes on: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/DBCDIProject.java ___________________________________________________________________ Added: svn:mime-type + text/plain

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r43476 - workspace/akazakov/db.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-09-06 15:33:14 -0400 (Thu, 06 Sep 2012) New Revision: 43476 Added: workspace/akazakov/db/org.jboss.tools.cdi.db/ Log: Share project "org.jboss.tools.cdi.db" into "https://svn.jboss.org/repos/jbosstools" https://issues.jboss.org/browse/JBIDE-12446

13 years, 3 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits September 2012