JBoss Tools SVN: r30663 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core: src/org/jboss/tools/cdi/seam/solder/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-19 14:36:10 -0400 (Tue, 19 Apr 2011)
New Revision: 30663
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderUnwrapsExtension.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCoreExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java
Log:
JBIDE--8715
https://issues.jboss.org/browse/JBIDE-8715
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml 2011-04-19 18:20:18 UTC (rev 30662)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml 2011-04-19 18:36:10 UTC (rev 30663)
@@ -22,5 +22,11 @@
class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderDefaultBeanExtension"
runtime="org.jboss.seam.solder.bean.defaultbean.DefaultBeanExtension">
</cdiextension>
+
+ <cdiextension
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderUnwrapsExtension"
+ runtime="org.jboss.seam.solder.unwraps.UnwrapsExtension">
+ </cdiextension>
+
</extension>
</plugin>
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants.java 2011-04-19 18:20:18 UTC (rev 30662)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants.java 2011-04-19 18:36:10 UTC (rev 30663)
@@ -15,4 +15,6 @@
public String SERVICE_ANNOTATION_KIND = "serviceAnnotation";
public String DEFAULT_BEAN_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.bean.defaultbean.DefaultBean";
+
+ public String UNWRAPS_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.unwraps.Unwraps";
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCoreExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCoreExtension.java 2011-04-19 18:20:18 UTC (rev 30662)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCoreExtension.java 2011-04-19 18:36:10 UTC (rev 30663)
@@ -16,7 +16,6 @@
import java.util.List;
import java.util.Set;
-import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IMemberValuePair;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.CDIConstants;
@@ -36,7 +35,6 @@
import org.jboss.tools.cdi.internal.core.impl.definition.PackageDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.ParameterDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.util.BeanUtil;
import org.jboss.tools.common.util.EclipseJavaUtil;
@@ -54,10 +52,6 @@
*/
public class CDISeamSolderCoreExtension implements ICDIExtension, IProcessAnnotatedTypeFeature {
- public Object getAdapter(Class adapter) {
- return null;
- }
-
public void processAnnotatedType(TypeDefinition typeDefinition, IRootDefinitionContext context) {
if(processVeto(typeDefinition, context)) {
@@ -99,17 +93,9 @@
;
if (packageRequiredClasses != null)
requiredClasses.addAll(packageRequiredClasses);
- IJavaProject jp = EclipseResourceUtil.getJavaProject(context
- .getProject().getProject());
- if (!requiredClasses.isEmpty() && jp != null) {
+ if (!requiredClasses.isEmpty()) {
for (String c : requiredClasses) {
- try {
- if (EclipseJavaUtil.findType(jp, c) == null) {
- typeDefinition.veto();
- return true;
- }
- } catch (JavaModelException e) {
- CDISeamSolderCorePlugin.getDefault().logError(e);
+ if (context.getProject().getType(c) == null) {
typeDefinition.veto();
return true;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java 2011-04-19 18:20:18 UTC (rev 30662)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java 2011-04-19 18:36:10 UTC (rev 30663)
@@ -14,12 +14,9 @@
import java.util.List;
import java.util.Set;
-import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IMemberValuePair;
import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.CDIConstants;
-import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IClassBean;
@@ -34,8 +31,6 @@
import org.jboss.tools.cdi.internal.core.impl.definition.FieldDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.common.util.EclipseJavaUtil;
/**
* Implements support for org.jboss.seam.solder.bean.defaultbean.DefaultBeanExtension.
@@ -51,10 +46,6 @@
*/
public class CDISeamSolderDefaultBeanExtension implements ICDIExtension, IProcessAnnotatedTypeFeature, IAmbiguousBeanResolverFeature {
- public Object getAdapter(Class adapter) {
- return null;
- }
-
public void processAnnotatedType(TypeDefinition typeDefinition, IRootDefinitionContext context) {
boolean defaultBean = typeDefinition.isAnnotationPresent(CDISeamSolderConstants.DEFAULT_BEAN_ANNOTATION_TYPE_NAME);
IJavaAnnotation beanTyped = null;
@@ -94,16 +85,10 @@
Object n = a.getMemberValue(null);
String defaultType = null;
if(n != null && n.toString().length() > 0) {
- IJavaProject jp = EclipseResourceUtil.getJavaProject(context.getProject().getProject());
- IType typedAnnotation = null;
- try {
- typedAnnotation = EclipseJavaUtil.findType(jp, CDIConstants.TYPED_ANNOTATION_TYPE_NAME);
- } catch (JavaModelException e) {
- CDICorePlugin.getDefault().logError(e);
- return null;
- }
defaultType = n.toString();
- return new AnnotationLiteral(def.getResource(), a.getStartPosition(), a.getLength(), defaultType, IMemberValuePair.K_CLASS, typedAnnotation);
+ IType typedAnnotation = context.getProject().getType(CDIConstants.TYPED_ANNOTATION_TYPE_NAME);
+ return (typedAnnotation == null) ? null
+ : new AnnotationLiteral(def.getResource(), a.getStartPosition(), a.getLength(), defaultType, IMemberValuePair.K_CLASS, typedAnnotation);
}
return null;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java 2011-04-19 18:20:18 UTC (rev 30662)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java 2011-04-19 18:36:10 UTC (rev 30663)
@@ -42,10 +42,6 @@
CDICoreNature project;
LoggerDefinitionContext context = new LoggerDefinitionContext();
- public Object getAdapter(Class adapter) {
- return null;
- }
-
public void setProject(CDICoreNature n) {
project = n;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java 2011-04-19 18:20:18 UTC (rev 30662)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java 2011-04-19 18:36:10 UTC (rev 30663)
@@ -50,10 +50,6 @@
CDICoreNature project;
ServiceHandlerDefinitionContext context = new ServiceHandlerDefinitionContext();
- public Object getAdapter(Class adapter) {
- return null;
- }
-
public void setProject(CDICoreNature n) {
project = n;
}
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderUnwrapsExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderUnwrapsExtension.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderUnwrapsExtension.java 2011-04-19 18:36:10 UTC (rev 30663)
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.seam.solder.core;
+
+import org.eclipse.jdt.core.IMemberValuePair;
+import org.eclipse.jdt.core.IType;
+import org.jboss.tools.cdi.core.CDIConstants;
+import org.jboss.tools.cdi.core.IAnnotationDeclaration;
+import org.jboss.tools.cdi.core.IJavaAnnotation;
+import org.jboss.tools.cdi.core.IRootDefinitionContext;
+import org.jboss.tools.cdi.core.extension.ICDIExtension;
+import org.jboss.tools.cdi.core.extension.feature.IProcessAnnotatedMemberFeature;
+import org.jboss.tools.cdi.internal.core.impl.AnnotationLiteral;
+import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition;
+import org.jboss.tools.cdi.internal.core.impl.definition.BeanMemberDefinition;
+import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition;
+
+/**
+ * This implementation detects @Unwrap annotation at methods and makes CDI builder aware of
+ * it being a producer method by adding fake annotation literal for @Produces annotation based
+ * on the unwrap annotation.
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class CDISeamSolderUnwrapsExtension implements ICDIExtension, IProcessAnnotatedMemberFeature {
+
+ public void processAnnotatedMember(BeanMemberDefinition memberDefinition, IRootDefinitionContext context) {
+ if(memberDefinition instanceof MethodDefinition) {
+ if(memberDefinition.isAnnotationPresent(CDISeamSolderConstants.UNWRAPS_ANNOTATION_TYPE_NAME)) {
+ IJavaAnnotation ja = createFakeProducesAnnotation(memberDefinition, context);
+ if(ja != null) {
+ memberDefinition.addAnnotation(ja, context);
+ }
+ }
+ }
+
+ }
+
+ IJavaAnnotation createFakeProducesAnnotation(AbstractMemberDefinition def, IRootDefinitionContext context) {
+ IAnnotationDeclaration a = def.getAnnotation(CDISeamSolderConstants.UNWRAPS_ANNOTATION_TYPE_NAME);
+ if(a == null) return null;
+ IType producesAnnotation = context.getProject().getType(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME);
+ return (producesAnnotation == null) ? null
+ : new AnnotationLiteral(def.getResource(), a.getStartPosition(), a.getLength(), null, IMemberValuePair.K_UNKNOWN, producesAnnotation);
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderUnwrapsExtension.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 12 months
- 1
- 0
JBoss Tools SVN: r30662 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-04-19 14:20:18 -0400 (Tue, 19 Apr 2011)
New Revision: 30662
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java
Log:
JBIDE-8754 - typo in separation of jmx provider
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2011-04-19 18:16:23 UTC (rev 30661)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2011-04-19 18:20:18 UTC (rev 30662)
@@ -283,7 +283,7 @@
// find runner
IExtensionRegistry registry = Platform.getExtensionRegistry();
- IConfigurationElement[] cf = registry.getConfigurationElementsFor(JBossServerCorePlugin.PLUGIN_ID, "pollers"); //$NON-NLS-1$
+ IConfigurationElement[] cf = registry.getConfigurationElementsFor(JBossServerCorePlugin.PLUGIN_ID, "jmxRunner"); //$NON-NLS-1$
for( int i = 0; i < cf.length; i++ ) {
try {
Object o = cf[i].createExecutableExtension("class"); //$NON-NLS-1$
14 years, 12 months
- 1
- 0
JBoss Tools SVN: r30661 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: core/extension and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-19 14:16:23 -0400 (Tue, 19 Apr 2011)
New Revision: 30661
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IProcessAnnotatedMemberFeature.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionFactory.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionManager.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/ICDIExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java
Log:
JBIDE--8715
https://issues.jboss.org/browse/JBIDE-8715
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2011-04-19 06:20:38 UTC (rev 30660)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2011-04-19 18:16:23 UTC (rev 30661)
@@ -27,7 +27,9 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.extension.CDIExtensionManager;
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.DefinitionContext;
@@ -36,6 +38,8 @@
import org.jboss.tools.cdi.internal.core.scanner.lib.ClassPathMonitor;
import org.jboss.tools.common.model.XJob;
import org.jboss.tools.common.model.XJob.XRunnable;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.util.EclipseJavaUtil;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.common.xml.XMLUtilities;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
@@ -83,6 +87,23 @@
return project;
}
+ /**
+ * Convenience method.
+ *
+ * @param qualifiedName
+ * @return
+ */
+ public IType getType(String qualifiedName) {
+ IJavaProject jp = EclipseResourceUtil.getJavaProject(getProject());
+ if(jp == null) return null;
+ try {
+ return EclipseJavaUtil.findType(jp, qualifiedName);
+ } catch (JavaModelException e) {
+ CDICorePlugin.getDefault().logError(e);
+ }
+ return null;
+ }
+
public void setProject(IProject project) {
this.project = project;
classPath.init();
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionFactory.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionFactory.java 2011-04-19 06:20:38 UTC (rev 30660)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionFactory.java 2011-04-19 18:16:23 UTC (rev 30661)
@@ -14,15 +14,16 @@
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.StringTokenizer;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.Platform;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.extension.feature.IAmbiguousBeanResolverFeature;
import org.jboss.tools.cdi.core.extension.feature.IBuildParticipantFeature;
+import org.jboss.tools.cdi.core.extension.feature.IProcessAnnotatedMemberFeature;
import org.jboss.tools.cdi.core.extension.feature.IProcessAnnotatedTypeFeature;
/**
@@ -47,6 +48,7 @@
public static Class<?>[] FEATURES = {
IBuildParticipantFeature.class,
+ IProcessAnnotatedMemberFeature.class,
IProcessAnnotatedTypeFeature.class,
IAmbiguousBeanResolverFeature.class
};
@@ -86,7 +88,12 @@
String cls = c.getAttribute("class");
ICDIExtension extension = null;
try {
- extension = (ICDIExtension)c.createExecutableExtension("class");
+ Object o = c.createExecutableExtension("class");
+ if(!(o instanceof ICDIExtension)) {
+ CDICorePlugin.getDefault().logError("CDI extension " + cls + " should implement ICDIExtension.");
+ } else {
+ extension = (ICDIExtension)o;
+ }
} catch (CoreException e) {
CDICorePlugin.getDefault().logError(e);
continue;
@@ -148,7 +155,10 @@
if(feature.isAssignableFrom(cls)) {
return (F)extension;
}
- return (F)extension.getAdapter(feature);
+ if(extension instanceof IAdaptable) {
+ return (F)((IAdaptable)extension).getAdapter(feature);
+ }
+ return null;
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionManager.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionManager.java 2011-04-19 06:20:38 UTC (rev 30660)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionManager.java 2011-04-19 18:16:23 UTC (rev 30661)
@@ -19,6 +19,7 @@
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.extension.feature.IAmbiguousBeanResolverFeature;
import org.jboss.tools.cdi.core.extension.feature.IBuildParticipantFeature;
+import org.jboss.tools.cdi.core.extension.feature.IProcessAnnotatedMemberFeature;
import org.jboss.tools.cdi.core.extension.feature.IProcessAnnotatedTypeFeature;
/**
@@ -123,6 +124,14 @@
return featureToExtensions.containsKey(feature) ? featureToExtensions.get(feature) : EMPTY;
}
+ public Set<IProcessAnnotatedMemberFeature> getProcessAnnotatedMemberFeature() {
+ Set<IProcessAnnotatedMemberFeature> result = featureStorage.processAnnotatedMember;
+ if(result == null) {
+ featureStorage.processAnnotatedMember = result = getFeature(IProcessAnnotatedMemberFeature.class);
+ }
+ return result;
+ }
+
public Set<IProcessAnnotatedTypeFeature> getProcessAnnotatedTypeFeature() {
Set<IProcessAnnotatedTypeFeature> result = featureStorage.processAnnotatedType;
if(result == null) {
@@ -166,10 +175,12 @@
class FeatureStorage {
Set<IBuildParticipantFeature> buildParticipant = null;
+ Set<IProcessAnnotatedMemberFeature> processAnnotatedMember = null;
Set<IProcessAnnotatedTypeFeature> processAnnotatedType = null;
Set<IAmbiguousBeanResolverFeature> ambiguousBeanResolver = null;
void clean() {
+ processAnnotatedMember = null;
processAnnotatedType = null;
buildParticipant = null;
ambiguousBeanResolver = null;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/ICDIExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/ICDIExtension.java 2011-04-19 06:20:38 UTC (rev 30660)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/ICDIExtension.java 2011-04-19 18:16:23 UTC (rev 30661)
@@ -28,6 +28,6 @@
* @author Viacheslav Kabanovich
*
*/
-public interface ICDIExtension extends IAdaptable {
+public interface ICDIExtension {
}
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IProcessAnnotatedMemberFeature.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IProcessAnnotatedMemberFeature.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IProcessAnnotatedMemberFeature.java 2011-04-19 18:16:23 UTC (rev 30661)
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.core.extension.feature;
+
+import org.jboss.tools.cdi.core.IRootDefinitionContext;
+import org.jboss.tools.cdi.internal.core.impl.definition.BeanMemberDefinition;
+
+/**
+ * This feature corresponds to ProcessAnnotatedTypeEvent in CDI runtime.
+ *
+ * It is invoked as soon as builder have read member definition, but has not yet
+ * added it to the parent type definition. That moment is important for extensions
+ * that would recognize this member as a CDI artifact (producer, injection, observer)
+ * even though it is not annotated so. Extensions that do not need to interfere
+ * with CDI artifact recognition, may use IProcessAnnotatedTypeFeature instead,
+ * which is invoked when all type definitions with members are built completely,
+ * and get access to members as child elements of the type definition.
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public interface IProcessAnnotatedMemberFeature {
+
+ public void processAnnotatedMember(BeanMemberDefinition memberDefinition, IRootDefinitionContext context);
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IProcessAnnotatedMemberFeature.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 2011-04-19 06:20:38 UTC (rev 30660)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-04-19 18:16:23 UTC (rev 30661)
@@ -1361,23 +1361,14 @@
public Set<IBean> getBeans(boolean attemptToResolveAmbiguousDependency,
String fullyQualifiedBeanType,
String... fullyQualifiedQualifiersTypes) {
- IType type = null;
- try {
- type = EclipseJavaUtil.findType(EclipseUtil.getJavaProject(getNature().getProject()), fullyQualifiedBeanType);
- } catch (JavaModelException e) {
- CDICorePlugin.getDefault().logError(e);
- }
+ IType type = getNature().getType(fullyQualifiedBeanType);
if(type == null) {
return Collections.emptySet();
}
IParametedType beanType = getNature().getTypeFactory().newParametedType(type);
List<IType> qualifiers = new ArrayList<IType>();
if(fullyQualifiedQualifiersTypes != null) for (String s : fullyQualifiedQualifiersTypes) {
- try {
- type = EclipseJavaUtil.findType(EclipseUtil.getJavaProject(getNature().getProject()), s);
- } catch (JavaModelException e) {
- CDICorePlugin.getDefault().logError(e);
- }
+ type = getNature().getType(s);
if(type != null) qualifiers.add(type);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java 2011-04-19 06:20:38 UTC (rev 30660)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java 2011-04-19 18:16:23 UTC (rev 30661)
@@ -12,6 +12,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.Flags;
@@ -21,6 +22,7 @@
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IRootDefinitionContext;
+import org.jboss.tools.cdi.core.extension.feature.IProcessAnnotatedMemberFeature;
import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration;
import org.jboss.tools.cdi.internal.core.impl.ParametedType;
@@ -46,11 +48,15 @@
//provide initialization
context.getAnnotationKind(a.getType());
}
+ Set<IProcessAnnotatedMemberFeature> extensions = context.getProject().getExtensionManager().getProcessAnnotatedMemberFeature();
IField[] fs = getType().getFields();
for (int i = 0; i < fs.length; i++) {
FieldDefinition f = new FieldDefinition();
f.setTypeDefinition(this);
f.setField(fs[i], context);
+ for (IProcessAnnotatedMemberFeature e: extensions) {
+ e.processAnnotatedMember(f, context);
+ }
if(f.isCDIAnnotated()) {
fields.add(f);
}
@@ -61,6 +67,9 @@
MethodDefinition m = new MethodDefinition();
m.setTypeDefinition(this);
m.setMethod(ms[i], context);
+ for (IProcessAnnotatedMemberFeature e: extensions) {
+ e.processAnnotatedMember(m, context);
+ }
if(m.isCDIAnnotated() || (ms[i].isConstructor() && ms[i].getNumberOfParameters()==0)) {
methods.add(m);
}
14 years, 12 months
- 1
- 0
JBoss Tools SVN: r30659 - trunk/download.jboss.org/jbosstools/updates/requirements/springide.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-18 23:14:51 -0400 (Mon, 18 Apr 2011)
New Revision: 30659
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/springide/index....
Log:
refactor folder name for springide 2.6.0.20110316
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/springide/index....
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/springide/index.... 2011-04-19 03:14:17 UTC (rev 30658)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/springide/index.... 2011-04-19 03:14:51 UTC (rev 30659)
@@ -46,7 +46,7 @@
-->
<br/>
<ul>
-<li><a class=link href=2.6.0.201103161000>2.6.0.201103161000</a> </li>
+<li><a class=link href=2.6.0.201103160035>2.6.0.201103160035</a> </li>
<li><a class=link href=2.5.1.201011101000>2.5.1.201011101000</a> </li>
</ul>
<br/>
14 years, 12 months
- 1
- 0
JBoss Tools SVN: r30658 - trunk/download.jboss.org/jbosstools/updates/indigo.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-18 23:14:17 -0400 (Mon, 18 Apr 2011)
New Revision: 30658
Modified:
trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
Log:
refactor folder name for springide 2.6.0.20110316
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-04-19 02:53:57 UTC (rev 30657)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-04-19 03:14:17 UTC (rev 30658)
@@ -26,7 +26,7 @@
<child location='../requirements/m2eclipse/0.13.0.201103291237/'/>
<child location='../requirements/orbit/S20110124210048/'/>
<child location='../requirements/pmd/3.2.6/'/>
-<child location='../requirements/springide/2.6.0.201103161000/'/>
+<child location='../requirements/springide/2.6.0.201103160035/'/>
<child location='../requirements/subclipse/1.6/'/>
<child location='../requirements/subversive/0.7.9_2.2.2/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-04-19 02:53:57 UTC (rev 30657)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-04-19 03:14:17 UTC (rev 30658)
@@ -26,7 +26,7 @@
<child location='../requirements/m2eclipse/0.13.0.201103291237/'/>
<child location='../requirements/orbit/S20110124210048/'/>
<child location='../requirements/pmd/3.2.6/'/>
-<child location='../requirements/springide/2.6.0.201103161000/'/>
+<child location='../requirements/springide/2.6.0.201103160035/'/>
<child location='../requirements/subclipse/1.6/'/>
<child location='../requirements/subversive/0.7.9_2.2.2/'/>
14 years, 12 months
- 1
- 0
JBoss Tools SVN: r30657 - in trunk/download.jboss.org/jbosstools: requirements/helios/OLD and 13 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-18 22:53:57 -0400 (Mon, 18 Apr 2011)
New Revision: 30657
Added:
trunk/download.jboss.org/jbosstools/requirements/helios/OLD/.gitignore
trunk/download.jboss.org/jbosstools/requirements/helios/OLD/README.txt
trunk/download.jboss.org/jbosstools/requirements/helios/OLD/m2eclipse/
trunk/download.jboss.org/jbosstools/requirements/helios/OLD/m2eclipse/bui...
trunk/download.jboss.org/jbosstools/requirements/helios/OLD/svn/
trunk/download.jboss.org/jbosstools/requirements/helios/OLD/svn/build.xml
trunk/download.jboss.org/jbosstools/requirements/helios/OLD/xulrunner/
trunk/download.jboss.org/jbosstools/requirements/helios/OLD/xulrunner/REA...
trunk/download.jboss.org/jbosstools/requirements/helios/springide/
trunk/download.jboss.org/jbosstools/requirements/helios/springide/composi...
trunk/download.jboss.org/jbosstools/requirements/helios/springide/composi...
trunk/download.jboss.org/jbosstools/requirements/helios/testng/
trunk/download.jboss.org/jbosstools/requirements/helios/testng/compositeA...
trunk/download.jboss.org/jbosstools/requirements/helios/testng/compositeC...
trunk/download.jboss.org/jbosstools/updates/requirements/springide/
trunk/download.jboss.org/jbosstools/updates/requirements/springide/.gitig...
trunk/download.jboss.org/jbosstools/updates/requirements/springide/build-...
trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/springide/index....
trunk/download.jboss.org/jbosstools/updates/requirements/testng/
trunk/download.jboss.org/jbosstools/updates/requirements/testng/.gitignore
trunk/download.jboss.org/jbosstools/updates/requirements/testng/build-5.1...
trunk/download.jboss.org/jbosstools/updates/requirements/testng/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/testng/index.html
Removed:
trunk/download.jboss.org/jbosstools/requirements/helios/README.txt
trunk/download.jboss.org/jbosstools/requirements/helios/m2eclipse/build.xml
trunk/download.jboss.org/jbosstools/requirements/helios/svn/build.xml
trunk/download.jboss.org/jbosstools/requirements/helios/xulrunner/README.txt
Modified:
trunk/download.jboss.org/jbosstools/requirements/helios/index.html
trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
Log:
move and deprecate old builders and READMEs for requirements/helios/ folder; make old springide and testng folders composite sites to NEW location in updates/requirements/; add new builders for updates/requirements/{springide,testng}, including updates to 2.6 and 6.0; add new springide and testng to helios and indigo composite reqs mirrors
Added: trunk/download.jboss.org/jbosstools/requirements/helios/OLD/.gitignore
===================================================================
--- trunk/download.jboss.org/jbosstools/requirements/helios/OLD/.gitignore (rev 0)
+++ trunk/download.jboss.org/jbosstools/requirements/helios/OLD/.gitignore 2011-04-19 02:53:57 UTC (rev 30657)
@@ -0,0 +1 @@
+*.zip
Copied: trunk/download.jboss.org/jbosstools/requirements/helios/OLD/README.txt (from rev 30656, trunk/download.jboss.org/jbosstools/requirements/helios/README.txt)
===================================================================
--- trunk/download.jboss.org/jbosstools/requirements/helios/OLD/README.txt (rev 0)
+++ trunk/download.jboss.org/jbosstools/requirements/helios/OLD/README.txt 2011-04-19 02:53:57 UTC (rev 30657)
@@ -0,0 +1,113 @@
+Total of 25 req'd tgzs/zips/jars.
+
+BIRT 2.6 -> http://www.eclipse.org/downloads/download.php?file=/birt/downloads/build_...
+->
+wget \
+http://www.eclipse.org/downloads/download.php?file=/birt/downloads/drops/R-R1-2_6_1-201009171723/birt-report-framework-2_6_1.zip\&r=1 \
+http://www.eclipse.org/downloads/download.php?file=/birt/downloads/drops/R-R1-2_6_1-201009171723/birt-wtp-integration-sdk-2_6_1.zip\&r=1
+
+DTP 1.8 -> http://www.eclipse.org/datatools/downloads.php
+wget http://www.eclipse.org/downloads/download.php?file=/datatools/downloads/1...
+
+Eclipse 3.6 + ETF -> http://download.eclipse.org/eclipse/downloads
+->
+wget \
+http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.6.1-201009090800/eclipse-SDK-3.6.1-win32.zip\&r=1 \
+http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.6.1-201009090800/eclipse-SDK-3.6.1-linux-gtk-x86_64.tar.gz\&r=1 \
+http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.6.1-201009090800/eclipse-SDK-3.6.1-linux-gtk.tar.gz\&r=1 \
+http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.6.1-201009090800/eclipse-SDK-3.6.1-macosx-cocoa.tar.gz\&r=1 \
+http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.6.1-201009090800/eclipse-SDK-3.6.1-macosx-cocoa-x86_64.tar.gz\&r=1 \
+http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.6.1-201009090800/eclipse-test-framework-3.6.1.zip\&r=1
+
+EMF & XSD 2.6 ->
+http://www.eclipse.org/modeling/emf/downloads/?project=emf&showAll=0&showMax=5&sortBy=date
+wget http://www.eclipse.org/downloads/download.php?file=/modeling/emf/emf/down... \
+ "http://www.eclipse.org/downloads/download.php?file=/modeling/emf/emf/down..." &
+
+UML2 3.1 ->
+http://www.eclipse.org/modeling/mdt/downloads/?project=uml2
+wget "http://www.eclipse.org/downloads/download.php?r=1&file=/modeling/mdt/uml2..."
+
+GEF 3.6 ->
+http://www.eclipse.org/gef/downloads/?project=&showAll=0&showMax=5&sortBy=date
+wget "http://www.eclipse.org/downloads/download.php?file=/tools/gef/downloads/d..." \
+ "http://www.eclipse.org/downloads/download.php?file=/tools/gef/downloads/d..." &
+
+Equinox 3.6 ->
+http://download.eclipse.org/equinox/
+http://download.eclipse.org/equinox/drops/R-3.6.1-201009090800/index.php
+wget http://ftp.osuosl.org/pub/eclipse/equinox/drops/R-3.6-201006080911/org.ec...
+wget http://ftp.osuosl.org/pub/eclipse/equinox/drops/R-3.6-201006080911/org.ec...
+(unchanged in 3.6.1)
+
+RSE 3.2 ->
+wget \
+"http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/dro..." \
+"http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/dro..."
+
+TPTP 4.7 ->
+http://eclipse.org/tptp/home/downloads/?ver=4.7.1
+wget "http://www.eclipse.org/downloads/download.php?file=/tptp/4.7.1/TPTP-4.7.1..."
+
+WTP 3.2 ->
+http://download.eclipse.org/webtools/downloads/
+wget http://www.eclipse.org/downloads/download.php?file=/webtools/downloads/dr...
+
+SWTBot 2.0 e36 ->
+http://www.eclipse.org/swtbot/downloads.php ->
+wget "http://www.eclipse.org/downloads/download.php?file=/technology/swtbot/hel..." &
+wget "http://www.eclipse.org/downloads/download.php?file=/technology/swtbot/hel..." &
+wget "http://www.eclipse.org/downloads/download.php?file=/technology/swtbot/hel..."
+wget "http://www.eclipse.org/downloads/download.php?r=1&file=/athena/repos/swtb..."
+
+------------
+
+5 custom built zips:
+
+Basebuilder from latest tag (http://wiki.eclipse.org/Platform-releng-basebuilder#Current_build_tag_for...)
+ cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse -q co -d
+org.eclipse.releng.basebuilder -r R36_RC4
+org.eclipse.releng.basebuilder
+ zip -r9 org.eclipse.releng.basebuilder_R36_RC4.zip org.eclipse.releng.basebuilder
+
+m2eclipse-0.10.2.20100623-1649_mylyn.zip
+ run m2eclipse/build.xml
+
+Subvsve079.I201005121900_SVNconn222.I201005121900_SVNKit133.6648_JNA323_ECF310.v201005082345-Update.zip
+ run svn/build.xml
+ http://divby0.blogspot.com/2010/05/my-love-hate-with-svn-part-8.html
+ http://wiki.eclipse.org/Equinox/p2/Ant_Tasks/Partial_Mirroring/Example
+
+b3 Aggregator Engine
+ ssh nickb(a)build.eclipse.org "cd /home/data/httpd/download.eclipse.org/modeling/emft/b3/updates-3.6; zip -9r ~/downloads/athena/repos/b3.aggregator-repo-0.1.0.r01053_e36.zip * -x \*.gz"
+ ssh nickb(a)build.eclipse.org "cd /home/data/httpd/download.eclipse.org/tools/buckminster/updates-3.6; zip -9r ~/downloads/athena/repos/buckminster-repo-1.3.1.r11579_e36.zip * -x \*.gz"
+ scp nickb@build.eclipse.org:~/downloads/athena/repos/b3.agg*.zip .
+ scp nickb@build.eclipse.org:~/downloads/athena/repos/buckminster*.zip .
+
+Spring IDE 2.5
+# NOTE: as of 2.5.1, creating the runnable zip using repo2runnable fails. So, instead of ant script, do this:
+# 1. launch clean Eclipse 3.6.1 Classic or JEE (eg., in ~/eclipse/36clean)
+# 2. install ONLY these 7 Spring IDE features into ~/eclipse/36clean:
+# org.springframework.ide.eclipse.feature
+# org.springframework.ide.eclipse.aop.feature
+# org.springframework.ide.eclipse.osgi.feature
+# org.springframework.ide.eclipse.webflow.feature
+# org.springframework.ide.eclipse.batch.feature
+# org.springframework.ide.eclipse.integration.feature
+# org.springframework.ide.eclipse.autowire.feature
+# 3. zip up installed features/plugins using
+# cd ~/eclipse/36clean; \
+# zip -r9 ~/tru/download.jboss.org/jbosstools/requirements/helios/spring-ide-2.5.1.201011101000-RELEASE.zip \
+# $(find . -mindepth 3 -maxdepth 3 -name "???.spring*")
+
+# Denis created an update site version, which is spring-ide-Update-2.5.1.201011101000-RELEASE.zip.
+# Used Eclipse:
+
+# <p2.publish.featuresAndBundles source="/home/eskimo/Projects/jbds-build/jbds-build/requirements/springide/spring-ide-2.5.1.201011101000-RELEASE" repository="file:///home/eskimo/Projects/jbds-build/jbds-build/requirements/springide/spring-ide-2.5.1.201011101000-RELEASE" compress="true"/>
+
+TestNG
+# Built from ~/tru/product/extras/site/pom.xml, then repackaged to include only the testng plugin + feature (exclude all else): testng-eclipse-5.14.6.20110119.zip
+
+# Denis created an update site version, which is testng-eclipse-Update-5.14.6.20110119_1050.zip
+# (see SpringIDE approach above using Eclipse and p2 publisher).
+
Copied: trunk/download.jboss.org/jbosstools/requirements/helios/OLD/m2eclipse/bui... (from rev 30656, trunk/download.jboss.org/jbosstools/requirements/helios/m2eclipse/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/requirements/helios/OLD/m2eclipse/bui... (rev 0)
+++ trunk/download.jboss.org/jbosstools/requirements/helios/OLD/m2eclipse/bui... 2011-04-19 02:53:57 UTC (rev 30657)
@@ -0,0 +1,34 @@
+<project default="repo2runnable" name="repo2runnable" basedir=".">
+ <!-- Run this script as nboldt(a)qa01.qa.atl2.redhat.com to fetch the contents of the
+ m2eclipse.sonatype.org update site, unpack the features and unjarred plugins,
+ and zip the results.
+
+ ~/eclipse/eclipse -vm /opt/jdk1.6.0-beta/bin/java -nosplash -data /tmp/workspace \
+ -consolelog -application org.eclipse.ant.core.antRunner -f build.xml -Dsuffix=0.10.0.20100209-0800
+ -->
+ <property name="suffix" value="0.10.0.20100209-0800" />
+ <property name="working.dir" value="/tmp" />
+ <property name="input.repo1" value="http://m2eclipse.sonatype.org/sites/m2e/" />
+ <property name="input.repo2" value="http://m2eclipse.sonatype.org/sites/m2e-extras/" />
+
+ <property name="output.zip" value="${basedir}/m2eclipse-${suffix}.zip" />
+
+ <target name="repo2runnable">
+ <mkdir dir="${working.dir}" />
+ <p2.repo2runnable>
+ <repository location="${working.dir}/tmp-unpacked/eclipse" />
+ <source>
+ <repository location="${input.repo1}" />
+ <repository location="${input.repo2}" />
+ </source>
+ </p2.repo2runnable>
+ <antcall target="all.in.one.zip" />
+ <delete dir="${working.dir}/tmp-unpacked" />
+ </target>
+
+ <!-- rootfiles are not created, but features and plugins will be unpacked and unzipped -->
+ <target name="all.in.one.zip">
+ <zip destfile="${output.zip}" basedir="${working.dir}/tmp-unpacked" excludes="**/content.jar, **/artifacts.jar" />
+ <delete dir="${basedir}/eclipse" quiet="true" />
+ </target>
+</project>
Copied: trunk/download.jboss.org/jbosstools/requirements/helios/OLD/svn/build.xml (from rev 30656, trunk/download.jboss.org/jbosstools/requirements/helios/svn/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/requirements/helios/OLD/svn/build.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/requirements/helios/OLD/svn/build.xml 2011-04-19 02:53:57 UTC (rev 30657)
@@ -0,0 +1,229 @@
+<project default="partial.repo.mirror" name="partial.repo.mirror">
+
+ <!-- Run this script as nboldt(a)qa01.qa.atl2.redhat.com to fetch a number of
+ features from a remote repo and mirror them locally, then zip the result.
+
+ ~/eclipse/eclipse -vm /opt/jdk1.6.0-beta/bin/java -nosplash -data /tmp/workspace \
+ -consolelog -application org.eclipse.ant.core.antRunner -f build.xml
+ -->
+ <property name="working.dir" value="${java.io.tmpdir}/partial-repo-mirror" />
+
+ <!--
+ use followStrict="true" to prevent downloading all requirements not included in the IU list below
+ or followStrict="false" to produce two zips: one with everything and one with just the specified IUs
+ -->
+ <property name="followStrict" value="true" />
+
+ <property name="output.zip" value="${basedir}/Subversive-SVNKit-Update" />
+
+ <target name="partial.repo.mirror" depends="init">
+ <if>
+ <not>
+ <available file="${working.dir}" type="dir" />
+ </not>
+ <then>
+ <echo>Fetch SVN features and plugins from repos</echo>
+ <mkdir dir="${working.dir}" />
+ <p2.mirror destination="file:/${working.dir}" description="Subversive All-In-One Repo">
+ <source>
+ <repository location="http://eclipse.svnkit.com/1.3.x/" />
+ <repository location="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-s..." />
+ <repository location="http://download.eclipse.org/technology/subversive/0.7/update-site/" />
+ <repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2" />
+ <repository location="http://download.eclipse.org/releases/helios/" />
+ </source>
+ <iu id="org.tmatesoft.svnkit.feature.group" />
+ <iu id="com.sun.jna.feature.group" />
+
+ <iu id="org.polarion.eclipse.team.svn.connector.feature.group" />
+ <iu id="org.polarion.eclipse.team.svn.connector.svnkit16.feature.group" />
+
+ <iu id="org.eclipse.team.svn.resource.ignore.rules.jdt.feature.group" />
+ <iu id="org.eclipse.team.svn.feature.group" />
+
+ <iu id="org.eclipse.ecf" />
+ <iu id="org.eclipse.ecf.filetransfer" />
+ <iu id="org.eclipse.ecf.identity" />
+ <iu id="org.eclipse.ecf.provider.filetransfer" />
+ <iu id="org.eclipse.ecf.provider.filetransfer.httpclient" />
+ <iu id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl" />
+ <iu id="org.eclipse.ecf.provider.filetransfer.ssl" />
+ <iu id="org.eclipse.ecf.ssl" />
+
+ <slicingOptions includeFeatures="true" followStrict="${followStrict}" />
+ </p2.mirror>
+ </then>
+ </if>
+
+ <if>
+ <equals arg1="${followStrict}" arg2="false" />
+ <then>
+ <echo>Filter SVN features and plugins from complete mirror to extract subset</echo>
+ <mkdir dir="${working.dir}2" />
+ <copy todir="${working.dir}2">
+ <fileset dir="${working.dir}"
+ includes="
+ **/*svn*.jar*,
+ **/*jna*.jar*,
+ **/org.eclipse.ecf*filetransfer*.jar*,
+ **/org.eclipse.ecf.identity_*.jar*,
+ **/org.eclipse.ecf*ssl_*.jar*,
+ **/org.eclipse.ecf_*.jar*"
+ />
+ </copy>
+ <delete file="${working.dir}2/content.jar" quiet="true" />
+ <delete file="${working.dir}2/artifacts.jar" quiet="true" />
+ <property name="updateSiteJarDir" value="${working.dir}2" />
+ </then>
+ <else>
+ <property name="updateSiteJarDir" value="${working.dir}" />
+ </else>
+ </if>
+ <!-- generate site.xml -->
+ <antcall target="buildSiteXml" />
+ <!-- TODO: switch to use Publisher: http://wiki.eclipse.org/Equinox/p2/Publisher#Features_and_Bundles_Publish...
+
+ <p2.publish.featuresAndBundles
+ metadataRepository="file:/repository/location"
+ artifactRepository="file:/repository/location"
+ publishArtifacts="true"
+ compress="true"
+ source="/bundles/and/features/location/">
+ -->
+
+ <!-- generate metadata -->
+ <java classname="org.eclipse.equinox.launcher.Main"
+ fork="true"
+ timeout="10800000"
+ jvm="${java.home}/bin/java"
+ failonerror="false"
+ maxmemory="512m"
+ taskname="p2"
+ >
+ <classpath>
+ <fileset dir="${eclipse.home}/plugins"
+ includes="org.eclipse.equinox.launcher_*.jar, org.eclipse.equinox.p2.metadata.generator_*.jar"
+ />
+ <pathelement location="${eclipse.home}/plugins" />
+ </classpath>
+ <arg line="-application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator" />
+ <arg line=" -updateSite ${updateSiteJarDir}/ -site file:${updateSiteJarDir}/site.xml" />
+ <arg line="-metadataRepository file://${updateSiteJarDir} -metadataRepositoryName "Subversive Repo"" />
+ <arg line="-artifactRepository file://${updateSiteJarDir} -artifactRepositoryName "Subversive Artifacts"" />
+ <arg line="-compress -noDefaultIUs -reusePack200Files" />
+ </java>
+
+ <if>
+ <equals arg1="${followStrict}" arg2="false" />
+ <then>
+ <zip destfile="${output.zip}-FULL.zip" basedir="${working.dir}" excludes=".blobstore/**" />
+ <zip destfile="${output.zip}.zip" basedir="${updateSiteJarDir}" excludes=".blobstore/**" />
+ </then>
+ <else>
+ <zip destfile="${output.zip}.zip" basedir="${updateSiteJarDir}" excludes=".blobstore/**" />
+ </else>
+ </if>
+ <delete dir="${working.dir}" includeemptydirs="true" quiet="true" />
+ <delete dir="${updateSiteJarDir}" includeemptydirs="true" quiet="true" />
+ <delete dir="${java.io.tmpdir}/workspace" includeemptydirs="true" quiet="true" />
+ </target>
+
+ <target name="buildSiteXml" description="Generate a site.xml to contain the features in a category">
+ <!-- TODO: given a list of features, produce site.xml so they're contained in a default category (or, fix bug 269226 so we don't need this) -->
+ <!-- TODO: support <site mirrorsURL="" associatedSites="" etc.> ? -->
+ <echo>Generating site.xml for use with p2 repo / update site categories...</echo>
+ <echo file="${updateSiteJarDir}/site.xml"><?xml version="1.0" encoding="UTF-8"?></echo>
+ <if>
+ <equals arg1="${pack200Files}" arg2="-reusePack200Files" />
+ <then>
+ <echo append="true" file="${updateSiteJarDir}/site.xml"><site pack200="true"></echo>
+ </then>
+ <else>
+ <echo append="true" file="${updateSiteJarDir}/site.xml"><site></echo>
+ </else>
+ </if>
+
+ <property name="category.name" value="Subversive Repo" />
+
+ <echo append="true" file="${updateSiteJarDir}/site.xml"> <description>To install these features, point Eclipse at this site.</description>
+
+ <!-- ${category.name} -->
+ <category-def label="${category.name}" name="${category.name}">
+ <description>${category.name}: contains all features in this build.</description>
+ </category-def>
+ </echo>
+
+ <for param="featureJar">
+ <path>
+ <fileset dir="${updateSiteJarDir}/features" includes="*.jar" />
+ </path>
+ <sequential>
+ <var name="feature.jarfile" unset="true" />
+ <var name="feature.id" unset="true" />
+ <var name="feature.version" unset="true" />
+ <propertyregex property="feature.jarfile"
+ defaultvalue="@{featureJar}"
+ input="@{featureJar}"
+ regexp=".+/features/([^/]+\.jar)"
+ replace="\1"
+ override="true"
+ />
+ <propertyregex property="feature.id"
+ defaultvalue="${feature.jarfile}"
+ input="${feature.jarfile}"
+ regexp="([^_]+)_(\d+\.\d+\.\d+\..+)\.jar"
+ replace="\1"
+ override="true"
+ />
+ <propertyregex property="feature.version"
+ defaultvalue="${feature.jarfile}"
+ input="${feature.jarfile}"
+ regexp="([^_]+)_(\d+\.\d+\.\d+\..+)\.jar"
+ replace="\2"
+ override="true"
+ />
+ <echo append="true" file="${updateSiteJarDir}/site.xml"> <feature id="${feature.id}" version="${feature.version}" url="features/${feature.jarfile}" patch="false">
+ <category name="${category.name}"/>
+ </feature>
+ </echo>
+ <var name="feature.jarfile" unset="true" />
+ <var name="feature.id" unset="true" />
+ <var name="feature.version" unset="true" />
+ </sequential>
+ </for>
+ <echo append="true" file="${updateSiteJarDir}/site.xml">
+ </site>
+ </echo>
+ </target>
+
+ <target name="init">
+ <property name="COMMON_TOOLS" value="${java.io.tmpdir}"/>
+ <available file="${COMMON_TOOLS}/ant-contrib.jar" type="file" property="ant-contrib.jar.exists" />
+ <antcall target="get.ant-contrib" />
+ <taskdef resource="net/sf/antcontrib/antlib.xml">
+ <classpath>
+ <pathelement location="${COMMON_TOOLS}/ant-contrib.jar" />
+ </classpath>
+ </taskdef>
+ </target>
+
+ <target name="get.ant-contrib" unless="ant-contrib.jar.exists">
+ <property name="ANTCONTRIB_MIRROR" value="http://downloads.sourceforge.net/ant-contrib/" />
+ <get usetimestamp="true"
+ dest="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip"
+ src="${ANTCONTRIB_MIRROR}/ant-contrib-1.0b2-bin.zip"
+ />
+ <touch file="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip" />
+ <mkdir dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" />
+ <unzip src="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip"
+ dest="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_"
+ overwrite="true"
+ />
+ <copy file="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_/ant-contrib/lib/ant-contrib.jar"
+ tofile="${COMMON_TOOLS}/ant-contrib.jar"
+ failonerror="true"
+ />
+ <delete dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" includeemptydirs="true" quiet="true" />
+ </target>
+</project>
+
Copied: trunk/download.jboss.org/jbosstools/requirements/helios/OLD/xulrunner/REA... (from rev 30656, trunk/download.jboss.org/jbosstools/requirements/helios/xulrunner/README.txt)
===================================================================
--- trunk/download.jboss.org/jbosstools/requirements/helios/OLD/xulrunner/REA... (rev 0)
+++ trunk/download.jboss.org/jbosstools/requirements/helios/OLD/xulrunner/REA... 2011-04-19 02:53:57 UTC (rev 30657)
@@ -0,0 +1,14 @@
+To build xpcom and xulrunner 1.9.2, use:
+
+ http://hudson.qa.jboss.com/hudson/view/DevStudio_Tycho/job/xulrunner-1.9.2/
+
+Results will be posted here:
+
+ http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/xulrunner-...
+
+and can be manually copied to here:
+
+ http://download.jboss.org/jbosstools/updates/xulrunner-1.9.2/
+
+for use in downstream builds.
+
Deleted: trunk/download.jboss.org/jbosstools/requirements/helios/README.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/requirements/helios/README.txt 2011-04-19 01:09:59 UTC (rev 30656)
+++ trunk/download.jboss.org/jbosstools/requirements/helios/README.txt 2011-04-19 02:53:57 UTC (rev 30657)
@@ -1,113 +0,0 @@
-Total of 25 req'd tgzs/zips/jars.
-
-BIRT 2.6 -> http://www.eclipse.org/downloads/download.php?file=/birt/downloads/build_...
-->
-wget \
-http://www.eclipse.org/downloads/download.php?file=/birt/downloads/drops/R-R1-2_6_1-201009171723/birt-report-framework-2_6_1.zip\&r=1 \
-http://www.eclipse.org/downloads/download.php?file=/birt/downloads/drops/R-R1-2_6_1-201009171723/birt-wtp-integration-sdk-2_6_1.zip\&r=1
-
-DTP 1.8 -> http://www.eclipse.org/datatools/downloads.php
-wget http://www.eclipse.org/downloads/download.php?file=/datatools/downloads/1...
-
-Eclipse 3.6 + ETF -> http://download.eclipse.org/eclipse/downloads
-->
-wget \
-http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.6.1-201009090800/eclipse-SDK-3.6.1-win32.zip\&r=1 \
-http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.6.1-201009090800/eclipse-SDK-3.6.1-linux-gtk-x86_64.tar.gz\&r=1 \
-http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.6.1-201009090800/eclipse-SDK-3.6.1-linux-gtk.tar.gz\&r=1 \
-http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.6.1-201009090800/eclipse-SDK-3.6.1-macosx-cocoa.tar.gz\&r=1 \
-http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.6.1-201009090800/eclipse-SDK-3.6.1-macosx-cocoa-x86_64.tar.gz\&r=1 \
-http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.6.1-201009090800/eclipse-test-framework-3.6.1.zip\&r=1
-
-EMF & XSD 2.6 ->
-http://www.eclipse.org/modeling/emf/downloads/?project=emf&showAll=0&showMax=5&sortBy=date
-wget http://www.eclipse.org/downloads/download.php?file=/modeling/emf/emf/down... \
- "http://www.eclipse.org/downloads/download.php?file=/modeling/emf/emf/down..." &
-
-UML2 3.1 ->
-http://www.eclipse.org/modeling/mdt/downloads/?project=uml2
-wget "http://www.eclipse.org/downloads/download.php?r=1&file=/modeling/mdt/uml2..."
-
-GEF 3.6 ->
-http://www.eclipse.org/gef/downloads/?project=&showAll=0&showMax=5&sortBy=date
-wget "http://www.eclipse.org/downloads/download.php?file=/tools/gef/downloads/d..." \
- "http://www.eclipse.org/downloads/download.php?file=/tools/gef/downloads/d..." &
-
-Equinox 3.6 ->
-http://download.eclipse.org/equinox/
-http://download.eclipse.org/equinox/drops/R-3.6.1-201009090800/index.php
-wget http://ftp.osuosl.org/pub/eclipse/equinox/drops/R-3.6-201006080911/org.ec...
-wget http://ftp.osuosl.org/pub/eclipse/equinox/drops/R-3.6-201006080911/org.ec...
-(unchanged in 3.6.1)
-
-RSE 3.2 ->
-wget \
-"http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/dro..." \
-"http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/dro..."
-
-TPTP 4.7 ->
-http://eclipse.org/tptp/home/downloads/?ver=4.7.1
-wget "http://www.eclipse.org/downloads/download.php?file=/tptp/4.7.1/TPTP-4.7.1..."
-
-WTP 3.2 ->
-http://download.eclipse.org/webtools/downloads/
-wget http://www.eclipse.org/downloads/download.php?file=/webtools/downloads/dr...
-
-SWTBot 2.0 e36 ->
-http://www.eclipse.org/swtbot/downloads.php ->
-wget "http://www.eclipse.org/downloads/download.php?file=/technology/swtbot/hel..." &
-wget "http://www.eclipse.org/downloads/download.php?file=/technology/swtbot/hel..." &
-wget "http://www.eclipse.org/downloads/download.php?file=/technology/swtbot/hel..."
-wget "http://www.eclipse.org/downloads/download.php?r=1&file=/athena/repos/swtb..."
-
-------------
-
-5 custom built zips:
-
-Basebuilder from latest tag (http://wiki.eclipse.org/Platform-releng-basebuilder#Current_build_tag_for...)
- cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse -q co -d
-org.eclipse.releng.basebuilder -r R36_RC4
-org.eclipse.releng.basebuilder
- zip -r9 org.eclipse.releng.basebuilder_R36_RC4.zip org.eclipse.releng.basebuilder
-
-m2eclipse-0.10.2.20100623-1649_mylyn.zip
- run m2eclipse/build.xml
-
-Subvsve079.I201005121900_SVNconn222.I201005121900_SVNKit133.6648_JNA323_ECF310.v201005082345-Update.zip
- run svn/build.xml
- http://divby0.blogspot.com/2010/05/my-love-hate-with-svn-part-8.html
- http://wiki.eclipse.org/Equinox/p2/Ant_Tasks/Partial_Mirroring/Example
-
-b3 Aggregator Engine
- ssh nickb(a)build.eclipse.org "cd /home/data/httpd/download.eclipse.org/modeling/emft/b3/updates-3.6; zip -9r ~/downloads/athena/repos/b3.aggregator-repo-0.1.0.r01053_e36.zip * -x \*.gz"
- ssh nickb(a)build.eclipse.org "cd /home/data/httpd/download.eclipse.org/tools/buckminster/updates-3.6; zip -9r ~/downloads/athena/repos/buckminster-repo-1.3.1.r11579_e36.zip * -x \*.gz"
- scp nickb@build.eclipse.org:~/downloads/athena/repos/b3.agg*.zip .
- scp nickb@build.eclipse.org:~/downloads/athena/repos/buckminster*.zip .
-
-Spring IDE 2.5
-# NOTE: as of 2.5.1, creating the runnable zip using repo2runnable fails. So, instead of ant script, do this:
-# 1. launch clean Eclipse 3.6.1 Classic or JEE (eg., in ~/eclipse/36clean)
-# 2. install ONLY these 7 Spring IDE features into ~/eclipse/36clean:
-# org.springframework.ide.eclipse.feature
-# org.springframework.ide.eclipse.aop.feature
-# org.springframework.ide.eclipse.osgi.feature
-# org.springframework.ide.eclipse.webflow.feature
-# org.springframework.ide.eclipse.batch.feature
-# org.springframework.ide.eclipse.integration.feature
-# org.springframework.ide.eclipse.autowire.feature
-# 3. zip up installed features/plugins using
-# cd ~/eclipse/36clean; \
-# zip -r9 ~/tru/download.jboss.org/jbosstools/requirements/helios/spring-ide-2.5.1.201011101000-RELEASE.zip \
-# $(find . -mindepth 3 -maxdepth 3 -name "???.spring*")
-
-# Denis created an update site version, which is spring-ide-Update-2.5.1.201011101000-RELEASE.zip.
-# Used Eclipse:
-
-# <p2.publish.featuresAndBundles source="/home/eskimo/Projects/jbds-build/jbds-build/requirements/springide/spring-ide-2.5.1.201011101000-RELEASE" repository="file:///home/eskimo/Projects/jbds-build/jbds-build/requirements/springide/spring-ide-2.5.1.201011101000-RELEASE" compress="true"/>
-
-TestNG
-# Built from ~/tru/product/extras/site/pom.xml, then repackaged to include only the testng plugin + feature (exclude all else): testng-eclipse-5.14.6.20110119.zip
-
-# Denis created an update site version, which is testng-eclipse-Update-5.14.6.20110119_1050.zip
-# (see SpringIDE approach above using Eclipse and p2 publisher).
-
Modified: trunk/download.jboss.org/jbosstools/requirements/helios/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/requirements/helios/index.html 2011-04-19 01:09:59 UTC (rev 30656)
+++ trunk/download.jboss.org/jbosstools/requirements/helios/index.html 2011-04-19 02:53:57 UTC (rev 30657)
@@ -29,66 +29,35 @@
<tr class="dark-row" style="height: 30px">
<td class="bodyText">
- <!-- <p class="bodyText"></p> -->
+ <p class="bodyText">
+This folder is deprecated; JBoss Tools and Dev Studio are now built againt at target platform, not a collection of runtime and SDK zips + update sites.
+<ul>
+<li>To view the cascade of build jobs and artifacts, from<br/> upstream <b>target platforms</b> to<br/> midstream <b>component update sites</b> to<br/> downstream <b>aggregate update sites</b> and <br/> finally the <b>JBDS product build</b>, see:
+<ul>
+<li><a href="http://download.jboss.org/jbosstools/builds/cascade/trunk.html">Build Job Cascade + Results (Trunk)</a></li>
+<li><a href="http://download.jboss.org/jbosstools/builds/cascade/">Build Job Cascade + Results (3.2.x)</a></li>
+</ul>
+</li>
+<br/>
+<li>To view the JBoss Tools Target Platforms, see:
+<ul>
+<li><a href="http://download.jboss.org/jbosstools/updates/target-platform_trunk/latest/">JBoss Tools Target Platform (Trunk)</a></li>
+<li><a href="http://download.jboss.org/jbosstools/updates/target-platform/latest/">JBoss Tools Target Platform (3.2.x)</a></li>
+</ul>
+</li>
+<br/>
+<li>To view the JBoss Tools Requirements Composite Mirrors, see:
+<ul>
+<li><a href="http://download.jboss.org/jbosstools/updates/indigo/">JBoss Tools Requirements - Composite Mirror - Indigo</a></li>
+<li><a href="http://download.jboss.org/jbosstools/updates/helios/">JBoss Tools Requirements - Composite Mirror - Helios</a></li>
+</ul>
+</li>
+</ul>
+ </p>
-<!-- to convert raw fish listing to links do this in vi
-
-:%s#^sftp://tools@filemgmt.jboss.org/downloads_htdocs/tools/requirements/helios/\(.\+\)$#<li><a class=link href=\1>\1<\/a></li>#g
-or
-:%s#^file:///home/nboldt/1/jbosstools-trunk/download.jboss.org/jbosstools/requirements/helios/\(.\+\)$#<li><a class=link href=\1>\1<\/a></li>#g
-
-Then sftp file into
-
-tools(a)filemgmt.jboss.org/downloads_htdocs/tools/requirements/helios/
-
-which becomes
-
-http://download.jboss.org/jbosstools/requirements/helios/
-
--->
- <br/>
- <ul>
-
-<li><a class=link href=GEF-runtime-3.6.1.zip>GEF-runtime-3.6.1.zip</a></li>
-<li><a class=link href=GEF-zest-3.6.1.zip>GEF-zest-3.6.1.zip</a></li>
-<li><a class=link href=RSE-runtime-M20100909-1340.zip>RSE-runtime-M20100909-1340.zip</a></li>
-<li><a class=link href=Subvsve079.I201005121900_SVNconn222.I201005121900_SVNKit133.6648_JNA323_ECF310.v201005082345-Update.zip>Subvsve079.I201005121900_SVNconn222.I201005121900_SVNKit133.6648_JNA323_ECF310.v201005082345-Update.zip</a></li>
-<li><a class=link href=b3.aggregator-repo-0.1.0.r01053_e36.zip>b3.aggregator-repo-0.1.0.r01053_e36.zip</a></li>
-<li><a class=link href=birt-report-framework-2_6_1.zip>birt-report-framework-2_6_1.zip</a></li>
-<li><a class=link href=birt-wtp-integration-sdk-2_6_1.zip>birt-wtp-integration-sdk-2_6_1.zip</a></li>
-<li><a class=link href=buckminster-repo-1.3.1.r11579_e36.zip>buckminster-repo-1.3.1.r11579_e36.zip</a></li>
-<li><a class=link href=dtp_1.8.1.zip>dtp_1.8.1.zip</a></li>
-<li><a class=link href=eclipse-SDK-3.6.1-linux-gtk-x86_64.tar.gz>eclipse-SDK-3.6.1-linux-gtk-x86_64.tar.gz</a></li>
-<li><a class=link href=eclipse-SDK-3.6.1-linux-gtk.tar.gz>eclipse-SDK-3.6.1-linux-gtk.tar.gz</a></li>
-<li><a class=link href=eclipse-SDK-3.6.1-macosx-cocoa-x86_64.tar.gz>eclipse-SDK-3.6.1-macosx-cocoa-x86_64.tar.gz</a></li>
-<li><a class=link href=eclipse-SDK-3.6.1-macosx-cocoa.tar.gz>eclipse-SDK-3.6.1-macosx-cocoa.tar.gz</a></li>
-<li><a class=link href=eclipse-SDK-3.6.1-win32.zip>eclipse-SDK-3.6.1-win32.zip</a></li>
-<li><a class=link href=eclipse-test-framework-3.6.1.zip>eclipse-test-framework-3.6.1.zip</a></li>
-<li><a class=link href=emf-runtime-2.6.1.zip>emf-runtime-2.6.1.zip</a></li>
-<li><a class=link href=m2eclipse-0.10.2.20100623-1649_mylyn.zip>m2eclipse-0.10.2.20100623-1649_mylyn.zip</a></li>
-<li><a class=link href=org.eclipse.equinox.transforms.hook_1.0.200.v20100503.jar>org.eclipse.equinox.transforms.hook_1.0.200.v20100503.jar</a></li>
-<li><a class=link href=org.eclipse.equinox.transforms.xslt_1.0.200.v20100503.jar>org.eclipse.equinox.transforms.xslt_1.0.200.v20100503.jar</a></li>
-<li><a class=link href=org.eclipse.releng.basebuilder_R36_RC4.zip>org.eclipse.releng.basebuilder_R36_RC4.zip</a></li>
-<li><a class=link href=org.eclipse.swtbot.eclipse-2.0.1.20101106_1831-73ca7af-dev-e36.zip>org.eclipse.swtbot.eclipse-2.0.1.20101106_1831-73ca7af-dev-e36.zip</a></li>
-<li><a class=link href=org.eclipse.swtbot.eclipse.gef-2.0.1.20101106_1831-73ca7af-dev-e36.zip>org.eclipse.swtbot.eclipse.gef-2.0.1.20101106_1831-73ca7af-dev-e36.zip</a></li>
-<li><a class=link href=org.eclipse.swtbot.eclipse.test.junit4-2.0.1.20101106_1831-73ca7af-dev-e36.zip>org.eclipse.swtbot.eclipse.test.junit4-2.0.1.20101106_1831-73ca7af-dev-e36.zip</a></li>
-<li><a class=link href=swtbot-update-site-2.0.1.20101106_1831-73ca7af-dev-e36.zip>swtbot-update-site-2.0.1.20101106_1831-73ca7af-dev-e36.zip</a></li>
-<li><a class=link href=spring-ide-Update-2.5.1.201011101000-RELEASE.zip>spring-ide-Update-2.5.1.201011101000-RELEASE.zip</a></li>
-<li><a class=link href=spring-ide-2.5.1.201011101000-RELEASE.zip>spring-ide-2.5.1.201011101000-RELEASE.zip</a></li>
-<li><a class=link href=testng-eclipse-5.8.0.1.zip>testng-eclipse-5.8.0.1.zip</a></li>
-<li><a class=link href=testng-eclipse-5.14.6.20110119.zip>testng-eclipse-5.14.6.20110119.zip</a></li>
-<li><a class=link href=testng-eclipse-Update-5.14.6.20110119_1050.zip>testng-eclipse-Update-5.14.6.20110119_1050.zip</a></li>
-<li><a class=link href=tptp.runtime-TPTP-4.7.1.zip>tptp.runtime-TPTP-4.7.1.zip</a></li>
-<li><a class=link href=mdt-uml2-runtime-3.1.1.zip>mdt-uml2-runtime-3.1.1.zip</a></li>
-<li><a class=link href=wtp-R-3.2.2-20100915173744.zip>wtp-R-3.2.2-20100915173744.zip</a></li>
-<li><a class=link href=xsd-runtime-2.6.1.zip>xsd-runtime-2.6.1.zip</a></li>
-<p/>
-<li><a class=link href=README.txt>README.txt</a></li>
-<li><a class=link href=m2eclipse/build.xml>m2eclipse/build.xml</a></li>
-<li><a class=link href=svn/build.xml>svn/build.xml</a></li>
-<li><a class=link href=xulrunner/README.txt>xulrunner/README.txt</a></li>
- </ul>
- <br/>
+<p class="bodyText">
+<i><a style="color:gray" href="OLD/">Deprecated content is here.</a></i>
+</p>
</td>
</tr>
Deleted: trunk/download.jboss.org/jbosstools/requirements/helios/m2eclipse/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/requirements/helios/m2eclipse/build.xml 2011-04-19 01:09:59 UTC (rev 30656)
+++ trunk/download.jboss.org/jbosstools/requirements/helios/m2eclipse/build.xml 2011-04-19 02:53:57 UTC (rev 30657)
@@ -1,34 +0,0 @@
-<project default="repo2runnable" name="repo2runnable" basedir=".">
- <!-- Run this script as nboldt(a)qa01.qa.atl2.redhat.com to fetch the contents of the
- m2eclipse.sonatype.org update site, unpack the features and unjarred plugins,
- and zip the results.
-
- ~/eclipse/eclipse -vm /opt/jdk1.6.0-beta/bin/java -nosplash -data /tmp/workspace \
- -consolelog -application org.eclipse.ant.core.antRunner -f build.xml -Dsuffix=0.10.0.20100209-0800
- -->
- <property name="suffix" value="0.10.0.20100209-0800" />
- <property name="working.dir" value="/tmp" />
- <property name="input.repo1" value="http://m2eclipse.sonatype.org/sites/m2e/" />
- <property name="input.repo2" value="http://m2eclipse.sonatype.org/sites/m2e-extras/" />
-
- <property name="output.zip" value="${basedir}/m2eclipse-${suffix}.zip" />
-
- <target name="repo2runnable">
- <mkdir dir="${working.dir}" />
- <p2.repo2runnable>
- <repository location="${working.dir}/tmp-unpacked/eclipse" />
- <source>
- <repository location="${input.repo1}" />
- <repository location="${input.repo2}" />
- </source>
- </p2.repo2runnable>
- <antcall target="all.in.one.zip" />
- <delete dir="${working.dir}/tmp-unpacked" />
- </target>
-
- <!-- rootfiles are not created, but features and plugins will be unpacked and unzipped -->
- <target name="all.in.one.zip">
- <zip destfile="${output.zip}" basedir="${working.dir}/tmp-unpacked" excludes="**/content.jar, **/artifacts.jar" />
- <delete dir="${basedir}/eclipse" quiet="true" />
- </target>
-</project>
Added: trunk/download.jboss.org/jbosstools/requirements/helios/springide/composi...
===================================================================
--- trunk/download.jboss.org/jbosstools/requirements/helios/springide/composi... (rev 0)
+++ trunk/download.jboss.org/jbosstools/requirements/helios/springide/composi... 2011-04-19 02:53:57 UTC (rev 30657)
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='JBoss Tools Requirements - Deprecated Spring IDE Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<!--
+ get new time w/
+ date +%s000
+-->
+<property name='p2.timestamp' value='1303162205000'/>
+</properties>
+<children size='1'>
+<child location='../../../updates/requirements/springide/2.5.1.201011101000/'/>
+</children>
+</repository>
Added: trunk/download.jboss.org/jbosstools/requirements/helios/springide/composi...
===================================================================
--- trunk/download.jboss.org/jbosstools/requirements/helios/springide/composi... (rev 0)
+++ trunk/download.jboss.org/jbosstools/requirements/helios/springide/composi... 2011-04-19 02:53:57 UTC (rev 30657)
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='JBoss Tools Requirements - Deprecated Spring IDE Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<!--
+ get new time w/
+ date +%s000
+-->
+<property name='p2.timestamp' value='1303162205000'/>
+</properties>
+<children size='1'>
+<child location='../../../updates/requirements/springide/2.5.1.201011101000/'/>
+</children>
+</repository>
Deleted: trunk/download.jboss.org/jbosstools/requirements/helios/svn/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/requirements/helios/svn/build.xml 2011-04-19 01:09:59 UTC (rev 30656)
+++ trunk/download.jboss.org/jbosstools/requirements/helios/svn/build.xml 2011-04-19 02:53:57 UTC (rev 30657)
@@ -1,229 +0,0 @@
-<project default="partial.repo.mirror" name="partial.repo.mirror">
-
- <!-- Run this script as nboldt(a)qa01.qa.atl2.redhat.com to fetch a number of
- features from a remote repo and mirror them locally, then zip the result.
-
- ~/eclipse/eclipse -vm /opt/jdk1.6.0-beta/bin/java -nosplash -data /tmp/workspace \
- -consolelog -application org.eclipse.ant.core.antRunner -f build.xml
- -->
- <property name="working.dir" value="${java.io.tmpdir}/partial-repo-mirror" />
-
- <!--
- use followStrict="true" to prevent downloading all requirements not included in the IU list below
- or followStrict="false" to produce two zips: one with everything and one with just the specified IUs
- -->
- <property name="followStrict" value="true" />
-
- <property name="output.zip" value="${basedir}/Subversive-SVNKit-Update" />
-
- <target name="partial.repo.mirror" depends="init">
- <if>
- <not>
- <available file="${working.dir}" type="dir" />
- </not>
- <then>
- <echo>Fetch SVN features and plugins from repos</echo>
- <mkdir dir="${working.dir}" />
- <p2.mirror destination="file:/${working.dir}" description="Subversive All-In-One Repo">
- <source>
- <repository location="http://eclipse.svnkit.com/1.3.x/" />
- <repository location="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-s..." />
- <repository location="http://download.eclipse.org/technology/subversive/0.7/update-site/" />
- <repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2" />
- <repository location="http://download.eclipse.org/releases/helios/" />
- </source>
- <iu id="org.tmatesoft.svnkit.feature.group" />
- <iu id="com.sun.jna.feature.group" />
-
- <iu id="org.polarion.eclipse.team.svn.connector.feature.group" />
- <iu id="org.polarion.eclipse.team.svn.connector.svnkit16.feature.group" />
-
- <iu id="org.eclipse.team.svn.resource.ignore.rules.jdt.feature.group" />
- <iu id="org.eclipse.team.svn.feature.group" />
-
- <iu id="org.eclipse.ecf" />
- <iu id="org.eclipse.ecf.filetransfer" />
- <iu id="org.eclipse.ecf.identity" />
- <iu id="org.eclipse.ecf.provider.filetransfer" />
- <iu id="org.eclipse.ecf.provider.filetransfer.httpclient" />
- <iu id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl" />
- <iu id="org.eclipse.ecf.provider.filetransfer.ssl" />
- <iu id="org.eclipse.ecf.ssl" />
-
- <slicingOptions includeFeatures="true" followStrict="${followStrict}" />
- </p2.mirror>
- </then>
- </if>
-
- <if>
- <equals arg1="${followStrict}" arg2="false" />
- <then>
- <echo>Filter SVN features and plugins from complete mirror to extract subset</echo>
- <mkdir dir="${working.dir}2" />
- <copy todir="${working.dir}2">
- <fileset dir="${working.dir}"
- includes="
- **/*svn*.jar*,
- **/*jna*.jar*,
- **/org.eclipse.ecf*filetransfer*.jar*,
- **/org.eclipse.ecf.identity_*.jar*,
- **/org.eclipse.ecf*ssl_*.jar*,
- **/org.eclipse.ecf_*.jar*"
- />
- </copy>
- <delete file="${working.dir}2/content.jar" quiet="true" />
- <delete file="${working.dir}2/artifacts.jar" quiet="true" />
- <property name="updateSiteJarDir" value="${working.dir}2" />
- </then>
- <else>
- <property name="updateSiteJarDir" value="${working.dir}" />
- </else>
- </if>
- <!-- generate site.xml -->
- <antcall target="buildSiteXml" />
- <!-- TODO: switch to use Publisher: http://wiki.eclipse.org/Equinox/p2/Publisher#Features_and_Bundles_Publish...
-
- <p2.publish.featuresAndBundles
- metadataRepository="file:/repository/location"
- artifactRepository="file:/repository/location"
- publishArtifacts="true"
- compress="true"
- source="/bundles/and/features/location/">
- -->
-
- <!-- generate metadata -->
- <java classname="org.eclipse.equinox.launcher.Main"
- fork="true"
- timeout="10800000"
- jvm="${java.home}/bin/java"
- failonerror="false"
- maxmemory="512m"
- taskname="p2"
- >
- <classpath>
- <fileset dir="${eclipse.home}/plugins"
- includes="org.eclipse.equinox.launcher_*.jar, org.eclipse.equinox.p2.metadata.generator_*.jar"
- />
- <pathelement location="${eclipse.home}/plugins" />
- </classpath>
- <arg line="-application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator" />
- <arg line=" -updateSite ${updateSiteJarDir}/ -site file:${updateSiteJarDir}/site.xml" />
- <arg line="-metadataRepository file://${updateSiteJarDir} -metadataRepositoryName "Subversive Repo"" />
- <arg line="-artifactRepository file://${updateSiteJarDir} -artifactRepositoryName "Subversive Artifacts"" />
- <arg line="-compress -noDefaultIUs -reusePack200Files" />
- </java>
-
- <if>
- <equals arg1="${followStrict}" arg2="false" />
- <then>
- <zip destfile="${output.zip}-FULL.zip" basedir="${working.dir}" excludes=".blobstore/**" />
- <zip destfile="${output.zip}.zip" basedir="${updateSiteJarDir}" excludes=".blobstore/**" />
- </then>
- <else>
- <zip destfile="${output.zip}.zip" basedir="${updateSiteJarDir}" excludes=".blobstore/**" />
- </else>
- </if>
- <delete dir="${working.dir}" includeemptydirs="true" quiet="true" />
- <delete dir="${updateSiteJarDir}" includeemptydirs="true" quiet="true" />
- <delete dir="${java.io.tmpdir}/workspace" includeemptydirs="true" quiet="true" />
- </target>
-
- <target name="buildSiteXml" description="Generate a site.xml to contain the features in a category">
- <!-- TODO: given a list of features, produce site.xml so they're contained in a default category (or, fix bug 269226 so we don't need this) -->
- <!-- TODO: support <site mirrorsURL="" associatedSites="" etc.> ? -->
- <echo>Generating site.xml for use with p2 repo / update site categories...</echo>
- <echo file="${updateSiteJarDir}/site.xml"><?xml version="1.0" encoding="UTF-8"?></echo>
- <if>
- <equals arg1="${pack200Files}" arg2="-reusePack200Files" />
- <then>
- <echo append="true" file="${updateSiteJarDir}/site.xml"><site pack200="true"></echo>
- </then>
- <else>
- <echo append="true" file="${updateSiteJarDir}/site.xml"><site></echo>
- </else>
- </if>
-
- <property name="category.name" value="Subversive Repo" />
-
- <echo append="true" file="${updateSiteJarDir}/site.xml"> <description>To install these features, point Eclipse at this site.</description>
-
- <!-- ${category.name} -->
- <category-def label="${category.name}" name="${category.name}">
- <description>${category.name}: contains all features in this build.</description>
- </category-def>
- </echo>
-
- <for param="featureJar">
- <path>
- <fileset dir="${updateSiteJarDir}/features" includes="*.jar" />
- </path>
- <sequential>
- <var name="feature.jarfile" unset="true" />
- <var name="feature.id" unset="true" />
- <var name="feature.version" unset="true" />
- <propertyregex property="feature.jarfile"
- defaultvalue="@{featureJar}"
- input="@{featureJar}"
- regexp=".+/features/([^/]+\.jar)"
- replace="\1"
- override="true"
- />
- <propertyregex property="feature.id"
- defaultvalue="${feature.jarfile}"
- input="${feature.jarfile}"
- regexp="([^_]+)_(\d+\.\d+\.\d+\..+)\.jar"
- replace="\1"
- override="true"
- />
- <propertyregex property="feature.version"
- defaultvalue="${feature.jarfile}"
- input="${feature.jarfile}"
- regexp="([^_]+)_(\d+\.\d+\.\d+\..+)\.jar"
- replace="\2"
- override="true"
- />
- <echo append="true" file="${updateSiteJarDir}/site.xml"> <feature id="${feature.id}" version="${feature.version}" url="features/${feature.jarfile}" patch="false">
- <category name="${category.name}"/>
- </feature>
- </echo>
- <var name="feature.jarfile" unset="true" />
- <var name="feature.id" unset="true" />
- <var name="feature.version" unset="true" />
- </sequential>
- </for>
- <echo append="true" file="${updateSiteJarDir}/site.xml">
- </site>
- </echo>
- </target>
-
- <target name="init">
- <property name="COMMON_TOOLS" value="${java.io.tmpdir}"/>
- <available file="${COMMON_TOOLS}/ant-contrib.jar" type="file" property="ant-contrib.jar.exists" />
- <antcall target="get.ant-contrib" />
- <taskdef resource="net/sf/antcontrib/antlib.xml">
- <classpath>
- <pathelement location="${COMMON_TOOLS}/ant-contrib.jar" />
- </classpath>
- </taskdef>
- </target>
-
- <target name="get.ant-contrib" unless="ant-contrib.jar.exists">
- <property name="ANTCONTRIB_MIRROR" value="http://downloads.sourceforge.net/ant-contrib/" />
- <get usetimestamp="true"
- dest="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip"
- src="${ANTCONTRIB_MIRROR}/ant-contrib-1.0b2-bin.zip"
- />
- <touch file="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip" />
- <mkdir dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" />
- <unzip src="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip"
- dest="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_"
- overwrite="true"
- />
- <copy file="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_/ant-contrib/lib/ant-contrib.jar"
- tofile="${COMMON_TOOLS}/ant-contrib.jar"
- failonerror="true"
- />
- <delete dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" includeemptydirs="true" quiet="true" />
- </target>
-</project>
-
Added: trunk/download.jboss.org/jbosstools/requirements/helios/testng/compositeA...
===================================================================
--- trunk/download.jboss.org/jbosstools/requirements/helios/testng/compositeA... (rev 0)
+++ trunk/download.jboss.org/jbosstools/requirements/helios/testng/compositeA... 2011-04-19 02:53:57 UTC (rev 30657)
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='JBoss Tools Requirements - Deprecated TestNG Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<!--
+ get new time w/
+ date +%s000
+-->
+<property name='p2.timestamp' value='1303162205000'/>
+</properties>
+<children size='1'>
+<child location='../../../updates/requirements/testng/5.14.6.20110119_1050/'/>
+</children>
+</repository>
Added: trunk/download.jboss.org/jbosstools/requirements/helios/testng/compositeC...
===================================================================
--- trunk/download.jboss.org/jbosstools/requirements/helios/testng/compositeC... (rev 0)
+++ trunk/download.jboss.org/jbosstools/requirements/helios/testng/compositeC... 2011-04-19 02:53:57 UTC (rev 30657)
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='JBoss Tools Requirements - Deprecated TestNG Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<!--
+ get new time w/
+ date +%s000
+-->
+<property name='p2.timestamp' value='1303162205000'/>
+</properties>
+<children size='1'>
+<child location='../../../updates/requirements/testng/5.14.6.20110119_1050/'/>
+</children>
+</repository>
Deleted: trunk/download.jboss.org/jbosstools/requirements/helios/xulrunner/README.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/requirements/helios/xulrunner/README.txt 2011-04-19 01:09:59 UTC (rev 30656)
+++ trunk/download.jboss.org/jbosstools/requirements/helios/xulrunner/README.txt 2011-04-19 02:53:57 UTC (rev 30657)
@@ -1,14 +0,0 @@
-To build xpcom and xulrunner 1.9.2, use:
-
- http://hudson.qa.jboss.com/hudson/view/DevStudio_Tycho/job/xulrunner-1.9.2/
-
-Results will be posted here:
-
- http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/xulrunner-...
-
-and can be manually copied to here:
-
- http://download.jboss.org/jbosstools/updates/xulrunner-1.9.2/
-
-for use in downstream builds.
-
Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-04-19 01:09:59 UTC (rev 30656)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-04-19 02:53:57 UTC (rev 30657)
@@ -7,9 +7,9 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1302291248000'/>
+<property name='p2.timestamp' value='1303164158000'/>
</properties>
-<children size='18'>
+<children size='20'>
<child location='../requirements/helios/SR2/'/>
<child location='../requirements/birt/2.6.2/'/>
<child location='../requirements/ecf/3.4/'/>
@@ -24,10 +24,12 @@
<child location='../requirements/orbit/S20110124210048/'/>
<child location='../requirements/pmd/3.2.6/'/>
+<child location='../requirements/springide/2.5.1.201011101000/'/>
<child location='../requirements/subclipse/1.6/'/>
<child location='../requirements/subversive/0.7.9_2.2.2/'/>
+
<child location='../requirements/swtbot/2.0.3/'/>
-
+<child location='../requirements/testng/5.14.6.20110119_1050/'/>
<child location='../requirements/tptp/4.7/'/>
<child location='../requirements/webtools/3.2.3/'/>
<child location='../requirements/xulrunner-1.9.1.2/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-04-19 01:09:59 UTC (rev 30656)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-04-19 02:53:57 UTC (rev 30657)
@@ -7,9 +7,9 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1302291248000'/>
+<property name='p2.timestamp' value='1303164158000'/>
</properties>
-<children size='18'>
+<children size='20'>
<child location='../requirements/helios/SR2/'/>
<child location='../requirements/birt/2.6.2/'/>
<child location='../requirements/ecf/3.4/'/>
@@ -24,10 +24,12 @@
<child location='../requirements/orbit/S20110124210048/'/>
<child location='../requirements/pmd/3.2.6/'/>
+<child location='../requirements/springide/2.5.1.201011101000/'/>
<child location='../requirements/subclipse/1.6/'/>
<child location='../requirements/subversive/0.7.9_2.2.2/'/>
+
<child location='../requirements/swtbot/2.0.3/'/>
-
+<child location='../requirements/testng/5.14.6.20110119_1050/'/>
<child location='../requirements/tptp/4.7/'/>
<child location='../requirements/webtools/3.2.3/'/>
<child location='../requirements/xulrunner-1.9.1.2/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-04-19 01:09:59 UTC (rev 30656)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-04-19 02:53:57 UTC (rev 30657)
@@ -7,9 +7,9 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1302291248000'/>
+<property name='p2.timestamp' value='1303164359000'/>
</properties>
-<children size='18'>
+<children size='20'>
<child location='../requirements/indigo/201103180900-M6/'/>
<child location='../requirements/birt/4.0M6/'/>
<child location='../requirements/eclipse/3.7M6/'/>
@@ -26,10 +26,12 @@
<child location='../requirements/m2eclipse/0.13.0.201103291237/'/>
<child location='../requirements/orbit/S20110124210048/'/>
<child location='../requirements/pmd/3.2.6/'/>
+<child location='../requirements/springide/2.6.0.201103161000/'/>
+
<child location='../requirements/subclipse/1.6/'/>
-
<child location='../requirements/subversive/0.7.9_2.2.2/'/>
<child location='../requirements/swtbot/2.0.4/'/>
+<child location='../requirements/testng/6.0.1.20110418_1444/'/>
<child location='../requirements/xulrunner-1.9.1.2/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-04-19 01:09:59 UTC (rev 30656)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-04-19 02:53:57 UTC (rev 30657)
@@ -7,9 +7,9 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1302291248000'/>
+<property name='p2.timestamp' value='1303164359000'/>
</properties>
-<children size='18'>
+<children size='20'>
<child location='../requirements/indigo/201103180900-M6/'/>
<child location='../requirements/birt/4.0M6/'/>
<child location='../requirements/eclipse/3.7M6/'/>
@@ -26,10 +26,12 @@
<child location='../requirements/m2eclipse/0.13.0.201103291237/'/>
<child location='../requirements/orbit/S20110124210048/'/>
<child location='../requirements/pmd/3.2.6/'/>
+<child location='../requirements/springide/2.6.0.201103161000/'/>
+
<child location='../requirements/subclipse/1.6/'/>
-
<child location='../requirements/subversive/0.7.9_2.2.2/'/>
<child location='../requirements/swtbot/2.0.4/'/>
+<child location='../requirements/testng/6.0.1.20110418_1444/'/>
<child location='../requirements/xulrunner-1.9.1.2/'/>
</children>
</repository>
Added: trunk/download.jboss.org/jbosstools/updates/requirements/springide/.gitig...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/springide/.gitig... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/springide/.gitig... 2011-04-19 02:53:57 UTC (rev 30657)
@@ -0,0 +1 @@
+2*
Added: trunk/download.jboss.org/jbosstools/updates/requirements/springide/build-...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/springide/build-... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/springide/build-... 2011-04-19 02:53:57 UTC (rev 30657)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/springide/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/springide/build.xml -Ddestination=/tmp/pmd-repo
+ -->
+ <target name="mirror">
+ <!-- Other URLs:
+ http://dist.springframework.org/release/IDE/
+ http://dist.springframework.org/snapshot/IDE/weekly/
+ http://dist.springsource.com/release/TOOLS/update/e3.6/
+ -->
+ <property name="URL" value="http://dist.springsource.com/release/TOOLS/update/e3.6/" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/springide/2.5.1.201011101000/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/2.5.1.201011101000/" name="springide plugins for Eclipse 3.6 - 3.7" />
+ <source>
+ <repository location="${URL}" />
+ </source>
+
+ <iu id="org.springframework.ide.eclipse.feature.feature.group" />
+ <iu id="org.springframework.ide.eclipse.aop.feature.feature.group" />
+ <iu id="org.springframework.ide.eclipse.osgi.feature.feature.group" />
+ <iu id="org.springframework.ide.eclipse.webflow.feature.feature.group" />
+ <iu id="org.springframework.ide.eclipse.batch.feature.feature.group" />
+ <iu id="org.springframework.ide.eclipse.integration.feature.feature.group" />
+ <iu id="org.springframework.ide.eclipse.security.feature.feature.group" />
+ <iu id="org.springframework.ide.eclipse.autowire.feature.feature.group" />
+
+ <slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" platformfilter="true" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/2.5.1.201011101000/" artifactRepository="file:${destination}/2.5.1.201011101000/" publishartifacts="true" source="${destination}/2.5.1.201011101000/" compress="${compress}" />
+ </target>
+</project>
Added: trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml 2011-04-19 02:53:57 UTC (rev 30657)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/springide/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/springide/build.xml -Ddestination=/tmp/pmd-repo
+ -->
+ <target name="mirror">
+ <!-- Other URLs:
+ http://dist.springframework.org/release/IDE/
+ http://dist.springframework.org/snapshot/IDE/weekly/
+ http://dist.springsource.com/release/TOOLS/update/e3.6/
+ -->
+ <property name="URL" value="http://dist.springsource.com/release/TOOLS/update/e3.6/" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/springide/2.6.0.201103160035/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/2.6.0.201103160035/" name="springide plugins for Eclipse 3.6 - 3.7" />
+ <source>
+ <repository location="${URL}" />
+ </source>
+
+ <iu id="org.springframework.ide.eclipse.feature.feature.group" />
+ <iu id="org.springframework.ide.eclipse.aop.feature.feature.group" />
+ <iu id="org.springframework.ide.eclipse.osgi.feature.feature.group" />
+ <iu id="org.springframework.ide.eclipse.webflow.feature.feature.group" />
+ <iu id="org.springframework.ide.eclipse.batch.feature.feature.group" />
+ <iu id="org.springframework.ide.eclipse.integration.feature.feature.group" />
+ <iu id="org.springframework.ide.eclipse.security.feature.feature.group" />
+ <iu id="org.springframework.ide.eclipse.autowire.feature.feature.group" />
+ <iu id="org.springframework.ide.eclipse.mylyn.feature.feature.group" />
+
+ <slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" platformfilter="true" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/2.6.0.201103160035/" artifactRepository="file:${destination}/2.6.0.201103160035/" publishartifacts="true" source="${destination}/2.6.0.201103160035/" compress="${compress}" />
+ </target>
+</project>
Added: trunk/download.jboss.org/jbosstools/updates/requirements/springide/index....
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/springide/index.... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/springide/index.... 2011-04-19 02:53:57 UTC (rev 30657)
@@ -0,0 +1,69 @@
+<html>
+<head>
+<title>JBoss Tools Build Requirements - springide Updates</title>
+<style>
+@import url("../../web/site.css");
+</style>
+</head>
+<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
+ cellspacing="0" cellpadding="0">
+ <tr>
+ <td colspan="2"><img
+ src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
+ </tr>
+ <tr>
+ <td>  </td>
+ </tr>
+ <tr>
+ <td>  </td>
+ <td>
+ <h2 class="title">JBoss Tools Build Requirements - springide Updates</h2>
+ <table width="100%">
+
+ <!-- <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText"></p>
+ </td>
+ </tr> -->
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <!-- <p class="bodyText"></p> -->
+
+<!-- to convert raw fish listing to links do this in vi
+
+:%s#^sftp://tools@filemgmt.jboss.org/downloads_htdocs/tools/updates/requirements/\(.\+\)$#<li><a class=link href=\1>\1<\/a></li>#g
+
+Then sftp file into
+
+tools(a)filemgmt.jboss.org/downloads_htdocs/tools/updates/requirements/
+
+which becomes
+
+http://download.jboss.org/jbosstools/updates/requirements/
+
+-->
+ <br/>
+ <ul>
+<li><a class=link href=2.6.0.201103161000>2.6.0.201103161000</a> </li>
+<li><a class=link href=2.5.1.201011101000>2.5.1.201011101000</a> </li>
+ </ul>
+ <br/>
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">Looking to download JBoss Tools? See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>. See also <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.</p>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+</html>
Added: trunk/download.jboss.org/jbosstools/updates/requirements/testng/.gitignore
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/testng/.gitignore (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/testng/.gitignore 2011-04-19 02:53:57 UTC (rev 30657)
@@ -0,0 +1,2 @@
+5*
+6*
Added: trunk/download.jboss.org/jbosstools/updates/requirements/testng/build-5.1...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/testng/build-5.1... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/testng/build-5.1... 2011-04-19 02:53:57 UTC (rev 30657)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/testng/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/testng/build.xml -Ddestination=/tmp/pmd-repo
+ -->
+ <target name="mirror">
+ <property name="URL" value="http://beust.com/eclipse/" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/testng/5.14.6.20110119_1050/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/5.14.6.20110119_1050/" name="testng plugins for Eclipse 3.6 - 3.7" />
+ <source>
+ <repository location="${URL}" />
+ </source>
+
+ <slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/5.14.6.20110119_1050/" artifactRepository="file:${destination}/5.14.6.20110119_1050/" publishartifacts="true" source="${destination}/5.14.6.20110119_1050/" compress="${compress}" />
+ </target>
+</project>
Added: trunk/download.jboss.org/jbosstools/updates/requirements/testng/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/testng/build.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/testng/build.xml 2011-04-19 02:53:57 UTC (rev 30657)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/testng/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/testng/build.xml -Ddestination=/tmp/pmd-repo
+ -->
+ <target name="mirror">
+ <property name="URL" value="http://beust.com/eclipse/" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/testng/6.0.1.20110418_1444/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/6.0.1.20110418_1444/" name="testng plugins for Eclipse 3.6 - 3.7" />
+ <source>
+ <repository location="${URL}" />
+ </source>
+
+ <slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/6.0.1.20110418_1444/" artifactRepository="file:${destination}/6.0.1.20110418_1444/" publishartifacts="true" source="${destination}/6.0.1.20110418_1444/" compress="${compress}" />
+ </target>
+</project>
Added: trunk/download.jboss.org/jbosstools/updates/requirements/testng/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/testng/index.html (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/testng/index.html 2011-04-19 02:53:57 UTC (rev 30657)
@@ -0,0 +1,69 @@
+<html>
+<head>
+<title>JBoss Tools Build Requirements - testng Updates</title>
+<style>
+@import url("../../web/site.css");
+</style>
+</head>
+<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
+ cellspacing="0" cellpadding="0">
+ <tr>
+ <td colspan="2"><img
+ src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
+ </tr>
+ <tr>
+ <td>  </td>
+ </tr>
+ <tr>
+ <td>  </td>
+ <td>
+ <h2 class="title">JBoss Tools Build Requirements - testng Updates</h2>
+ <table width="100%">
+
+ <!-- <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText"></p>
+ </td>
+ </tr> -->
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <!-- <p class="bodyText"></p> -->
+
+<!-- to convert raw fish listing to links do this in vi
+
+:%s#^sftp://tools@filemgmt.jboss.org/downloads_htdocs/tools/updates/requirements/\(.\+\)$#<li><a class=link href=\1>\1<\/a></li>#g
+
+Then sftp file into
+
+tools(a)filemgmt.jboss.org/downloads_htdocs/tools/updates/requirements/
+
+which becomes
+
+http://download.jboss.org/jbosstools/updates/requirements/
+
+-->
+ <br/>
+ <ul>
+<li><a class=link href=6.0.1.20110418_1444>6.0.1.20110418_1444</a> </li>
+<li><a class=link href=5.14.6.20110119_1050>5.14.6.20110119_1050</a> </li>
+ </ul>
+ <br/>
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">Looking to download JBoss Tools? See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>. See also <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.</p>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+</html>
14 years, 12 months
- 1
- 0
JBoss Tools SVN: r30656 - trunk/jst/plugins/org.jboss.tools.jst.web.kb.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-04-18 21:09:59 -0400 (Mon, 18 Apr 2011)
New Revision: 30656
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.properties
trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-8752
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.properties 2011-04-19 00:47:44 UTC (rev 30655)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.properties 2011-04-19 01:09:59 UTC (rev 30656)
@@ -3,5 +3,5 @@
Bundle-Name.0 = Web KB
# END NON-TRANSLATABLE
-KBProblemName=KB Problem
-KBBuilderProblemName=KB Builder Problem
\ No newline at end of file
+KBProblemName=EL Knowledge Base Problem
+KBBuilderProblemName=Knowledge Base Builder Problem
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2011-04-19 00:47:44 UTC (rev 30655)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2011-04-19 01:09:59 UTC (rev 30656)
@@ -9,7 +9,7 @@
<extension
id="kbbuilder"
- name="KB Builder"
+ name="JBoss Knowledge Base Builder"
point="org.eclipse.core.resources.builders">
<builder
hasNature="false">
14 years, 12 months
- 1
- 0
JBoss Tools SVN: r30655 - in branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink: xpl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-04-18 20:47:44 -0400 (Mon, 18 Apr 2011)
New Revision: 30655
Added:
branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/
branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/MultipleHyperlinkPresenter.java
Modified:
branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AlternativeInjectedPointListHyperlink.java
branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java
branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventListHyperlink.java
branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java
branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/MultipleHyperlinkPresenterManager.java
branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodListHyperlink.java
Log:
https://issues.jboss.org/browse/JBIDE-7971
Modified: branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AlternativeInjectedPointListHyperlink.java
===================================================================
--- branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AlternativeInjectedPointListHyperlink.java 2011-04-18 23:56:03 UTC (rev 30654)
+++ branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AlternativeInjectedPointListHyperlink.java 2011-04-19 00:47:44 UTC (rev 30655)
@@ -23,11 +23,13 @@
private IRegion region;
private List<IBean> beans;
private ITextViewer viewer;
+ private int previousIndex;
- public AlternativeInjectedPointListHyperlink(IRegion region, List<IBean> beans, ITextViewer viewer, IDocument document){
+ public AlternativeInjectedPointListHyperlink(IRegion region, List<IBean> beans, ITextViewer viewer, IDocument document, int previousIndex){
this.beans = beans;
this.region = region;
this.viewer = viewer;
+ this.previousIndex = previousIndex;
setDocument(document);
}
@@ -53,7 +55,7 @@
if(hyperlinks.length == 1){
((InjectedPointHyperlink)hyperlinks[0]).doHyperlink(region);
}else{
- MultipleHyperlinkPresenterManager.installAndShow(viewer, hyperlinks);
+ MultipleHyperlinkPresenterManager.installAndShow(viewer, hyperlinks, previousIndex);
}
}
Modified: branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java
===================================================================
--- branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java 2011-04-18 23:56:03 UTC (rev 30654)
+++ branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java 2011-04-19 00:47:44 UTC (rev 30655)
@@ -112,13 +112,13 @@
Set<IObserverMethod> observerMethods = cdiProject.resolveObserverMethods(injectionPoint);
if(observerMethods.size() > 0)
- hyperlinks.add(new ObserverMethodListHyperlink(textViewer, region, observerMethods, document));
+ hyperlinks.add(new ObserverMethodListHyperlink(textViewer, region, observerMethods, document, hyperlinks.size()));
} else if(param != null) {
Set<IInjectionPoint> events = cdiProject.findObservedEvents(param);
if(events.size() > 0)
- hyperlinks.add(new EventListHyperlink(textViewer, region, events, document));
+ hyperlinks.add(new EventListHyperlink(textViewer, region, events, document, hyperlinks.size()));
}
}
}
Modified: branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventListHyperlink.java
===================================================================
--- branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventListHyperlink.java 2011-04-18 23:56:03 UTC (rev 30654)
+++ branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventListHyperlink.java 2011-04-19 00:47:44 UTC (rev 30655)
@@ -24,11 +24,13 @@
private ITextViewer viewer;
private Set<IInjectionPoint> events;
private IRegion region;
+ private int previousIndex;
- public EventListHyperlink(ITextViewer viewer, IRegion region, Set<IInjectionPoint> events, IDocument document){
+ public EventListHyperlink(ITextViewer viewer, IRegion region, Set<IInjectionPoint> events, IDocument document, int previousIndex){
this.viewer = viewer;
this.events = events;
this.region = region;
+ this.previousIndex = previousIndex;
setDocument(document);
}
@@ -53,7 +55,7 @@
if(hyperlinks.length == 1){
((EventHyperlink)hyperlinks[0]).doHyperlink(region);
}else{
- MultipleHyperlinkPresenterManager.installAndShow(viewer, hyperlinks);
+ MultipleHyperlinkPresenterManager.installAndShow(viewer, hyperlinks, previousIndex);
}
}
Modified: branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java
===================================================================
--- branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2011-04-18 23:56:03 UTC (rev 30654)
+++ branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2011-04-19 00:47:44 UTC (rev 30655)
@@ -139,7 +139,7 @@
if(resultBeanList.size() > 0){
hyperlinks.add(new InjectedPointHyperlink(region, resultBeanList.get(0), document, true));
if(alternativeBeanList.size() > 1)
- hyperlinks.add(new AlternativeInjectedPointListHyperlink(region, alternativeBeanList, viewer, document));
+ hyperlinks.add(new AlternativeInjectedPointListHyperlink(region, alternativeBeanList, viewer, document, hyperlinks.size()));
}
}
}
Modified: branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/MultipleHyperlinkPresenterManager.java
===================================================================
--- branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/MultipleHyperlinkPresenterManager.java 2011-04-18 23:56:03 UTC (rev 30654)
+++ branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/MultipleHyperlinkPresenterManager.java 2011-04-19 00:47:44 UTC (rev 30655)
@@ -12,23 +12,23 @@
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.jface.text.hyperlink.MultipleHyperlinkPresenter;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.ui.IPartListener;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.cdi.text.ext.hyperlink.xpl.MultipleHyperlinkPresenter;
public class MultipleHyperlinkPresenterManager {
private static MultipleHyperlinkPresenter mhp = new MultipleHyperlinkPresenter(new RGB(0, 0, 255));
private static boolean installed = false;
private static MyPartListener listener = new MyPartListener();
- public static void installAndShow(ITextViewer viewer, IHyperlink[] hyperlinks){
+ public static void installAndShow(ITextViewer viewer, IHyperlink[] hyperlinks, int previousIndex){
if(installed)
uninstall();
mhp.install(viewer);
- mhp.showHyperlinks(hyperlinks);
+ mhp.showHyperlinks(hyperlinks, previousIndex);
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService().addPartListener(listener);
installed = true;
}
Modified: branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodListHyperlink.java
===================================================================
--- branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodListHyperlink.java 2011-04-18 23:56:03 UTC (rev 30654)
+++ branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodListHyperlink.java 2011-04-19 00:47:44 UTC (rev 30655)
@@ -24,11 +24,13 @@
private ITextViewer viewer;
private Set<IObserverMethod> observerMethods;
private IRegion region;
+ private int previousIndex;
- public ObserverMethodListHyperlink(ITextViewer viewer, IRegion region, Set<IObserverMethod> observerMethods, IDocument document){
+ public ObserverMethodListHyperlink(ITextViewer viewer, IRegion region, Set<IObserverMethod> observerMethods, IDocument document, int previousIndex){
this.viewer = viewer;
this.observerMethods = observerMethods;
this.region = region;
+ this.previousIndex = previousIndex;
setDocument(document);
}
@@ -53,7 +55,7 @@
if(hyperlinks.length == 1){
((ObserverMethodHyperlink)hyperlinks[0]).doHyperlink(region);
}else{
- MultipleHyperlinkPresenterManager.installAndShow(viewer, hyperlinks);
+ MultipleHyperlinkPresenterManager.installAndShow(viewer, hyperlinks, previousIndex);
}
}
Added: branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/MultipleHyperlinkPresenter.java
===================================================================
--- branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/MultipleHyperlinkPresenter.java (rev 0)
+++ branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/MultipleHyperlinkPresenter.java 2011-04-19 00:47:44 UTC (rev 30655)
@@ -0,0 +1,812 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * IBM Corporation - initial API and implementation
+ * Exadel, Inc.
+ * Red Hat, Inc.
+ *******************************************************************************/
+package org.jboss.tools.cdi.text.ext.hyperlink.xpl;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.text.AbstractInformationControl;
+import org.eclipse.jface.text.AbstractInformationControlManager;
+import org.eclipse.jface.text.IInformationControl;
+import org.eclipse.jface.text.IInformationControlCreator;
+import org.eclipse.jface.text.IInformationControlExtension2;
+import org.eclipse.jface.text.IInformationControlExtension3;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.ITextHoverExtension;
+import org.eclipse.jface.text.ITextHoverExtension2;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.IWidgetTokenKeeper;
+import org.eclipse.jface.text.IWidgetTokenKeeperExtension;
+import org.eclipse.jface.text.IWidgetTokenOwner;
+import org.eclipse.jface.text.IWidgetTokenOwnerExtension;
+import org.eclipse.jface.text.JFaceTextUtil;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.jface.util.Geometry;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.events.MouseMoveListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.ShellAdapter;
+import org.eclipse.swt.events.ShellEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableItem;
+
+public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter {
+
+ private static final boolean IS_WIN32= "win32".equals(SWT.getPlatform()); //$NON-NLS-1$
+
+ /**
+ * An information control capable of showing a list of hyperlinks. The hyperlinks can be opened.
+ */
+ private static class LinkListInformationControl extends AbstractInformationControl implements IInformationControlExtension2 {
+
+ private static final class LinkContentProvider implements IStructuredContentProvider {
+
+ /*
+ * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+ */
+ public Object[] getElements(Object inputElement) {
+ return (Object[]) inputElement;
+ }
+
+ /*
+ * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+ */
+ public void dispose() {
+ }
+
+ /*
+ * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+ */
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ }
+ }
+
+ private static final class LinkLabelProvider extends ColumnLabelProvider {
+ /*
+ * @see org.eclipse.jface.viewers.ColumnLabelProvider#getText(java.lang.Object)
+ */
+ public String getText(Object element) {
+ IHyperlink link= (IHyperlink)element;
+ String text= link.getHyperlinkText();
+ if (text != null)
+ return text;
+ return "Unknown Link";
+ }
+ }
+
+ private final MultipleHyperlinkHoverManager fManager;
+
+ private IHyperlink[] fInput;
+ private Composite fParent;
+ private Table fTable;
+
+ private Color fForegroundColor;
+ private Color fBackgroundColor;
+
+
+ /**
+ * Creates a link list information control with the given shell as parent.
+ *
+ * @param parentShell the parent shell
+ * @param manager the hover manager
+ * @param foregroundColor the foreground color, must not be disposed
+ * @param backgroundColor the background color, must not be disposed
+ */
+ public LinkListInformationControl(Shell parentShell, MultipleHyperlinkHoverManager manager, Color foregroundColor, Color backgroundColor) {
+ super(parentShell, false);
+ fManager= manager;
+ fForegroundColor= foregroundColor;
+ fBackgroundColor= backgroundColor;
+ create();
+ }
+
+ /*
+ * @see org.eclipse.jface.text.IInformationControl#setInformation(java.lang.String)
+ */
+ public void setInformation(String information) {
+ //replaced by IInformationControlExtension2#setInput(java.lang.Object)
+ }
+
+ /*
+ * @see org.eclipse.jface.text.IInformationControlExtension2#setInput(java.lang.Object)
+ */
+ public void setInput(Object input) {
+ fInput= (IHyperlink[]) input;
+ deferredCreateContent(fParent);
+ }
+
+ /*
+ * @see org.eclipse.jface.text.AbstractInformationControl#createContent(org.eclipse.swt.widgets.Composite)
+ */
+ protected void createContent(Composite parent) {
+ fParent= parent;
+ if (IS_WIN32) {
+ GridLayout layout= new GridLayout();
+ layout.marginWidth= 0;
+ layout.marginRight= 4;
+ fParent.setLayout(layout);
+ }
+ fParent.setForeground(fForegroundColor);
+ fParent.setBackground(fBackgroundColor);
+ }
+
+ /*
+ * @see org.eclipse.jface.text.AbstractInformationControl#computeSizeHint()
+ */
+ public Point computeSizeHint() {
+ Point preferedSize= getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
+
+ Point constraints= getSizeConstraints();
+ if (constraints == null)
+ return preferedSize;
+
+ if (fTable.getVerticalBar() == null || fTable.getHorizontalBar() == null)
+ return Geometry.min(constraints, preferedSize);
+
+ int scrollBarWidth= fTable.getVerticalBar().getSize().x;
+ int scrollBarHeight= fTable.getHorizontalBar().getSize().y;
+
+ int width;
+ if (preferedSize.y - scrollBarHeight <= constraints.y) {
+ width= preferedSize.x - scrollBarWidth;
+ fTable.getVerticalBar().setVisible(false);
+ } else {
+ width= Math.min(preferedSize.x, constraints.x);
+ }
+
+ int height;
+ if (preferedSize.x - scrollBarWidth <= constraints.x) {
+ height= preferedSize.y - scrollBarHeight;
+ fTable.getHorizontalBar().setVisible(false);
+ } else {
+ height= Math.min(preferedSize.y, constraints.y);
+ }
+
+ return new Point(width, height);
+ }
+
+ private void deferredCreateContent(Composite parent) {
+ fTable= new Table(parent, SWT.SINGLE | SWT.FULL_SELECTION);
+ fTable.setLinesVisible(false);
+ fTable.setHeaderVisible(false);
+ fTable.setForeground(fForegroundColor);
+ fTable.setBackground(fBackgroundColor);
+ fTable.setFont(JFaceResources.getDialogFont());
+
+ if (IS_WIN32) {
+ GridData data= new GridData(SWT.BEGINNING, SWT.BEGINNING, true, true);
+ fTable.setLayoutData(data);
+ }
+
+ final TableViewer viewer= new TableViewer(fTable);
+ viewer.setContentProvider(new LinkContentProvider());
+ viewer.setLabelProvider(new LinkLabelProvider());
+ viewer.setInput(fInput);
+ fTable.setSelection(0);
+
+ registerTableListeners();
+
+ getShell().addShellListener(new ShellAdapter() {
+
+ /*
+ * @see org.eclipse.swt.events.ShellAdapter#shellActivated(org.eclipse.swt.events.ShellEvent)
+ */
+ public void shellActivated(ShellEvent e) {
+ if (viewer.getTable().getSelectionCount() == 0) {
+ viewer.getTable().setSelection(0);
+ }
+
+ viewer.getTable().setFocus();
+ }
+ });
+ }
+
+ private void registerTableListeners() {
+
+ fTable.addMouseMoveListener(new MouseMoveListener() {
+ TableItem fLastItem= null;
+
+ public void mouseMove(MouseEvent e) {
+ if (fTable.equals(e.getSource())) {
+ Object o= fTable.getItem(new Point(e.x, e.y));
+ if (o instanceof TableItem) {
+ TableItem item= (TableItem) o;
+ if (!o.equals(fLastItem)) {
+ fLastItem= (TableItem) o;
+ fTable.setSelection(new TableItem[] { fLastItem });
+ } else if (e.y < fTable.getItemHeight() / 4) {
+ // Scroll up
+ int index= fTable.indexOf(item);
+ if (index > 0) {
+ fLastItem= fTable.getItem(index - 1);
+ fTable.setSelection(new TableItem[] { fLastItem });
+ }
+ } else if (e.y > fTable.getBounds().height - fTable.getItemHeight() / 4) {
+ // Scroll down
+ int index= fTable.indexOf(item);
+ if (index < fTable.getItemCount() - 1) {
+ fLastItem= fTable.getItem(index + 1);
+ fTable.setSelection(new TableItem[] { fLastItem });
+ }
+ }
+ }
+ }
+ }
+ });
+
+ fTable.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ openSelectedLink();
+ }
+ });
+
+ fTable.addMouseListener(new MouseAdapter() {
+ public void mouseUp(MouseEvent e) {
+ if (fTable.getSelectionCount() < 1)
+ return;
+
+ if (e.button != 1)
+ return;
+
+ if (fTable.equals(e.getSource())) {
+ Object o= fTable.getItem(new Point(e.x, e.y));
+ TableItem selection= fTable.getSelection()[0];
+ if (selection.equals(o))
+ openSelectedLink();
+ }
+ }
+ });
+
+ fTable.addKeyListener(new KeyAdapter() {
+ public void keyPressed(KeyEvent e) {
+ if (e.keyCode == 0x0D) // return
+ openSelectedLink();
+ }
+ });
+ }
+
+ /*
+ * @see org.eclipse.jface.text.IInformationControlExtension#hasContents()
+ */
+ public boolean hasContents() {
+ return true;
+ }
+
+ /**
+ * Opens the currently selected link.
+ */
+ private void openSelectedLink() {
+ if (fTable.getSelectionCount() < 1)
+ return;
+
+ TableItem selection= fTable.getSelection()[0];
+ IHyperlink link= (IHyperlink)selection.getData();
+ fManager.hideInformationControl();
+ fManager.setCaret();
+ link.open();
+ }
+ }
+
+ private class MultipleHyperlinkHover implements ITextHover, ITextHoverExtension, ITextHoverExtension2 {
+
+ /**
+ * @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
+ * @deprecated As of 3.4, replaced by
+ * {@link ITextHoverExtension2#getHoverInfo2(ITextViewer, IRegion)}
+ */
+ public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
+ return null;
+ }
+
+ /*
+ * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer, int)
+ */
+ public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
+ return fSubjectRegion;
+ }
+
+ /*
+ * @see org.eclipse.jface.text.ITextHoverExtension2#getHoverInfo2(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
+ */
+ public Object getHoverInfo2(ITextViewer textViewer, IRegion hoverRegion) {
+ return fHyperlinks;
+ }
+
+ /*
+ * @see org.eclipse.jface.text.ITextHoverExtension#getHoverControlCreator()
+ */
+ public IInformationControlCreator getHoverControlCreator() {
+ return new IInformationControlCreator() {
+ public IInformationControl createInformationControl(Shell parent) {
+ Color foregroundColor= fTextViewer.getTextWidget().getForeground();
+ Color backgroundColor= fTextViewer.getTextWidget().getBackground();
+ return new LinkListInformationControl(parent, fManager, foregroundColor, backgroundColor);
+ }
+ };
+ }
+ }
+
+ private static class MultipleHyperlinkHoverManager extends AbstractInformationControlManager implements IWidgetTokenKeeper, IWidgetTokenKeeperExtension {
+
+ private class Closer implements IInformationControlCloser, Listener, KeyListener, MouseListener {
+
+ private Control fSubjectControl;
+ private Display fDisplay;
+ private IInformationControl fControl;
+ private Rectangle fSubjectArea;
+
+ /*
+ * @see org.eclipse.jface.text.AbstractInformationControlManager.IInformationControlCloser#setInformationControl(org.eclipse.jface.text.IInformationControl)
+ */
+ public void setInformationControl(IInformationControl control) {
+ fControl= control;
+ }
+
+ /*
+ * @see org.eclipse.jface.text.AbstractInformationControlManager.IInformationControlCloser#setSubjectControl(org.eclipse.swt.widgets.Control)
+ */
+ public void setSubjectControl(Control subject) {
+ fSubjectControl= subject;
+ }
+
+ /*
+ * @see org.eclipse.jface.text.AbstractInformationControlManager.IInformationControlCloser#start(org.eclipse.swt.graphics.Rectangle)
+ */
+ public void start(Rectangle subjectArea) {
+ fSubjectArea= subjectArea;
+
+ fDisplay= fSubjectControl.getDisplay();
+ if (!fDisplay.isDisposed()) {
+ fDisplay.addFilter(SWT.FocusOut, this);
+ fDisplay.addFilter(SWT.MouseMove, this);
+ fTextViewer.getTextWidget().addKeyListener(this);
+ fTextViewer.getTextWidget().addMouseListener(this);
+ }
+ }
+
+ /*
+ * @see org.eclipse.jface.text.AbstractInformationControlManager.IInformationControlCloser#stop()
+ */
+ public void stop() {
+ if (fDisplay != null && !fDisplay.isDisposed()) {
+ fDisplay.removeFilter(SWT.FocusOut, this);
+ fDisplay.removeFilter(SWT.MouseMove, this);
+ fTextViewer.getTextWidget().removeKeyListener(this);
+ fTextViewer.getTextWidget().removeMouseListener(this);
+ }
+
+ fSubjectArea= null;
+ }
+
+ /*
+ * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
+ */
+ public void handleEvent(Event event) {
+ switch (event.type) {
+ case SWT.FocusOut:
+ if (!fControl.isFocusControl())
+ disposeInformationControl();
+ break;
+ case SWT.MouseMove:
+ handleMouseMove(event);
+ break;
+ }
+ }
+
+ /**
+ * Handle mouse movement events.
+ *
+ * @param event the event
+ */
+ private void handleMouseMove(Event event) {
+ if (!(event.widget instanceof Control))
+ return;
+
+ if (fControl.isFocusControl())
+ return;
+
+ Control eventControl= (Control) event.widget;
+
+ //transform coordinates to subject control:
+ Point mouseLoc= event.display.map(eventControl, fSubjectControl, event.x, event.y);
+
+ if (fSubjectArea.contains(mouseLoc))
+ return;
+
+ if (inKeepUpZone(mouseLoc.x, mouseLoc.y, ((IInformationControlExtension3) fControl).getBounds()))
+ return;
+
+ hideInformationControl();
+ }
+
+ /**
+ * Tests whether a given mouse location is within the keep-up zone.
+ * The hover should not be hidden as long as the mouse stays inside this zone.
+ *
+ * @param x the x coordinate, relative to the <em>subject control</em>
+ * @param y the y coordinate, relative to the <em>subject control</em>
+ * @param controlBounds the bounds of the current control
+ *
+ * @return <code>true</code> iff the mouse event occurred in the keep-up zone
+ */
+ private boolean inKeepUpZone(int x, int y, Rectangle controlBounds) {
+ // +-----------+
+ // |subjectArea|
+ // +-----------+
+ // |also keepUp|
+ // ++-----------+-------+
+ // | totalBounds |
+ // +--------------------+
+ if (fSubjectArea.contains(x, y))
+ return true;
+
+ Rectangle iControlBounds= fSubjectControl.getDisplay().map(null, fSubjectControl, controlBounds);
+ Rectangle totalBounds= Geometry.copy(iControlBounds);
+ if (totalBounds.contains(x, y))
+ return true;
+
+ int keepUpY= fSubjectArea.y + fSubjectArea.height;
+ Rectangle alsoKeepUp= new Rectangle(fSubjectArea.x, keepUpY, fSubjectArea.width, totalBounds.y - keepUpY);
+ return alsoKeepUp.contains(x, y);
+ }
+
+ /*
+ * @see org.eclipse.swt.events.KeyListener#keyPressed(org.eclipse.swt.events.KeyEvent)
+ */
+ public void keyPressed(KeyEvent e) {
+ }
+
+ /*
+ * @see org.eclipse.swt.events.KeyListener#keyReleased(org.eclipse.swt.events.KeyEvent)
+ */
+ public void keyReleased(KeyEvent e) {
+ hideInformationControl();
+ }
+
+ /*
+ * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent)
+ * @since 3.5
+ */
+ public void mouseDoubleClick(MouseEvent e) {
+ }
+
+ /*
+ * @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent)
+ * @since 3.5
+ */
+ public void mouseDown(MouseEvent e) {
+ }
+
+ /*
+ * @see org.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent)
+ * @since 3.5
+ */
+ public void mouseUp(MouseEvent e) {
+ hideInformationControl();
+ }
+
+ }
+
+ /**
+ * Priority of the hover managed by this manager.
+ * Default value: One higher then for the hovers
+ * managed by TextViewerHoverManager.
+ */
+ private static final int WIDGET_TOKEN_PRIORITY= 1;
+
+ private final MultipleHyperlinkHover fHover;
+ private final ITextViewer fTextViewer;
+ private final MultipleHyperlinkPresenter fHyperlinkPresenter;
+ private Closer fCloser;
+ private boolean fIsControlVisible;
+
+
+ /**
+ * Create a new MultipleHyperlinkHoverManager. The MHHM can show and hide
+ * the given MultipleHyperlinkHover inside the given ITextViewer.
+ *
+ * @param hover the hover to manage
+ * @param viewer the viewer to show the hover in
+ * @param hyperlinkPresenter the hyperlink presenter using this manager to present hyperlinks
+ */
+ public MultipleHyperlinkHoverManager(MultipleHyperlinkHover hover, ITextViewer viewer, MultipleHyperlinkPresenter hyperlinkPresenter) {
+ super(hover.getHoverControlCreator());
+
+ fHover= hover;
+ fTextViewer= viewer;
+ fHyperlinkPresenter= hyperlinkPresenter;
+
+ fCloser= new Closer();
+ setCloser(fCloser);
+ fIsControlVisible= false;
+ }
+
+ /*
+ * @see org.eclipse.jface.text.AbstractInformationControlManager#computeInformation()
+ */
+ protected void computeInformation() {
+ IRegion region= fHover.getHoverRegion(fTextViewer, -1);
+ if (region == null) {
+ setInformation(null, null);
+ return;
+ }
+
+ Rectangle area= JFaceTextUtil.computeArea(region, fTextViewer);
+ if (area == null || area.isEmpty()) {
+ setInformation(null, null);
+ return;
+ }
+
+ Object information= fHover.getHoverInfo2(fTextViewer, region);
+ setCustomInformationControlCreator(fHover.getHoverControlCreator());
+ setInformation(information, area);
+ }
+
+ /*
+ * @see org.eclipse.jface.text.AbstractInformationControlManager#computeInformationControlLocation(org.eclipse.swt.graphics.Rectangle, org.eclipse.swt.graphics.Point)
+ */
+ protected Point computeInformationControlLocation(Rectangle subjectArea, Point controlSize) {
+ Point result= super.computeInformationControlLocation(subjectArea, controlSize);
+
+ Point cursorLocation= fTextViewer.getTextWidget().getDisplay().getCursorLocation();
+ if (cursorLocation.x <= result.x + controlSize.x)
+ return result;
+
+ result.x= cursorLocation.x + 20 - controlSize.x;
+ return result;
+ }
+
+ /*
+ * @see org.eclipse.jface.text.AbstractInformationControlManager#showInformationControl(org.eclipse.swt.graphics.Rectangle)
+ */
+ protected void showInformationControl(Rectangle subjectArea) {
+ int offset = fTextViewer.getTextWidget().getLineHeight()*(index+1);
+ Rectangle bounds = ((IInformationControlExtension3)fInformationControl).getBounds();
+ Point location = new Point(bounds.x, bounds.y+offset);
+ fInformationControl.setLocation(location);
+ if (fTextViewer instanceof IWidgetTokenOwnerExtension) {
+ if (((IWidgetTokenOwnerExtension) fTextViewer).requestWidgetToken(this, WIDGET_TOKEN_PRIORITY))
+ super.showInformationControl(subjectArea);
+ } else if (fTextViewer instanceof IWidgetTokenOwner) {
+ if (((IWidgetTokenOwner) fTextViewer).requestWidgetToken(this))
+ super.showInformationControl(subjectArea);
+ } else {
+ super.showInformationControl(subjectArea);
+ }
+
+ fIsControlVisible= true;
+ }
+
+ /**
+ * Sets the caret where hyperlinking got initiated.
+ *
+ * @since 3.5
+ */
+ private void setCaret() {
+ fHyperlinkPresenter.setCaret();
+ }
+
+ /*
+ * @see org.eclipse.jface.text.AbstractInformationControlManager#hideInformationControl()
+ */
+ protected void hideInformationControl() {
+ super.hideInformationControl();
+
+ if (fTextViewer instanceof IWidgetTokenOwner) {
+ ((IWidgetTokenOwner) fTextViewer).releaseWidgetToken(this);
+ }
+
+ fIsControlVisible= false;
+ fHyperlinkPresenter.hideHyperlinks();
+ }
+
+ /*
+ * @see org.eclipse.jface.text.AbstractInformationControlManager#disposeInformationControl()
+ */
+ public void disposeInformationControl() {
+ super.disposeInformationControl();
+
+ if (fTextViewer instanceof IWidgetTokenOwner) {
+ ((IWidgetTokenOwner) fTextViewer).releaseWidgetToken(this);
+ }
+
+ fIsControlVisible= false;
+ fHyperlinkPresenter.hideHyperlinks();
+ }
+
+ /*
+ * @see org.eclipse.jface.text.IWidgetTokenKeeper#requestWidgetToken(org.eclipse.jface.text.IWidgetTokenOwner)
+ */
+ public boolean requestWidgetToken(IWidgetTokenOwner owner) {
+ hideInformationControl();
+ return true;
+ }
+
+ /*
+ * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#requestWidgetToken(org.eclipse.jface.text.IWidgetTokenOwner, int)
+ */
+ public boolean requestWidgetToken(IWidgetTokenOwner owner, int priority) {
+ if (priority < WIDGET_TOKEN_PRIORITY)
+ return false;
+
+ hideInformationControl();
+ return true;
+ }
+
+ /*
+ * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#setFocus(org.eclipse.jface.text.IWidgetTokenOwner)
+ */
+ public boolean setFocus(IWidgetTokenOwner owner) {
+ return false;
+ }
+
+ /**
+ * Returns <code>true</code> if the information control managed by
+ * this manager is visible, <code>false</code> otherwise.
+ *
+ * @return <code>true</code> if information control is visible
+ */
+ public boolean isInformationControlVisible() {
+ return fIsControlVisible;
+ }
+ }
+
+ private ITextViewer fTextViewer;
+
+ private IHyperlink[] fHyperlinks;
+ private Region fSubjectRegion;
+ private MultipleHyperlinkHoverManager fManager;
+
+ /**
+ * The offset in the text viewer where hyperlinking got initiated.
+ * @since 3.5
+ */
+ private int fCursorOffset;
+
+ /**
+ * Creates a new multiple hyperlink presenter which uses
+ * {@link #HYPERLINK_COLOR} to read the color from the given preference store.
+ *
+ * @param store the preference store
+ */
+ public MultipleHyperlinkPresenter(IPreferenceStore store) {
+ super(store);
+ }
+
+ /**
+ * Creates a new multiple hyperlink presenter.
+ *
+ * @param color the hyperlink color, to be disposed by the caller
+ */
+ public MultipleHyperlinkPresenter(RGB color) {
+ super(color);
+ }
+
+ /*
+ * @see org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter#install(org.eclipse.jface.text.ITextViewer)
+ */
+ public void install(ITextViewer viewer) {
+ super.install(viewer);
+ fTextViewer= viewer;
+
+ fManager= new MultipleHyperlinkHoverManager(new MultipleHyperlinkHover(), fTextViewer, this);
+ fManager.install(viewer.getTextWidget());
+ fManager.setSizeConstraints(100, 12, false, true);
+ }
+
+ /*
+ * @see org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter#uninstall()
+ */
+ public void uninstall() {
+ super.uninstall();
+
+ if (fTextViewer != null) {
+ fManager.dispose();
+
+ fTextViewer= null;
+ }
+ }
+
+ /*
+ * @see org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter#canShowMultipleHyperlinks()
+ */
+ public boolean canShowMultipleHyperlinks() {
+ return true;
+ }
+
+ /*
+ * @see org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter#canHideHyperlinks()
+ */
+ public boolean canHideHyperlinks() {
+ return !fManager.isInformationControlVisible();
+ }
+
+ /*
+ * @see org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter#hideHyperlinks()
+ */
+ public void hideHyperlinks() {
+ super.hideHyperlinks();
+ fHyperlinks= null;
+ }
+
+ private static int index=0;
+
+ /*
+ * @see org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter#showHyperlinks(org.eclipse.jface.text.hyperlink.IHyperlink[])
+ */
+ public void showHyperlinks(IHyperlink[] hyperlinks, int index) {
+ super.showHyperlinks(new IHyperlink[] { hyperlinks[0] });
+
+ this.index = index;
+
+ fSubjectRegion= null;
+ fHyperlinks= hyperlinks;
+
+ if (hyperlinks.length == 1)
+ return;
+
+ int start= hyperlinks[0].getHyperlinkRegion().getOffset();
+ int end= start + hyperlinks[0].getHyperlinkRegion().getLength();
+
+ for (int i= 1; i < hyperlinks.length; i++) {
+ int hstart= hyperlinks[i].getHyperlinkRegion().getOffset();
+ int hend= hstart + hyperlinks[i].getHyperlinkRegion().getLength();
+
+ start= Math.min(start, hstart);
+ end= Math.max(end, hend);
+ }
+
+ fSubjectRegion= new Region(start, end - start);
+ fCursorOffset= JFaceTextUtil.getOffsetForCursorLocation(fTextViewer);
+
+ fManager.showInformation();
+ }
+
+ /**
+ * Sets the caret where hyperlinking got initiated.
+ *
+ * @since 3.5
+ */
+ private void setCaret() {
+ Point selectedRange= fTextViewer.getSelectedRange();
+ if (fCursorOffset != -1 && !(fSubjectRegion.getOffset() <= selectedRange.x && selectedRange.x + selectedRange.y <= fSubjectRegion.getOffset() + fSubjectRegion.getLength()))
+ fTextViewer.setSelectedRange(fCursorOffset, 0);
+ }
+
+
+}
Property changes on: branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/MultipleHyperlinkPresenter.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 12 months
- 1
- 0
JBoss Tools SVN: r30654 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-04-18 19:56:03 -0400 (Mon, 18 Apr 2011)
New Revision: 30654
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/CDISearchParticipantTest.java
Log:
https://issues.jboss.org/browse/JBIDE-8705, https://issues.jboss.org/browse/JBIDE-8704
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/CDISearchParticipantTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/CDISearchParticipantTest.java 2011-04-18 23:30:39 UTC (rev 30653)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/CDISearchParticipantTest.java 2011-04-18 23:56:03 UTC (rev 30654)
@@ -172,6 +172,17 @@
testSearchParticipant("JavaSource/org/jboss/jsr299/tck/tests/event/bindingTypes/EventEmitter.java", FIELD_SEARCH, "stringEvent", "", new InjectionPointQueryParticipant(), matches);
}
+ public void testInjectionPointQueryParticipant4(){
+ ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>();
+
+ matches.add(new MatchStructure(InjectionPointField.class, "EventEmitter.stringEvent"));
+ matches.add(new MatchStructure(InjectionPointField.class, "EventEmitter.stringEventWithAnyAndNonRuntimeBindingType"));
+ matches.add(new MatchStructure(InjectionPointField.class, "EventEmitter.stringEventWithOnlyNonRuntimeBindingType"));
+ matches.add(new MatchStructure(InjectionPointField.class, "OwlFinch_Broken.simpleEvent"));
+
+ testSearchParticipant("JavaSource/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/GoldenRetriever.java", METHOD_SEARCH, "anObserverMethod", "", new InjectionPointQueryParticipant(), matches);
+ }
+
public void testCDIBeanQueryParticipant(){
ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>();
14 years, 12 months
- 1
- 0
JBoss Tools SVN: r30653 - in trunk/cdi/tests/org.jboss.tools.cdi.ui.test: src/org/jboss/tools/cdi/ui/test/search and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-04-18 19:30:39 -0400 (Mon, 18 Apr 2011)
New Revision: 30653
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/CDISearchParticipantTest.java
Log:
https://issues.jboss.org/browse/JBIDE-8705, https://issues.jboss.org/browse/JBIDE-8704
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF 2011-04-18 23:13:51 UTC (rev 30652)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF 2011-04-18 23:30:39 UTC (rev 30653)
@@ -24,5 +24,6 @@
org.eclipse.ui.ide,
org.jboss.tools.jst.jsp.base.test,
org.eclipse.ltk.core.refactoring,
- org.eclipse.search;bundle-version="3.7.0"
+ org.eclipse.search;bundle-version="3.7.0",
+ org.jboss.tools.common.el.core;bundle-version="3.3.0"
Export-Package: org.jboss.tools.cdi.ui.test
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/CDISearchParticipantTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/CDISearchParticipantTest.java 2011-04-18 23:13:51 UTC (rev 30652)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/CDISearchParticipantTest.java 2011-04-18 23:30:39 UTC (rev 30653)
@@ -23,8 +23,10 @@
import org.jboss.tools.cdi.core.ICDIElement;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
import org.jboss.tools.cdi.internal.core.impl.ClassBean;
+import org.jboss.tools.cdi.internal.core.impl.EventBean;
import org.jboss.tools.cdi.internal.core.impl.InjectionPointField;
import org.jboss.tools.cdi.internal.core.impl.InjectionPointParameter;
+import org.jboss.tools.cdi.internal.core.impl.ObserverMethod;
import org.jboss.tools.cdi.ui.marker.MarkerResolutionUtils;
import org.jboss.tools.cdi.ui.search.CDIBeanQueryParticipant;
import org.jboss.tools.cdi.ui.search.CDIMatch;
@@ -148,6 +150,28 @@
testSearchParticipant("JavaSource/org/jboss/jsr299/tck/tests/lookup/injectionpoint/ConstructorInjectionPointBean.java", PARAMETER_SEARCH, "ConstructorInjectionPointBean", "injectedBean", new InjectionPointQueryParticipant(), matches);
}
+ public void testInjectionPointQueryParticipant3(){
+ ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>();
+
+ matches.add(new MatchStructure(EventBean.class, "Event"));
+
+ matches.add(new MatchStructure(ObserverMethod.class, "DiscerningObserver.observeAny()"));
+ matches.add(new MatchStructure(ObserverMethod.class, "EventTypeFamilyObserver.observeObject()"));
+ matches.add(new MatchStructure(ObserverMethod.class, "Fox.observeEvent()"));
+ matches.add(new MatchStructure(ObserverMethod.class, "GoldenRetriever.anObserverMethod()"));
+ matches.add(new MatchStructure(ObserverMethod.class, "Pomeranian.observeStringEvent()"));
+ matches.add(new MatchStructure(ObserverMethod.class, "StringObserver.anotherObserver()"));
+ matches.add(new MatchStructure(ObserverMethod.class, "TeaCupPomeranian.observeSimpleEvent()"));
+ matches.add(new MatchStructure(ObserverMethod.class, "Terrier.observer()"));
+ matches.add(new MatchStructure(ObserverMethod.class, "TibetanTerrier_Broken.observeSomeEvent()"));
+ matches.add(new MatchStructure(ObserverMethod.class, "TibetanTerrier_BrokenNoInterface.observeSomeEvent()"));
+ matches.add(new MatchStructure(ObserverMethod.class, "ClassFragmentLogger.addEntry()"));
+ matches.add(new MatchStructure(ObserverMethod.class, "ObserverMethodInInterceptorBroken.observeSomeEvent()"));
+ matches.add(new MatchStructure(ObserverMethod.class, "ObserverMethodInDecoratorBroken.observeSomeEvent()"));
+
+ testSearchParticipant("JavaSource/org/jboss/jsr299/tck/tests/event/bindingTypes/EventEmitter.java", FIELD_SEARCH, "stringEvent", "", new InjectionPointQueryParticipant(), matches);
+ }
+
public void testCDIBeanQueryParticipant(){
ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>();
14 years, 12 months
- 1
- 0