JBoss Tools SVN: r33284 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb: META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-27 20:19:59 -0400 (Wed, 27 Jul 2011)
New Revision: 33284
Added:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/KBSettingsPreferencePage.java
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.properties
trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.properties
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/WebKbPlugin.java
Log:
JBIDE-9120
https://issues.jboss.org/browse/JBIDE-9120
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2011-07-28 00:19:44 UTC (rev 33283)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2011-07-28 00:19:59 UTC (rev 33284)
@@ -25,6 +25,7 @@
org.eclipse.wst.css.core;bundle-version="1.1.500",
org.eclipse.wst.html.core;bundle-version="1.1.500",
org.jboss.tools.common.el.ui,
+ org.jboss.tools.common.ui,
org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200",
org.eclipse.jst.j2ee;bundle-version="1.1.500"
Bundle-ActivationPolicy: lazy
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.properties 2011-07-28 00:19:44 UTC (rev 33283)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.properties 2011-07-28 00:19:59 UTC (rev 33284)
@@ -7,4 +7,5 @@
KBBuilderProblemName=Knowledge Base Builder Problem
BuilderOrderProblemName=Builders Order Problem
-ELValidator=EL Validator
\ No newline at end of file
+ELValidator=EL Validator
+PreferencePage_KBSettings=JBoss Tools Knowledge Base
\ 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-07-28 00:19:44 UTC (rev 33283)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2011-07-28 00:19:59 UTC (rev 33284)
@@ -291,4 +291,18 @@
</javaCompletionProposalComputer>
</extension>
+ <extension
+ point="org.eclipse.ui.propertyPages">
+ <page
+ name="%PreferencePage_KBSettings"
+ class="org.jboss.tools.jst.web.kb.preferences.KBSettingsPreferencePage"
+ id="org.jboss.tools.jst.web.kb.propertyPages.KBSettingsPreferencePage">
+ <enabledWhen>
+ <adapt type="org.eclipse.core.resources.IProject">
+ <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.jdt.core.javanature"/>
+ </adapt>
+ </enabledWhen>
+ </page>
+ </extension>
+
</plugin>
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.java 2011-07-28 00:19:44 UTC (rev 33283)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.java 2011-07-28 00:19:59 UTC (rev 33284)
@@ -37,4 +37,6 @@
public static String ILLEGAL_CONTENTTYPE;
public static String EXCEPTION_DURING_CREATING_MARKER;
+
+ public static String KB_SETTINGS_PREFERENCE_PAGE_KB_SUPPORT;
}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.properties 2011-07-28 00:19:44 UTC (rev 33283)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.properties 2011-07-28 00:19:59 UTC (rev 33284)
@@ -14,4 +14,6 @@
ILLEGAL_CONTENTTYPE=Unknown contentType argument value: {0}
-EXCEPTION_DURING_CREATING_MARKER=Exception occurred during creating marker for validation error on ''{0}''
\ No newline at end of file
+EXCEPTION_DURING_CREATING_MARKER=Exception occurred during creating marker for validation error on ''{0}''
+
+KB_SETTINGS_PREFERENCE_PAGE_KB_SUPPORT=JBoss Tools Knowledge Base support\:
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/WebKbPlugin.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/WebKbPlugin.java 2011-07-28 00:19:44 UTC (rev 33283)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/WebKbPlugin.java 2011-07-28 00:19:59 UTC (rev 33284)
@@ -6,12 +6,17 @@
import java.util.Set;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ISaveContext;
import org.eclipse.core.resources.ISaveParticipant;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.log.BaseUIPlugin;
+import org.jboss.tools.jst.web.WebModelPlugin;
+import org.jboss.tools.jst.web.kb.internal.KbBuilder;
import org.jboss.tools.jst.web.kb.internal.KbProject;
import org.osgi.framework.BundleContext;
@@ -134,4 +139,21 @@
public static WebKbPlugin getDefault() {
return plugin;
}
+
+ public static void enableKB(IProject project, IProgressMonitor monitor) {
+ try {
+ WebModelPlugin.addNatureToProjectWithValidationSupport(project, KbBuilder.BUILDER_ID, IKbProject.NATURE_ID);
+ } catch (CoreException e) {
+ getDefault().logError(e);
+ }
+ }
+
+ public static void disableKB(IProject project) {
+ try {
+ EclipseUtil.removeNatureFromProject(project, IKbProject.NATURE_ID);
+ } catch (CoreException e) {
+ getDefault().logError(e);
+ }
+ }
+
}
\ No newline at end of file
Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/KBSettingsPreferencePage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/KBSettingsPreferencePage.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/KBSettingsPreferencePage.java 2011-07-28 00:19:59 UTC (rev 33284)
@@ -0,0 +1,155 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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.jst.web.kb.preferences;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.swt.SWT;
+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.jboss.tools.common.ui.preferences.SettingsPage;
+import org.jboss.tools.common.ui.widget.editor.IFieldEditor;
+import org.jboss.tools.common.ui.widget.editor.IFieldEditorFactory;
+import org.jboss.tools.jst.web.kb.KbMessages;
+import org.jboss.tools.jst.web.kb.KbProjectFactory;
+import org.jboss.tools.jst.web.kb.WebKbPlugin;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class KBSettingsPreferencePage extends SettingsPage {
+
+ public static final String ID = "org.jboss.tools.jst.web.kb.propertyPages.KBSettingsPreferencePage"; //$NON-NLS-1$
+
+ private IProject project;
+ private boolean kbEnabled;
+ private boolean initialState;
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.dialogs.PropertyPage#setElement(org.eclipse.core.runtime.IAdaptable)
+ */
+ @Override
+ public void setElement(IAdaptable element) {
+ super.setElement(element);
+ project = (IProject) getElement().getAdapter(IProject.class);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
+ */
+ @Override
+ protected Control createContents(Composite parent) {
+ Composite root = new Composite(parent, SWT.NONE);
+
+ GridData gd = new GridData();
+
+ gd.horizontalSpan = 1;
+ gd.horizontalAlignment = GridData.FILL;
+ gd.grabExcessHorizontalSpace = true;
+ gd.grabExcessVerticalSpace = false;
+
+ GridLayout gridLayout = new GridLayout(1, false);
+ root.setLayout(gridLayout);
+
+ Composite generalGroup = new Composite(root, SWT.NONE);
+ generalGroup.setLayoutData(gd);
+ gridLayout = new GridLayout(4, false);
+
+ generalGroup.setLayout(gridLayout);
+
+ initialState = isKBEnabled(project);
+ IFieldEditor kbSupportCheckBox = IFieldEditorFactory.INSTANCE.createCheckboxEditor(
+ KbMessages.KB_SETTINGS_PREFERENCE_PAGE_KB_SUPPORT, KbMessages.KB_SETTINGS_PREFERENCE_PAGE_KB_SUPPORT, initialState);
+ kbSupportCheckBox.addPropertyChangeListener(new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ Object value = evt.getNewValue();
+ if (value instanceof Boolean) {
+ boolean v = ((Boolean) value).booleanValue();
+ setEnabledKBSuport(v);
+ }
+ }
+ });
+ kbEnabled = isKBEnabled(project);
+ registerEditor(kbSupportCheckBox, generalGroup);
+
+ validate();
+ return root;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
+ */
+ @Override
+ protected void performDefaults() {
+ getEditor(KbMessages.KB_SETTINGS_PREFERENCE_PAGE_KB_SUPPORT).setValue(isKBEnabled(project));
+ validate();
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.jface.preference.PreferencePage#performOk()
+ */
+ @Override
+ public boolean performOk() {
+ if(isKBEnabled()!=initialState) {
+ if(isKBEnabled()) {
+ addKBSupport(project);
+ } else {
+ removeKBSupport(project);
+ }
+ }
+ return true;
+ }
+
+ private void addKBSupport(IProject project) {
+ if(project==null) {
+ return;
+ }
+ WebKbPlugin.enableKB(project, new NullProgressMonitor());
+ }
+
+ private void removeKBSupport(IProject project) {
+ WebKbPlugin.disableKB(project);
+ }
+
+ private boolean isKBEnabled(IProject project) {
+ return KbProjectFactory.getKbProject(project, false) != null;
+ }
+
+ private boolean isKBEnabled() {
+ return kbEnabled;
+ }
+
+ public void setEnabledKBSuport(boolean enabled) {
+ kbEnabled = enabled;
+ editorRegistry.get(KbMessages.KB_SETTINGS_PREFERENCE_PAGE_KB_SUPPORT).setValue(enabled);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.common.ui.preferences.SettingsPage#validate()
+ */
+ @Override
+ protected void validate() {
+ }
+
+ public void dispose() {
+ super.dispose();
+ }
+}
\ No newline at end of file
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/KBSettingsPreferencePage.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 9 months
JBoss Tools SVN: r33283 - in trunk/cdi/tests: org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-07-27 20:19:44 -0400 (Wed, 27 Jul 2011)
New Revision: 33283
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInDecorator.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInDecorator.qfxresult
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInInterceptor.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInInterceptor.qfxresult
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
Log:
https://issues.jboss.org/browse/JBIDE-7685
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInDecorator.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInDecorator.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInDecorator.java 2011-07-28 00:19:44 UTC (rev 33283)
@@ -0,0 +1,15 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.enterprise.event.Observes;
+import javax.inject.Inject;
+
+@Decorator
+public class ObserverInDecorator {
+ @Inject @Delegate @AAnnotation String str;
+
+ public void method(@Observes String param){
+
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInDecorator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInDecorator.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInDecorator.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInDecorator.qfxresult 2011-07-28 00:19:44 UTC (rev 33283)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+@Decorator
+public class ObserverInDecorator {
+ @Inject @Delegate @AAnnotation String str;
+
+ public void method(String param){
+
+ }
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInInterceptor.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInInterceptor.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInInterceptor.java 2011-07-28 00:19:44 UTC (rev 33283)
@@ -0,0 +1,15 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.enterprise.event.Observes;
+import javax.interceptor.Interceptor;
+
+import org.jboss.jsr299.tck.tests.decorators.interceptor.FooBinding;
+
+@Interceptor
+@FooBinding
+public class ObserverInInterceptor {
+
+ public void method(@Observes String param){
+
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInInterceptor.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInInterceptor.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInInterceptor.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInInterceptor.qfxresult 2011-07-28 00:19:44 UTC (rev 33283)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.interceptor.Interceptor;
+
+import org.jboss.jsr299.tck.tests.decorators.interceptor.FooBinding;
+
+@Interceptor
+@FooBinding
+public class ObserverInInterceptor {
+
+ public void method(String param){
+
+ }
+}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-07-27 23:52:18 UTC (rev 33282)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-07-28 00:19:44 UTC (rev 33283)
@@ -858,4 +858,32 @@
CDIValidationErrorManager.OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED_ID,
DeleteAnnotationMarkerResolution.class);
}
+
+ public void testObserverInDecoratorResolution() throws CoreException{
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/ObserverInDecorator.java"
+ },
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/ObserverInDecorator.qfxresult"
+ },
+ CDICoreValidator.PROBLEM_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.OBSERVER_IN_DECORATOR_ID,
+ DeleteAnnotationMarkerResolution.class);
+ }
+
+ public void testObserverInInterceptorResolution() throws CoreException{
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/ObserverInInterceptor.java"
+ },
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/ObserverInInterceptor.qfxresult"
+ },
+ CDICoreValidator.PROBLEM_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.OBSERVER_IN_INTERCEPTOR_ID,
+ DeleteAnnotationMarkerResolution.class);
+ }
}
\ No newline at end of file
12 years, 9 months
JBoss Tools SVN: r33282 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-07-27 19:52:18 -0400 (Wed, 27 Jul 2011)
New Revision: 33282
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
Log:
https://issues.jboss.org/browse/JBIDE-9418
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2011-07-27 23:38:28 UTC (rev 33281)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2011-07-27 23:52:18 UTC (rev 33282)
@@ -100,8 +100,8 @@
ILLEGAL_INTERCEPTOR_BINDING_CLASS=The bean class of a managed bean that declares an interceptor binding must not be declared final [JSR-299 �9.3]
ILLEGAL_INTERCEPTOR_BINDING_METHOD=A non-static, non-private method of a bean class of a managed bean that declares an interceptor binding must not be declared final [JSR-299 �9.3]
CONFLICTING_INTERCEPTOR_BINDINGS=The set of interceptor bindings of a bean or interceptor, including bindings inherited from stereotypes and other interceptor bindings, has two instances of a certain interceptor binding type and the instances have different values of some annotation member [JSR-299 �9.5.2]
-OBSERVER_IN_DECORATOR=Interceptor cannot have a method with a parameter annotated @Observes [JSR-299 �10.4.2]
-OBSERVER_IN_INTERCEPTOR=Decorator cannot have a method with a parameter annotated @Observes [JSR-299 �10.4.2]
+OBSERVER_IN_DECORATOR=Decorator cannot have a method with a parameter annotated @Observes [JSR-299 �10.4.2]
+OBSERVER_IN_INTERCEPTOR=Interceptor cannot have a method with a parameter annotated @Observes [JSR-299 �10.4.2]
INTERCEPTOR_IS_ALTERNATIVE=Interceptor is an alternative [JSR-299 �2.6.1]
DECORATOR_IS_ALTERNATIVE=Decorator is an alternative [JSR-299 �2.6.1]
MISSING_INTERCEPTOR_BINDING=Interceptor declared using @Interceptor must specify at least one interceptor binding [JSR-299 �9.2]
12 years, 9 months
JBoss Tools SVN: r33281 - in workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite: features and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-07-27 19:38:28 -0400 (Wed, 27 Jul 2011)
New Revision: 33281
Added:
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/.project
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/artifacts.jar
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/content.jar
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/features/
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/features/org.jboss.tools.as.sourcelookup.feature_1.0.0.201107280132.jar
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.core_1.0.0.201107280132.jar
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.ui_1.0.0.201107280132.jar
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/site.xml
Log:
JBIDE-9309 - Easily adding full JBoss AS source
Added: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/.project
===================================================================
--- workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/.project (rev 0)
+++ workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/.project 2011-07-27 23:38:28 UTC (rev 33281)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.as.sourcelookup.updatesite</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.UpdateSiteBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.UpdateSiteNature</nature>
+ </natures>
+</projectDescription>
Added: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/artifacts.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/artifacts.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/content.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/content.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/features/org.jboss.tools.as.sourcelookup.feature_1.0.0.201107280132.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/features/org.jboss.tools.as.sourcelookup.feature_1.0.0.201107280132.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.core_1.0.0.201107280132.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.core_1.0.0.201107280132.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.ui_1.0.0.201107280132.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.ui_1.0.0.201107280132.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/site.xml
===================================================================
--- workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/site.xml (rev 0)
+++ workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/site.xml 2011-07-27 23:38:28 UTC (rev 33281)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature url="features/org.jboss.tools.as.sourcelookup.feature_1.0.0.201107280132.jar" id="org.jboss.tools.as.sourcelookup.feature" version="1.0.0.201107280132">
+ <category name="org.jboss.tools.as.sourcelookup"/>
+ </feature>
+ <category-def name="org.jboss.tools.as.sourcelookup" label="JBoss Tools Source Lookup"/>
+</site>
12 years, 9 months
JBoss Tools SVN: r33280 - workspace/snjeza.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-07-27 19:35:59 -0400 (Wed, 27 Jul 2011)
New Revision: 33280
Added:
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/
Log:
Initial import.
12 years, 9 months
JBoss Tools SVN: r33279 - in trunk/cdi/plugins: org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-07-27 19:34:10 -0400 (Wed, 27 Jul 2011)
New Revision: 33279
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
Log:
https://issues.jboss.org/browse/JBIDE-7685
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-07-27 23:05:30 UTC (rev 33278)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-07-27 23:34:10 UTC (rev 33279)
@@ -942,11 +942,11 @@
*/
if(bean instanceof IDecorator) {
for (ITextSourceReference declaration : declarations) {
- addError(CDIValidationMessages.OBSERVER_IN_DECORATOR, CDIPreferences.OBSERVER_IN_INTERCEPTOR_OR_DECORATOR, declaration, bean.getResource());
+ addError(CDIValidationMessages.OBSERVER_IN_DECORATOR, CDIPreferences.OBSERVER_IN_INTERCEPTOR_OR_DECORATOR, declaration, bean.getResource(), OBSERVER_IN_DECORATOR_ID);
}
} else if(bean instanceof IInterceptor) {
for (ITextSourceReference declaration : declarations) {
- addError(CDIValidationMessages.OBSERVER_IN_INTERCEPTOR, CDIPreferences.OBSERVER_IN_INTERCEPTOR_OR_DECORATOR, declaration, bean.getResource());
+ addError(CDIValidationMessages.OBSERVER_IN_INTERCEPTOR, CDIPreferences.OBSERVER_IN_INTERCEPTOR_OR_DECORATOR, declaration, bean.getResource(), OBSERVER_IN_INTERCEPTOR_ID);
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java 2011-07-27 23:05:30 UTC (rev 33278)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java 2011-07-27 23:34:10 UTC (rev 33279)
@@ -57,6 +57,8 @@
public static final int PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED_DISPOSES_ID = 36;
public static final int PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED_OBSERVES_ID = 37;
public static final int OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED_ID = 38;
+ public static final int OBSERVER_IN_DECORATOR_ID = 39;
+ public static final int OBSERVER_IN_INTERCEPTOR_ID = 40;
/*
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-07-27 23:05:30 UTC (rev 33278)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-07-27 23:34:10 UTC (rev 33279)
@@ -408,6 +408,17 @@
};
}
}
+ }else if(messageId == CDIValidationErrorManager.OBSERVER_IN_DECORATOR_ID ||
+ messageId == CDIValidationErrorManager.OBSERVER_IN_INTERCEPTOR_ID){
+ IJavaElement element = findJavaElement(file, start);
+ if(element != null){
+ IJavaElement observerElement = findJavaElementByAnnotation(element, CDIConstants.OBSERVERS_ANNOTATION_TYPE_NAME);
+ if(observerElement != null){
+ return new IMarkerResolution[] {
+ new DeleteAnnotationMarkerResolution(observerElement, CDIConstants.OBSERVERS_ANNOTATION_TYPE_NAME)
+ };
+ }
+ }
}
}
return new IMarkerResolution[] {};
12 years, 9 months
JBoss Tools SVN: r33278 - in trunk/cdi: plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-07-27 19:05:30 -0400 (Wed, 27 Jul 2011)
New Revision: 33278
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/DisposerInObserver.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
Log:
https://issues.jboss.org/browse/JBIDE-7668
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-07-27 21:56:21 UTC (rev 33277)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-07-27 23:05:30 UTC (rev 33278)
@@ -1021,7 +1021,7 @@
}
if (observesExists) {
for (ITextSourceReference declaration : declarations) {
- addError(CDIValidationMessages.OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED, CDIPreferences.OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED, declaration, bean.getResource());
+ addError(CDIValidationMessages.OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED, CDIPreferences.OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED, declaration, bean.getResource(), OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED_ID);
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java 2011-07-27 21:56:21 UTC (rev 33277)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java 2011-07-27 23:05:30 UTC (rev 33278)
@@ -56,6 +56,7 @@
public static final int DECORATOR_ANNOTATED_SPECIALIZES_ID = 35;
public static final int PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED_DISPOSES_ID = 36;
public static final int PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED_OBSERVES_ID = 37;
+ public static final int OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED_ID = 38;
/*
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-07-27 21:56:21 UTC (rev 33277)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-07-27 23:05:30 UTC (rev 33278)
@@ -396,6 +396,18 @@
};
}
}
+ }else if(messageId == CDIValidationErrorManager.OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED_ID){
+ IJavaElement element = findJavaElement(file, start);
+ if(element != null){
+ IJavaElement disposerElement = findJavaElementByAnnotation(element, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME);
+ IJavaElement observerElement = findJavaElementByAnnotation(element, CDIConstants.OBSERVERS_ANNOTATION_TYPE_NAME);
+ if(disposerElement != null && observerElement != null){
+ return new IMarkerResolution[] {
+ new DeleteAnnotationMarkerResolution(disposerElement, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME),
+ new DeleteAnnotationMarkerResolution(observerElement, CDIConstants.OBSERVERS_ANNOTATION_TYPE_NAME)
+ };
+ }
+ }
}
}
return new IMarkerResolution[] {};
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/DisposerInObserver.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/DisposerInObserver.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/DisposerInObserver.java 2011-07-27 23:05:30 UTC (rev 33278)
@@ -0,0 +1,16 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+
+public class DisposerInObserver {
+ @Produces
+ public String produce(){
+ return "a";
+ }
+
+ public void method(@Observes String param1, @Disposes String param2){
+
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/DisposerInObserver.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-07-27 21:56:21 UTC (rev 33277)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-07-27 23:05:30 UTC (rev 33278)
@@ -847,4 +847,15 @@
CDIValidationErrorManager.PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED_OBSERVES_ID,
DeleteAnnotationMarkerResolution.class);
}
+
+ public void testDisposerInObserverResolution() throws CoreException{
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/DisposerInObserver.java"
+ },
+ CDICoreValidator.PROBLEM_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED_ID,
+ DeleteAnnotationMarkerResolution.class);
+ }
}
\ No newline at end of file
12 years, 9 months
JBoss Tools SVN: r33277 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-27 17:56:21 -0400 (Wed, 27 Jul 2011)
New Revision: 33277
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java
Log:
JBIDE-9401
https://issues.jboss.org/browse/JBIDE-9401
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java 2011-07-27 21:31:08 UTC (rev 33276)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java 2011-07-27 21:56:21 UTC (rev 33277)
@@ -15,6 +15,7 @@
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IClassBean;
import org.jboss.tools.cdi.core.IInjectionPointField;
import org.jboss.tools.cdi.internal.core.impl.BuiltInBean;
@@ -23,8 +24,10 @@
*/
public class BuiltInBeanInjectionTest extends TCKTest {
- public void testBuiltInBeans() {
- // javax.transaction.UserTransaction
+ /**
+ * Test built-in bean with type javax.transaction.UserTransaction
+ */
+ public void testBuiltInUserTransactionBean() {
IInjectionPointField field = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/implementation/builtin/UserTransactionInjectedBean.java", "userTransaction");
assertNotNull(field);
@@ -35,56 +38,89 @@
assertTrue(b instanceof BuiltInBean);
IType t = b.getBeanClass();
assertEquals("javax.transaction.UserTransaction", t.getFullyQualifiedName());
+ }
-
- // javax.validation.ValidatorFactory
- field = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/implementation/builtin/DefaultValidatorFactoryInjectedBean.java", "defaultValidatorFactory");
+ /**
+ * Test built-in bean with type javax.validation.ValidatorFactory
+ */
+ public void testBuiltInValidatorFactoryBean() {
+ IInjectionPointField field = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/implementation/builtin/DefaultValidatorFactoryInjectedBean.java", "defaultValidatorFactory");
assertNotNull(field);
- beans = field.getCDIProject().getBeans(false, field);
+ Set<IBean> beans = field.getCDIProject().getBeans(false, field);
assertFalse(beans.isEmpty());
- b = beans.iterator().next();
+ IBean b = beans.iterator().next();
assertTrue(b instanceof BuiltInBean);
- t = b.getBeanClass();
+ IType t = b.getBeanClass();
assertEquals("javax.validation.ValidatorFactory", t.getFullyQualifiedName());
+ }
- // javax.validation.Validator
- field = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/implementation/builtin/DefaultValidatorInjectedBean.java", "defaultValidator");
+ /**
+ * Test built-in bean with type javax.validation.Validator
+ */
+ public void testBuiltInValidatorBean() {
+ IInjectionPointField field = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/implementation/builtin/DefaultValidatorInjectedBean.java", "defaultValidator");
assertNotNull(field);
- beans = field.getCDIProject().getBeans(false, field);
+ Set<IBean> beans = field.getCDIProject().getBeans(false, field);
assertFalse(beans.isEmpty());
- b = beans.iterator().next();
+ IBean b = beans.iterator().next();
assertTrue(b instanceof BuiltInBean);
- t = b.getBeanClass();
+ IType t = b.getBeanClass();
assertEquals("javax.validation.Validator", t.getFullyQualifiedName());
+ }
- // java.security.Principal
- field = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/implementation/builtin/PrincipalInjectedBean.java", "principal");
+ /**
+ * Test built-in bean with type java.security.Principal
+ */
+ public void testBuiltInPrincipalBean() {
+ IInjectionPointField field = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/implementation/builtin/PrincipalInjectedBean.java", "principal");
assertNotNull(field);
- beans = field.getCDIProject().getBeans(false, field);
+ Set<IBean> beans = field.getCDIProject().getBeans(false, field);
assertFalse(beans.isEmpty());
- b = beans.iterator().next();
+ IBean b = beans.iterator().next();
assertTrue(b instanceof BuiltInBean);
- t = b.getBeanClass();
+ IType t = b.getBeanClass();
assertEquals("java.security.Principal", t.getFullyQualifiedName());
+ }
- //javax.enterprise.inject.spi.BeanManager
- field = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/context/conversation/BuiltInConversation.java", "manager");
+ /**
+ * Test built-in bean with type javax.enterprise.inject.spi.BeanManager
+ */
+ public void testBuiltInBeanManagerBean() {
+ IInjectionPointField field = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/context/conversation/BuiltInConversation.java", "manager");
assertNotNull(field);
- beans = field.getCDIProject().getBeans(false, field);
+ Set<IBean> beans = field.getCDIProject().getBeans(false, field);
assertFalse(beans.isEmpty());
- b = beans.iterator().next();
+ IBean b = beans.iterator().next();
assertTrue(b instanceof BuiltInBean);
- t = b.getBeanClass();
+ IType t = b.getBeanClass();
assertEquals(CDIConstants.BEAN_MANAGER_TYPE_NAME, t.getFullyQualifiedName());
+ }
+ /**
+ * Test built-in bean with type javax.enterprise.context.Conversation
+ */
+ public void testBuiltInConversationBean() {
+ IInjectionPointField field = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/context/conversation/BuiltInConversation.java", "conversation");
+ assertNotNull(field);
+
+ Set<IBean> beans = field.getCDIProject().getBeans(false, field);
+ assertFalse(beans.isEmpty());
+
+ IBean b = beans.iterator().next();
+ assertTrue(b instanceof IClassBean);
+ IType t = b.getBeanClass();
+ assertEquals(CDIConstants.CONVERSATION_TYPE_NAME, t.getFullyQualifiedName());
+ assertEquals(CDIConstants.CONVERSATION_BEAN_NAME, b.getName());
+ beans = cdiProject.getBeans(CDIConstants.CONVERSATION_BEAN_NAME, false);
+ assertTrue(beans.contains(b));
}
}
\ No newline at end of file
12 years, 9 months
JBoss Tools SVN: r33276 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/el and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-27 17:31:08 -0400 (Wed, 27 Jul 2011)
New Revision: 33276
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBeanFactory.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
Log:
JBIDE-9401
https://issues.jboss.org/browse/JBIDE-9401
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java 2011-07-27 21:25:36 UTC (rev 33275)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java 2011-07-27 21:31:08 UTC (rev 33276)
@@ -51,6 +51,9 @@
public String SESSION_SCOPED_ANNOTATION_TYPE_NAME = "javax.enterprise.context.SessionScoped";
public String DEPENDENT_ANNOTATION_TYPE_NAME = "javax.enterprise.context.Dependent";
+ public String CONVERSATION_TYPE_NAME = "javax.enterprise.context.Conversation";
+ public String CONVERSATION_BEAN_NAME = CONVERSATION_TYPE_NAME.toLowerCase();
+
public String SPECIALIZES_ANNOTATION_TYPE_NAME = "javax.enterprise.inject.Specializes";
public String NON_BINDING_ANNOTATION_TYPE_NAME ="javax.enterprise.util.Nonbinding";
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java 2011-07-27 21:25:36 UTC (rev 33275)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java 2011-07-27 21:31:08 UTC (rev 33276)
@@ -71,6 +71,8 @@
} else if(bean instanceof IBeanMember) {
IBeanMember beanMember = (IBeanMember)bean;
member = beanMember.getSourceMember();
+ } else {
+ member = bean.getBeanClass();
}
return TypeInfoCollector.createMemberInfo(member);
}
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBeanFactory.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBeanFactory.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBeanFactory.java 2011-07-27 21:31:08 UTC (rev 33276)
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.internal.core.impl;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jdt.core.IType;
+import org.jboss.tools.cdi.core.CDIConstants;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IScope;
+import org.jboss.tools.common.java.IParametedType;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class BuiltInBeanFactory {
+
+ static Set<String> BUILT_IN = new HashSet<String>();
+ static {
+ BUILT_IN.add(CDIConstants.USER_TRANSACTION_TYPE_NAME);
+ BUILT_IN.add(CDIConstants.PRINCIPAL_TYPE_NAME);
+ BUILT_IN.add(CDIConstants.VALIDATION_FACTORY_TYPE_NAME);
+ BUILT_IN.add(CDIConstants.VALIDATOR_TYPE_NAME);
+ BUILT_IN.add(CDIConstants.BEAN_MANAGER_TYPE_NAME);
+ BUILT_IN.add(CDIConstants.CONVERSATION_TYPE_NAME);
+ }
+
+ public static boolean isBuiltIn(IType type) {
+ return type != null && BUILT_IN.contains(type.getFullyQualifiedName());
+ }
+
+ public static IBean newBean(CDIProject project, IParametedType type, IPath contextPath) {
+ BuiltInBean result = null;
+ if(type.getType().getFullyQualifiedName().equals(CDIConstants.CONVERSATION_TYPE_NAME)) {
+ result = new ConversationBuiltInBean(type);
+ } else {
+ result = new BuiltInBean(type);
+ }
+ result.setParent(project);
+ result.setSourcePath(contextPath);
+ return result;
+ }
+
+ static class ConversationBuiltInBean extends BuiltInBean {
+ ConversationBuiltInBean(IParametedType type) {
+ super(type);
+ }
+
+ public String getName() {
+ return "javax.enterprise.context.conversation";
+ }
+
+ public IScope getScope() {
+ return getCDIProject().getScope(CDIConstants.REQUEST_SCOPED_ANNOTATION_TYPE_NAME);
+ }
+
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBeanFactory.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-07-27 21:25:36 UTC (rev 33275)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-07-27 21:31:08 UTC (rev 33276)
@@ -341,13 +341,11 @@
}
}
- if(isBuiltIn(type.getType())) {
+ if(BuiltInBeanFactory.isBuiltIn(type.getType())) {
Set<IBean> rslt = null;
rslt = getBeans(attemptToResolveAmbiguousDependency, type, qs.toArray(new IQualifierDeclaration[0]));
if(rslt.isEmpty()) {
- BuiltInBean builtInBean = new BuiltInBean(type);
- builtInBean.setParent(this);
- builtInBean.setSourcePath(injectionPoint.getSourcePath());
+ IBean builtInBean = BuiltInBeanFactory.newBean(this, type, injectionPoint.getSourcePath());
result.add(builtInBean);
} else {
result = rslt;
@@ -400,18 +398,6 @@
return getResolvedBeans(result, attemptToResolveAmbiguousDependency);
}
- static Set<String> BUILT_IN = new HashSet<String>();
- static {
- BUILT_IN.add(CDIConstants.USER_TRANSACTION_TYPE_NAME);
- BUILT_IN.add(CDIConstants.PRINCIPAL_TYPE_NAME);
- BUILT_IN.add(CDIConstants.VALIDATION_FACTORY_TYPE_NAME);
- BUILT_IN.add(CDIConstants.VALIDATOR_TYPE_NAME);
- BUILT_IN.add(CDIConstants.BEAN_MANAGER_TYPE_NAME);
- }
- static boolean isBuiltIn(IType type) {
- return type != null && BUILT_IN.contains(type.getFullyQualifiedName());
- }
-
public static boolean containsType(Set<IParametedType> types, IParametedType type) {
if(type == null) {
return false;
@@ -1187,13 +1173,26 @@
}
buildInjectionPoinsByType();
-
-// System.out.println("Project=" + getNature().getProject());
-// System.out.println("Qualifiers=" + qualifiers.size());
-// System.out.println("Stereotypes=" + stereotypes.size());
-// System.out.println("Scopes=" + scopes.size());
-// System.out.println("Named beans=" + beansByName.size());
-// System.out.println("Bean paths=" + beansByPath.size());
+
+ //Provide built-in bean Conversation
+ if(!beansByName.containsKey(CDIConstants.CONVERSATION_BEAN_NAME)) {
+ IType type = n.getType(CDIConstants.CONVERSATION_TYPE_NAME);
+ if(type != null) {
+ TypeDefinition t = new TypeDefinition();
+ t.setType(type, n.getDefinitions(), TypeDefinition.FLAG_NO_ANNOTATIONS);
+ ClassBean bean = new ClassBean() {
+ public String getName() {
+ return "javax.enterprise.context.conversation";
+ }
+ public IScope getScope() {
+ return getCDIProject().getScope(CDIConstants.REQUEST_SCOPED_ANNOTATION_TYPE_NAME);
+ }
+ };
+ bean.setParent(this);
+ bean.setDefinition(t);
+ addBean(bean);
+ }
+ }
}
public void addBean(IBean bean) {
12 years, 9 months
JBoss Tools SVN: r33275 - trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-27 17:25:36 -0400 (Wed, 27 Jul 2011)
New Revision: 33275
Modified:
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp...
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp...
Log:
JBIDE-8667 trunk composite staging site should include BOTH current and previous versions of components to help w/ intra- and inter-build stability
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp... 2011-07-27 21:19:13 UTC (rev 33274)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp... 2011-07-27 21:25:36 UTC (rev 33275)
@@ -7,50 +7,91 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1304696370000'/>
+<property name='p2.timestamp' value='1311801436000'/>
</properties>
-<children size='33'>
+<children size='66'>
-<child location='../../jbosstools-3.3_trunk.component--archives/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--as/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--birt/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--bpel/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--cdi/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--archives/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--as/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--birt/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--bpel/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--cdi/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--common/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--deltacloud/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--esb/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--examples/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--flow/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--archives/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--as/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--birt/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--bpel/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--cdi/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--forge/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--freemarker/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--gwt/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--hibernatetools/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--jbpm/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--common/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--deltacloud/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--esb/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--examples/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--flow/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--jmx/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--jsf/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--jst/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--maven/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--modeshape/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--common/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--deltacloud/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--esb/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--examples/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--flow/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--portlet/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--runtime/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--seam/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--smooks/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--struts/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--forge/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--freemarker/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--gwt/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--hibernatetools/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--jbpm/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--tests/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--usage/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--vpe/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--ws/all/repo/'/>
-<child location='../../savara-tools-eclipse-master/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--forge/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--freemarker/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--gwt/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--hibernatetools/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--jbpm/all/repo/'/>
+
+<child location='../../../staging/jbosstools-3.3_trunk.component--jmx/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--jsf/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--jst/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--maven/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--modeshape/all/repo/'/>
+
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--jmx/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--jsf/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--jst/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--maven/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--modeshape/all/repo/'/>
+
+<child location='../../../staging/jbosstools-3.3_trunk.component--portlet/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--runtime/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--seam/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--smooks/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--struts/all/repo/'/>
+
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--portlet/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--runtime/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--seam/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--smooks/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--struts/all/repo/'/>
+
+<child location='../../../staging/jbosstools-3.3_trunk.component--tests/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--usage/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--vpe/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--ws/all/repo/'/>
+
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--tests/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--usage/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--vpe/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--ws/all/repo/'/>
+
+<child location='../../../staging/jbosstools-drools-5.2_trunk/all/repo/'/>
+<child location='../../../staging/jbosstools-teiid-designer-7.5_trunk/all/repo/'/>
+<child location='../../../staging/savara-tools-eclipse-master/all/repo/'/>
+<child location='../../../staging/xulrunner-1.9.2/all/repo/'/>
+
+<child location='../../../staging.previous/jbosstools-drools-5.2_trunk/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-teiid-designer-7.5_trunk/all/repo/'/>
+<child location='../../../staging.previous/savara-tools-eclipse-master/all/repo/'/>
+<child location='../../../staging.previous/xulrunner-1.9.2/all/repo/'/>
+
<!-- <child location='http://downloads.jboss.org/savara/releases/updates/2.0.x/' /> -->
-<child location='../../jbosstools-teiid-designer-7.5_trunk/all/repo/'/>
-<child location='../../jbosstools-drools-5.2_trunk/all/repo/'/>
-<child location='../../xulrunner-1.9.2/all/repo/'/>
-
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp... 2011-07-27 21:19:13 UTC (rev 33274)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp... 2011-07-27 21:25:36 UTC (rev 33275)
@@ -7,50 +7,91 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1304696370000'/>
+<property name='p2.timestamp' value='1311801442000'/>
</properties>
-<children size='33'>
+<children size='66'>
-<child location='../../jbosstools-3.3_trunk.component--archives/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--as/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--birt/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--bpel/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--cdi/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--archives/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--as/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--birt/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--bpel/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--cdi/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--common/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--deltacloud/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--esb/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--examples/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--flow/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--archives/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--as/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--birt/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--bpel/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--cdi/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--forge/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--freemarker/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--gwt/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--hibernatetools/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--jbpm/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--common/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--deltacloud/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--esb/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--examples/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--flow/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--jmx/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--jsf/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--jst/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--maven/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--modeshape/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--common/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--deltacloud/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--esb/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--examples/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--flow/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--portlet/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--runtime/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--seam/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--smooks/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--struts/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--forge/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--freemarker/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--gwt/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--hibernatetools/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--jbpm/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--tests/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--usage/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--vpe/all/repo/'/>
-<child location='../../jbosstools-3.3_trunk.component--ws/all/repo/'/>
-<child location='../../savara-tools-eclipse-master/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--forge/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--freemarker/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--gwt/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--hibernatetools/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--jbpm/all/repo/'/>
+
+<child location='../../../staging/jbosstools-3.3_trunk.component--jmx/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--jsf/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--jst/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--maven/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--modeshape/all/repo/'/>
+
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--jmx/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--jsf/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--jst/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--maven/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--modeshape/all/repo/'/>
+
+<child location='../../../staging/jbosstools-3.3_trunk.component--portlet/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--runtime/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--seam/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--smooks/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--struts/all/repo/'/>
+
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--portlet/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--runtime/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--seam/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--smooks/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--struts/all/repo/'/>
+
+<child location='../../../staging/jbosstools-3.3_trunk.component--tests/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--usage/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--vpe/all/repo/'/>
+<child location='../../../staging/jbosstools-3.3_trunk.component--ws/all/repo/'/>
+
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--tests/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--usage/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--vpe/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-3.3_trunk.component--ws/all/repo/'/>
+
+<child location='../../../staging/jbosstools-drools-5.2_trunk/all/repo/'/>
+<child location='../../../staging/jbosstools-teiid-designer-7.5_trunk/all/repo/'/>
+<child location='../../../staging/savara-tools-eclipse-master/all/repo/'/>
+<child location='../../../staging/xulrunner-1.9.2/all/repo/'/>
+
+<child location='../../../staging.previous/jbosstools-drools-5.2_trunk/all/repo/'/>
+<child location='../../../staging.previous/jbosstools-teiid-designer-7.5_trunk/all/repo/'/>
+<child location='../../../staging.previous/savara-tools-eclipse-master/all/repo/'/>
+<child location='../../../staging.previous/xulrunner-1.9.2/all/repo/'/>
+
<!-- <child location='http://downloads.jboss.org/savara/releases/updates/2.0.x/' /> -->
-<child location='../../jbosstools-teiid-designer-7.5_trunk/all/repo/'/>
-<child location='../../jbosstools-drools-5.2_trunk/all/repo/'/>
-<child location='../../xulrunner-1.9.2/all/repo/'/>
-
</children>
</repository>
12 years, 9 months