JBoss Tools SVN: r20844 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-03-16 12:05:11 -0400 (Tue, 16 Mar 2010)
New Revision: 20844
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5808
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2010-03-16 15:27:48 UTC (rev 20843)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2010-03-16 16:05:11 UTC (rev 20844)
@@ -85,7 +85,7 @@
*
* @return the qualifiers
*/
- Set<IAnnotationDeclaration> getQualifierDeclarations();
+ Set<IQualifierDeclaration> getQualifierDeclarations();
/**
* Obtains the qualifiers of the bean class or producer method or field.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2010-03-16 15:27:48 UTC (rev 20843)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2010-03-16 16:05:11 UTC (rev 20844)
@@ -130,10 +130,10 @@
* Returns the set of beans which are eligible for the given injection
* points.
*
- * @param injectionPoints
+ * @param injectionPoint
* @return the resulting set of beans
*/
- Set<IBean> getBeans(IInjectionPoint injectionPoints);
+ Set<IBean> getBeans(IInjectionPoint injectionPoint);
/**
* Returns the bean which is declared in the given IType.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2010-03-16 15:27:48 UTC (rev 20843)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2010-03-16 16:05:11 UTC (rev 20844)
@@ -12,8 +12,6 @@
import java.util.Set;
-import org.eclipse.jdt.core.IType;
-
/**
* Represents an injection point.
*
@@ -33,7 +31,7 @@
*
* @return the required qualifiers
*/
- Set<IAnnotationDeclaration> getQualifierDeclarations();
+ Set<IQualifierDeclaration> getQualifierDeclarations();
/**
* Determines if the injection point is a decorator delegate injection
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2010-03-16 15:27:48 UTC (rev 20843)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2010-03-16 16:05:11 UTC (rev 20844)
@@ -17,12 +17,10 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IMemberValuePair;
import org.eclipse.jdt.core.ISourceRange;
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.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
@@ -38,9 +36,6 @@
import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.AbstractTypeDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
-import org.jboss.tools.cdi.internal.core.impl.definition.ParametedTypeFactory;
-import org.jboss.tools.common.model.util.EclipseJavaUtil;
-import org.jboss.tools.common.util.FileUtil;
/**
*
@@ -94,12 +89,12 @@
return result;
}
- public Set<IAnnotationDeclaration> getQualifierDeclarations() {
- Set<IAnnotationDeclaration> result = new HashSet<IAnnotationDeclaration>();
+ public Set<IQualifierDeclaration> getQualifierDeclarations() {
+ Set<IQualifierDeclaration> result = new HashSet<IQualifierDeclaration>();
for(AnnotationDeclaration a: definition.getAnnotations()) {
int k = getCDIProject().getNature().getDefinitions().getAnnotationKind(a.getType());
if(k == AnnotationDefinition.QUALIFIER) {
- result.add(a);
+ result.add((IQualifierDeclaration)a);
}
}
return result;
@@ -111,12 +106,10 @@
IQualifier name = getCDIProject().getQualifier(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
Set<IQualifier> result = new HashSet<IQualifier>();
- Set<IAnnotationDeclaration> ds = getQualifierDeclarations();
- for (IAnnotationDeclaration d: ds) {
- if(d instanceof IQualifierDeclaration) {
- IQualifier q = ((IQualifierDeclaration)d).getQualifier();
- if(q != null) result.add(q);
- }
+ Set<IQualifierDeclaration> ds = getQualifierDeclarations();
+ for (IQualifierDeclaration d: ds) {
+ IQualifier q = d.getQualifier();
+ if(q != null) result.add(q);
}
if(this instanceof IInjectionPoint) {
if(def != null && result.isEmpty()) {
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 2010-03-16 15:27:48 UTC (rev 20843)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-03-16 16:05:11 UTC (rev 20844)
@@ -40,6 +40,7 @@
import org.jboss.tools.cdi.core.IObserverMethod;
import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IProducer;
+import org.jboss.tools.cdi.core.IQualifierDeclaration;
import org.jboss.tools.cdi.core.IStereotype;
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.BeansXMLDefinition;
@@ -189,7 +190,7 @@
return result;
}
- Set<IAnnotationDeclaration> qs = injectionPoints.getQualifierDeclarations();
+ Set<IQualifierDeclaration> qs = injectionPoints.getQualifierDeclarations();
Set<IBean> beans = new HashSet<IBean>();
synchronized(allBeans) {
@@ -199,7 +200,7 @@
Set<IParametedType> types = b.getLegalTypes();
if(containsType(types, type)) {
try {
- Set<IAnnotationDeclaration> qsb = b.getQualifierDeclarations();
+ Set<IQualifierDeclaration> qsb = b.getQualifierDeclarations();
if(areMatchingQualifiers(qsb, qs)) {
result.add(b);
}
@@ -219,7 +220,7 @@
return false;
}
- public static boolean areMatchingQualifiers(Set<IAnnotationDeclaration> beanQualifiers, Set<IAnnotationDeclaration> injectionQualifiers) throws CoreException {
+ public static boolean areMatchingQualifiers(Set<? extends IAnnotationDeclaration> beanQualifiers, Set<? extends IAnnotationDeclaration> injectionQualifiers) throws CoreException {
if(beanQualifiers == null || beanQualifiers.isEmpty()) {
if(injectionQualifiers == null || injectionQualifiers.isEmpty()) {
return true;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2010-03-16 15:27:48 UTC (rev 20843)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2010-03-16 16:05:11 UTC (rev 20844)
@@ -17,7 +17,9 @@
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
+import org.jboss.tools.cdi.core.IProducerMethod;
import org.jboss.tools.cdi.core.IQualifier;
+import org.jboss.tools.cdi.core.IQualifierDeclaration;
/**
* @author Alexey Kazakov
@@ -82,7 +84,7 @@
Set<IQualifier> qualifiers = bean.getQualifiers();
assertEquals("Wrong number of qualifiers.", 2, qualifiers.size());
assertContainsQualifierType(bean, "org.jboss.jsr299.tck.tests.definition.qualifier.SynchronousQualifier");
- Set<IAnnotationDeclaration> declarations = bean.getQualifierDeclarations();
+ Set<IQualifierDeclaration> declarations = bean.getQualifierDeclarations();
assertEquals("Wrong number of qualifier declarations.", 1, declarations.size());
// TODO use correct start position instead of 0.
assertLocationEquals(declarations, 0, 12);
@@ -101,5 +103,38 @@
IBean bean = beans.iterator().next();
Set<IQualifier> qualifiers = bean.getQualifiers();
assertEquals("Wrong number of qualifiers.", 4, qualifiers.size());
+ Set<IQualifierDeclaration> declarations = bean.getQualifierDeclarations();
+ assertEquals("Wrong number of qualifier declarations.", 2, declarations.size());
+ // TODO use correct start position instead of 0.
+ assertLocationEquals(declarations, 0, 6);
+ assertLocationEquals(declarations, 0, 9);
}
+
+ /**
+ * section 2.3.5 a)
+ * @throws JavaModelException
+ */
+ public void testFieldInjectedFromProducerMethod() throws JavaModelException {
+ Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.qualifier.Barn");
+ assertEquals("Wrong number of beans with org.jboss.jsr299.tck.tests.definition.qualifier.Barn type.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ Set<IInjectionPoint> points = bean.getInjectionPoints();
+ IInjectionPoint point = points.iterator().next();
+ Set<IQualifierDeclaration> declarations = point.getQualifierDeclarations();
+ assertEquals("Wrong number of qualifier declarations.", 1, declarations.size());
+ // TODO use correct start position instead of 0.
+ assertLocationEquals(declarations, 0, 5);
+
+ Set<IBean> injectedBeans = cdiProject.getBeans(point);
+ assertEquals("Wrong number of beans.", 1, injectedBeans.size());
+ IBean injectedBean = injectedBeans.iterator().next();
+ IType beanClass = injectedBean.getBeanClass();
+ assertEquals("Wrong bean class.", "org.jboss.jsr299.tck.tests.definition.qualifier.SpiderProducer", beanClass.getFullyQualifiedName());
+ assertTrue("The bean should be a producer method.", injectedBean instanceof IProducerMethod);
+ IProducerMethod producer = (IProducerMethod)injectedBean;
+ declarations = producer.getQualifierDeclarations();
+ assertEquals("Wrong number of qualifier declarations.", 1, declarations.size());
+ // TODO use correct start position instead of 0.
+ assertLocationEquals(declarations, 0, 5);
+ }
}
\ No newline at end of file
14 years, 3 months
JBoss Tools SVN: r20843 - trunk/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2010-03-16 11:27:48 -0400 (Tue, 16 Mar 2010)
New Revision: 20843
Modified:
trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
trunk/documentation/guides/JBDS_Release_Notes/en-US/master.xml
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-1160 -Corrected some issues reported by Jiri in JBDS Release Notes.</p>
</body></html>
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2010-03-16 14:25:41 UTC (rev 20842)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2010-03-16 15:27:48 UTC (rev 20843)
@@ -175,7 +175,12 @@
</listitem>
<listitem>
<para>
- <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5124">JBIDE-5124</ulink>: In the Hibernate Diagram Viewer new functionality has been added that allows a user to choose between two different connection routers: Manhattan connection router for small diagrams and Fan connection router for larger diagrams.
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5124">
+ JBIDE-5124</ulink>: In the Hibernate Diagram Viewer new
+ functionality has been added that allows a user to choose between
+ two different connection routers: Manhattan connection router for
+ small diagrams and Fan connection router for larger diagrams
+ (<guimenuitem>View -> Show connections as routed, Show Connections</guimenuitem> as streight lines).
</para>
</listitem>
<listitem>
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/master.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/master.xml 2010-03-16 14:25:41 UTC (rev 20842)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/master.xml 2010-03-16 15:27:48 UTC (rev 20843)
@@ -51,6 +51,6 @@
<!-- &NewFeatures; -->
&ComponentVersions;
&FixedIssues;
-<!-- &KnownIssues; -->
+ &KnownIssues;
</article>
14 years, 3 months
JBoss Tools SVN: r20842 - trunk/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2010-03-16 10:25:41 -0400 (Tue, 16 Mar 2010)
New Revision: 20842
Modified:
trunk/documentation/guides/JBDS_Release_Notes/en-US/master.xml
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-1160 -Corrected some issues reported by Jiri in JBDS Release Notes.</p>
</body></html>
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/master.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/master.xml 2010-03-16 14:23:02 UTC (rev 20841)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/master.xml 2010-03-16 14:25:41 UTC (rev 20842)
@@ -34,7 +34,7 @@
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 1.0
+ Version: 3.0.0.GA
</releaseinfo>
<!--<abstract>
<title/>
14 years, 3 months
JBoss Tools SVN: r20841 - trunk/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2010-03-16 10:23:02 -0400 (Tue, 16 Mar 2010)
New Revision: 20841
Modified:
trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-1160 -Corrected some issues reported by Jiri in JBDS Release Notes.</p>
</body></html>
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2010-03-15 23:51:14 UTC (rev 20840)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2010-03-16 14:23:02 UTC (rev 20841)
@@ -180,7 +180,14 @@
</listitem>
<listitem>
<para>
- <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5031">JBIDE-5031</ulink>: To close a database connection a user would have to close the <application>JBoss Developer Studio</application> and then restart the application to continue work without the connection. The database connection can now be closed from within the <application>JBoss Developer Studio</application> by choosing the <guimenuitem>Close Configuration</guimenuitem> menu item from the right-click menu in <guilabel>Hibernate Configurations</guilabel> tab.
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5031">JBIDE-5031</ulink>:
+ To close a database connection a user would have to close the
+ <application>JBoss Developer Studio</application> and then restart the application
+ to continue work without the connection.
+ The database connection can now be closed from within the
+ <application>JBoss Developer Studio</application> by choosing the
+ <guimenuitem>Close Configuration</guimenuitem> menu item
+ in <guilabel>Hibernate Console context menu</guilabel> located in Hibernate Configurations View.
</para>
</listitem>
<listitem>
@@ -460,7 +467,7 @@
<itemizedlist>
<listitem>
<para>
- <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5275">JBIDE-5259</ulink>: The Smooks configuration has received a test facility through the modification of the <guibutton>Run</guibutton> button to output a java result to the <guilabel>Console</guilabel>. This allows a user to test Smooks projects in a simplified way.
+ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-5259">JBIDE-5259</ulink>: The Smooks configuration has received a test facility through the modification of the <guibutton>Run</guibutton> button to output a java result to the <guilabel>Console</guilabel>. This allows a user to test Smooks projects in a simplified way.
</para>
</listitem>
<listitem>
14 years, 3 months
JBoss Tools SVN: r20840 - workspace/dgolovin/jbosstools-team-meeting-2010.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-03-15 19:51:14 -0400 (Mon, 15 Mar 2010)
New Revision: 20840
Added:
workspace/dgolovin/jbosstools-team-meeting-2010/JBT-Seam-CDI-JSF2-VPE.odp
Removed:
workspace/dgolovin/jbosstools-team-meeting-2010/JBT Exadel Team.odp
Log:
Deleted: workspace/dgolovin/jbosstools-team-meeting-2010/JBT Exadel Team.odp
===================================================================
(Binary files differ)
Copied: workspace/dgolovin/jbosstools-team-meeting-2010/JBT-Seam-CDI-JSF2-VPE.odp (from rev 20839, workspace/dgolovin/jbosstools-team-meeting-2010/JBT Exadel Team.odp)
===================================================================
(Binary files differ)
14 years, 3 months
JBoss Tools SVN: r20839 - workspace/dgolovin/jbosstools-team-meeting-2010.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-03-15 19:48:20 -0400 (Mon, 15 Mar 2010)
New Revision: 20839
Added:
workspace/dgolovin/jbosstools-team-meeting-2010/JBT Exadel Team.odp
Log:
Added: workspace/dgolovin/jbosstools-team-meeting-2010/JBT Exadel Team.odp
===================================================================
(Binary files differ)
Property changes on: workspace/dgolovin/jbosstools-team-meeting-2010/JBT Exadel Team.odp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 3 months
JBoss Tools SVN: r20838 - workspace/dgolovin.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-03-15 19:46:39 -0400 (Mon, 15 Mar 2010)
New Revision: 20838
Added:
workspace/dgolovin/jbosstools-team-meeting-2010/
Log:
14 years, 3 months
JBoss Tools SVN: r20837 - in trunk/cdi: tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-03-15 17:15:03 -0400 (Mon, 15 Mar 2010)
New Revision: 20837
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5808
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 2010-03-15 21:11:04 UTC (rev 20836)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-03-15 21:15:03 UTC (rev 20837)
@@ -31,6 +31,7 @@
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICoreNature;
+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.ICDIProject;
@@ -178,7 +179,7 @@
public Set<IBean> getBeans(boolean attemptToResolveAmbiguousDependency,
IType beanType, IAnnotationDeclaration... qualifiers) {
// TODO
- return null;
+ return Collections.emptySet();
}
public Set<IBean> getBeans(IInjectionPoint injectionPoints) {
@@ -203,7 +204,7 @@
result.add(b);
}
} catch (CoreException e) {
-
+ CDICorePlugin.getDefault().logError(e);
}
}
}
@@ -397,7 +398,7 @@
}
}
} catch (JavaModelException e) {
-
+ CDICorePlugin.getDefault().logError(e);
}
return true;
}
@@ -596,12 +597,12 @@
addBean(bean);
}
- 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());
+// 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());
}
void addBean(IBean bean) {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2010-03-15 21:11:04 UTC (rev 20836)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2010-03-15 21:15:03 UTC (rev 20837)
@@ -12,6 +12,7 @@
import java.util.Set;
+import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IBean;
@@ -86,4 +87,19 @@
// TODO use correct start position instead of 0.
assertLocationEquals(declarations, 0, 12);
}
+
+ /**
+ * section 2.3.3 d)
+ * @throws JavaModelException
+ */
+ public void testMultipleQualifiers() throws JavaModelException {
+ IAnnotationDeclaration chunky = getAnnotationDeclarationFromBean("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/Cod.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Chunky");
+ IAnnotationDeclaration whitefish = getAnnotationDeclarationFromBean("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/Cod.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Whitefish");
+ IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.Cod");
+ Set<IBean> beans = cdiProject.getBeans(true, type, chunky, whitefish);
+ assertEquals("Wrong number of beans.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ Set<IQualifier> qualifiers = bean.getQualifiers();
+ assertEquals("Wrong number of qualifiers.", 4, qualifiers.size());
+ }
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-03-15 21:11:04 UTC (rev 20836)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-03-15 21:15:03 UTC (rev 20837)
@@ -6,15 +6,19 @@
import junit.framework.TestCase;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.jdt.core.IAnnotation;
+import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
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.ICDIProject;
import org.jboss.tools.cdi.core.IParametedType;
@@ -107,6 +111,37 @@
return beans;
}
+ protected IAnnotationDeclaration getAnnotationDeclarationFromBean(String beanClassFilePath, String annotationTypeName) throws JavaModelException {
+ IFile file = tckProject.getFile(beanClassFilePath);
+ Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ IBean bean = beans.iterator().next();
+ final IType beanClass = bean.getBeanClass();
+ final IType type = getType(annotationTypeName);
+ final IAnnotation annotation = beanClass.getAnnotation(type.getElementName());
+ IAnnotationDeclaration annotationDeclaration = new IAnnotationDeclaration() {
+ public IAnnotation getDeclaration() {
+ return annotation;
+ }
+
+ public IMember getParentMember() {
+ return beanClass;
+ }
+
+ public IType getType() {
+ return type;
+ }
+
+ public int getLength() {
+ return 0;
+ }
+
+ public int getStartPosition() {
+ return 0;
+ }
+ };
+ return annotationDeclaration;
+ }
+
protected void assertTheOnlyBean(String typeName) throws JavaModelException {
Set<IBean> beans = getBeans(typeName);
assertEquals("There should be the only bean with " + typeName + " type", 1, beans.size());
14 years, 3 months
JBoss Tools SVN: r20836 - in trunk: tests/features/org.jboss.tools.all.test.feature and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-03-15 17:11:04 -0400 (Mon, 15 Mar 2010)
New Revision: 20836
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF
trunk/tests/features/org.jboss.tools.all.test.feature/feature.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-6042 CDI JUnit tests are not included into nightly builds
CDI tests are included in build and JUnit tests execution
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF 2010-03-15 20:15:09 UTC (rev 20835)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF 2010-03-15 21:11:04 UTC (rev 20836)
@@ -14,7 +14,7 @@
org.jboss.tools.common.text.ext;bundle-version="2.0.0",
org.jboss.tools.tests;bundle-version="2.0.0",
org.eclipse.core.runtime;bundle-version="3.5.0",
- org.jboss.tools.cdi.text.ext;bundle-version="2.0.0",
+ org.jboss.tools.cdi.text.ext;bundle-version="1.0.0",
org.eclipse.jdt.ui;bundle-version="3.5.0",
org.eclipse.core.commands;bundle-version="3.5.0",
org.jboss.tools.cdi.core.test;bundle-version="1.0.0"
Modified: trunk/tests/features/org.jboss.tools.all.test.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.all.test.feature/feature.xml 2010-03-15 20:15:09 UTC (rev 20835)
+++ trunk/tests/features/org.jboss.tools.all.test.feature/feature.xml 2010-03-15 21:11:04 UTC (rev 20836)
@@ -305,4 +305,24 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.jboss.tools.cdi.core.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.cdi.text.ext.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.cdi.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
14 years, 3 months
JBoss Tools SVN: r20835 - in trunk/as/docs/reference/en-US: images/modules and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2010-03-15 16:15:09 -0400 (Mon, 15 Mar 2010)
New Revision: 20835
Modified:
trunk/as/docs/reference/en-US/images/modules/modules_3.png
trunk/as/docs/reference/en-US/images/modules/modules_4.png
trunk/as/docs/reference/en-US/images/perspective/dnd_toJBossServerView.png
trunk/as/docs/reference/en-US/images/perspective/filesets1.png
trunk/as/docs/reference/en-US/images/perspective/filesets3.png
trunk/as/docs/reference/en-US/images/perspective/filesets4.png
trunk/as/docs/reference/en-US/images/perspective/perspective_1.png
trunk/as/docs/reference/en-US/images/perspective/perspective_11.png
trunk/as/docs/reference/en-US/images/perspective/perspective_12.png
trunk/as/docs/reference/en-US/images/perspective/perspective_14.png
trunk/as/docs/reference/en-US/images/perspective/perspective_15.png
trunk/as/docs/reference/en-US/images/perspective/perspective_16.png
trunk/as/docs/reference/en-US/images/perspective/perspective_21a.png
trunk/as/docs/reference/en-US/images/perspective/perspective_22.png
trunk/as/docs/reference/en-US/images/perspective/perspective_25.png
trunk/as/docs/reference/en-US/images/perspective/perspective_8.png
trunk/as/docs/reference/en-US/images/perspective/userlibraryfileset1.png
trunk/as/docs/reference/en-US/images/quick_start/quick_start_1.png
trunk/as/docs/reference/en-US/images/quick_start/quick_start_2.png
trunk/as/docs/reference/en-US/images/quick_start/quick_start_3.png
trunk/as/docs/reference/en-US/images/quick_start/quick_start_5.png
trunk/as/docs/reference/en-US/images/tptp_support/tptp_support_1.png
trunk/as/docs/reference/en-US/master_output.xml
trunk/as/docs/reference/en-US/modules.xml
trunk/as/docs/reference/en-US/perspective.xml
trunk/as/docs/reference/en-US/quick_start.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-924 - Updated some screens and text to use regular server's view
Modified: trunk/as/docs/reference/en-US/images/modules/modules_3.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/modules/modules_4.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/perspective/dnd_toJBossServerView.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/perspective/filesets1.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/perspective/filesets3.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/perspective/filesets4.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/perspective/perspective_1.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/perspective/perspective_11.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/perspective/perspective_12.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/perspective/perspective_14.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/perspective/perspective_15.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/perspective/perspective_16.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/perspective/perspective_21a.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/perspective/perspective_22.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/perspective/perspective_25.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/perspective/perspective_8.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/perspective/userlibraryfileset1.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/quick_start/quick_start_1.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/quick_start/quick_start_2.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/quick_start/quick_start_3.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/quick_start/quick_start_5.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/tptp_support/tptp_support_1.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/master_output.xml
===================================================================
--- trunk/as/docs/reference/en-US/master_output.xml 2010-03-15 18:09:34 UTC (rev 20834)
+++ trunk/as/docs/reference/en-US/master_output.xml 2010-03-15 20:15:09 UTC (rev 20835)
@@ -100,7 +100,7 @@
<row>
<entry><para>JBoss AS Perspective</para></entry>
- <entry><para>It makes managing installed JBoss Server quite easy and includes the standard Console and Properties views, and specially added Project archives View and JBoss Server View for that purpose. </para></entry>
+ <entry><para>It makes managing installed JBoss Server quite easy and includes the standard Console and Properties views, and specially added Project archives View and Servers view for that purpose. </para></entry>
<entry>
<link linkend="perspective">JBoss AS perspective</link>
</entry>
@@ -142,7 +142,7 @@
<title>Starting JBoss Server</title>
<para>Starting <property moreinfo="none">JBoss Server</property> is quite simple. You can control the server
- behaviour with the help of a special toolbar in the <property moreinfo="none">JBoss Server View</property>
+ behaviour with the help of a special toolbar in the <property moreinfo="none">Servers</property> view
where you could <emphasis>
<property moreinfo="none">start</property>
</emphasis> it in a regular or debug mode, <emphasis>
@@ -154,7 +154,7 @@
</emphasis> to the server.</para>
<figure float="0">
- <title>JBoss Server Toolbar</title>
+ <title>Servers Toolbar</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/quick_start/quick_start_1.png"></imagedata>
@@ -162,11 +162,11 @@
</mediaobject>
</figure>
- <para>To launch the server click the green-with-white-arrow icon on the <property moreinfo="none">JBoss Server
- View </property>or right click server name in this view and select <emphasis>
+ <para>To launch the server click the green-with-white-arrow icon on the <property moreinfo="none">Servers
+ </property> view or right click server name in this view and select <emphasis>
<property moreinfo="none">Start</property>. </emphasis> If this view is not open, select
<emphasis><property moreinfo="none">Window > Show View > Other > Server >
- JBoss Server View</property>.</emphasis></para>
+ Servers</property>.</emphasis></para>
<figure float="0">
<title>Start JBoss Server</title>
@@ -184,7 +184,7 @@
<para>To stop the server, click the <emphasis>
<property moreinfo="none">Stop</property>
- </emphasis> icon in the <property moreinfo="none">JBoss Server View</property> or right click the server name
+ </emphasis> icon in the <property moreinfo="none">Servers</property> view or right click the server name
and press <emphasis><property moreinfo="none">Stop</property>.</emphasis></para>
<figure float="0">
@@ -199,8 +199,8 @@
<para>When the server is stopped you will see <emphasis>
<property moreinfo="none">Stopped</property>
</emphasis> state next to its name in the square brackets.</para>
- <para>Learn more about the <property moreinfo="none">JBoss Server View</property>
- <link linkend="JBossServerView">here</link>.</para>
+ <para>Learn more about the <property moreinfo="none">Servers</property> view
+ <link linkend="ServersView">here</link>.</para>
</section>
<section id="archiving">
@@ -296,7 +296,7 @@
</figure>
<para>You can deploy an existing application to a server by right-clicking the target defined
- server in the <property moreinfo="none">JBoss Servers View</property> and then selecting <emphasis><property moreinfo="none">Add and
+ server in the <property moreinfo="none">Servers</property> view and then selecting <emphasis><property moreinfo="none">Add and
Remove Projects</property></emphasis> from the context menu.</para>
<figure float="0">
@@ -719,21 +719,21 @@
perspective</property>, but it contains a few additional views. Two of the additional
views are standard views, specifically the <property moreinfo="none">Console view</property> and the
<property moreinfo="none">Properties view</property>. The other two views that are added are the
- <property moreinfo="none">Project archives view</property> and the <property moreinfo="none">JBoss Server
- View</property>.</para>
+ <property moreinfo="none">Project archives view</property> and the <property moreinfo="none">Servers
+ </property> view.</para>
- <section id="JBossServerView" role="updated">
+ <section id="ServersView" role="updated">
<?dbhtml filename="JBossServerView.html"?>
- <title>The JBoss Server View</title>
+ <title>The Servers view</title>
- <para>The <property moreinfo="none">JBoss Server View</property> is built on Common Navigator Framework
+ <para>The <property moreinfo="none">Servers</property> view is built on Common Navigator Framework
allowing extensions and is using label decorators what makes the UI enough compact
without loosing the vital information.</para>
- <para>Let's have a look at the <property moreinfo="none">JBoss Server View</property> and inspect
+ <para>Let's have a look at the <property moreinfo="none">Servers</property> view and inspect
in detail all parts it consists of. </para>
<figure float="0">
- <title>The JBoss Server View</title>
+ <title>The Servers view</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/perspective/perspective_1.png"></imagedata>
@@ -742,14 +742,14 @@
</figure>
<section id="jbossserver_view_toolbar">
- <title>JBoss Server View Toolbar</title>
- <para>In the right top corner of the <property moreinfo="none">JBoss Server View</property> there is a
+ <title>Servers view Toolbar</title>
+ <para>In the right top corner of the <property moreinfo="none">Servers</property> view there is a
special toolbar which provides a quick access to starting a server (in the debug
mode, run mode, or profile mode), restarting a server, stopping a server and a
possibility to publish to a server.</para>
<figure float="0">
- <title>The JBoss Server View Toolbar</title>
+ <title>The Servers view Toolbar</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/perspective/perspective_2.png"></imagedata>
@@ -777,13 +777,13 @@
</section>
<section id="jbossserver_view_structure">
- <title>JBoss Server View Structure</title>
- <para>The <property moreinfo="none">JBoss Server View</property> displays all declared servers as well
+ <title>Servers view Structure</title>
+ <para>The <property moreinfo="none">Servers</property> view displays all declared servers as well
as their current states (that is whether they are started or stopped) and statuses
in the square brackets next to a server name.</para>
<figure float="0">
- <title>The JBoss Server View</title>
+ <title>The Servers view</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/perspective/perspective_1.png"></imagedata>
@@ -993,7 +993,7 @@
</tgroup>
</table>
- <para>Under the server element in the <property moreinfo="none">JBoss Server View</property>, you can
+ <para>Under the server element in the <property moreinfo="none">Servers</property> view, you can
see currently deployed to the server modules and some server extensions which
provide the additional information on the server.</para>
@@ -1014,7 +1014,7 @@
<para>The <emphasis>
<property moreinfo="none">Filesets</property>
- </emphasis> category in the <property moreinfo="none">JBoss Server View</property> is intended
+ </emphasis> category in the <property moreinfo="none">Servers</property> view is intended
for files filtering.</para>
<para>To add a new file filter, right-click the <emphasis>
@@ -1063,7 +1063,7 @@
<para>After the filter is created, you can observe it by expanding the <emphasis>
<property moreinfo="none">Filesets</property>
- </emphasis> category in the <property moreinfo="none">JBoss Server View</property>.</para>
+ </emphasis> category in the <property moreinfo="none">Servers</property> view.</para>
<para>It's possible now to edit files directly from the <emphasis>
<property moreinfo="none">Filesets</property>
@@ -1164,7 +1164,7 @@
<property moreinfo="none">XML Configuration</property>
</emphasis> category makes possible to disable it. You can disable any category
in the bottom part of the <emphasis>
- <property moreinfo="none">JBoss Server View</property>.</emphasis> Look for them in the <emphasis>
+ <property moreinfo="none">Servers</property> view.</emphasis> Look for them in the <emphasis>
<property moreinfo="none">Inactive Categories</property>
</emphasis> afterwards to re-enable.</para>
@@ -1265,14 +1265,14 @@
</section>
<section id="dragndrop_to_jboss_server_view">
- <title>Drag-n-Drop to JBoss Server View</title>
+ <title>Drag-n-Drop to Servers view</title>
<para>Starting from 2.0.0.CR2 version of <property moreinfo="none">JBoss AS Tools</property> the
- <property moreinfo="none">JBoss Server View</property> supports drag-n-drop of deployable and
+ <property moreinfo="none">Servers</property> view supports drag-n-drop of deployable and
runnable projects/resources.</para>
<figure float="0">
- <title>Dragging to the JBoss Server View</title>
+ <title>Dragging to the Servers view</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/perspective/dnd_toJBossServerView.png"></imagedata>
@@ -2203,13 +2203,13 @@
</section>
<section>
- <title>Deploying with JBoss Server View</title>
- <para>As it has been already mentioned <property moreinfo="none">JBoss Server View</property> contains two
+ <title>Deploying with Servers view</title>
+ <para>As it has been already mentioned <property moreinfo="none">Servers</property> view contains two
parts: the top part that displays all defined servers and the bottom part which provides
categories with additional information. Thus, in this section we suggest two more ways
to deploy resources onto the server.</para>
<section>
- <title>Top part of JBoss Server View</title>
+ <title>Top part of Servers view</title>
<para>In the top part of the <property moreinfo="none">JBoss Servers View</property> like in the Servers
View you should right click on a server and select the <emphasis>
<property moreinfo="none">Add and Remove Projects</property>
@@ -2235,9 +2235,9 @@
</section>
<section>
- <title>Bottom part of JBoss Server View</title>
+ <title>Bottom part of Servers view</title>
<para>In the bottom part of <emphasis>
- <property moreinfo="none">JBoss Server View</property>
+ <property moreinfo="none">Servers</property> view
</emphasis> there is a category called <emphasis>
<property moreinfo="none">Modules</property>
</emphasis> which should display all currently-published modules on the server.
Modified: trunk/as/docs/reference/en-US/modules.xml
===================================================================
--- trunk/as/docs/reference/en-US/modules.xml 2010-03-15 18:09:34 UTC (rev 20834)
+++ trunk/as/docs/reference/en-US/modules.xml 2010-03-15 20:15:09 UTC (rev 20835)
@@ -99,16 +99,15 @@
</section>
<section>
- <title>Deploying with JBoss Server View</title>
- <para>As it has been already mentioned <property>JBoss Server View</property> contains two
+ <title>Deploying with Servers View</title>
+ <para>As it has been already mentioned <property>Servers</property> view contains two
parts: the top part that displays all defined servers and the bottom part which provides
categories with additional information. Thus, in this section we suggest two more ways
to deploy resources onto the server.</para>
<section>
- <title>Top part of JBoss Server View</title>
- <para>In the top part of the <property>JBoss Servers View</property> like in the Servers
- View you should right click on a server and select the <emphasis>
- <property>Add and Remove Projects</property>
+ <title>Top part of Servers view</title>
+ <para>In the top part of the <property>Servers</property> view you should right click on a server and select the <emphasis>
+ <property>Add and Remove</property>
</emphasis> menu item.</para>
<figure>
<title>Add and Remove Projects</title>
@@ -131,9 +130,9 @@
</section>
<section>
- <title>Bottom part of JBoss Server View</title>
+ <title>Bottom part of Servers view</title>
<para>In the bottom part of <emphasis>
- <property>JBoss Server View</property>
+ <property>Servers</property> view
</emphasis> there is a category called <emphasis>
<property>Modules</property>
</emphasis> which should display all currently-published modules on the server.
Modified: trunk/as/docs/reference/en-US/perspective.xml
===================================================================
--- trunk/as/docs/reference/en-US/perspective.xml 2010-03-15 18:09:34 UTC (rev 20834)
+++ trunk/as/docs/reference/en-US/perspective.xml 2010-03-15 20:15:09 UTC (rev 20835)
@@ -20,21 +20,21 @@
perspective</property>, but it contains a few additional views. Two of the additional
views are standard views, specifically the <property>Console view</property> and the
<property>Properties view</property>. The other two views that are added are the
- <property>Project archives view</property> and the <property>JBoss Server
- View</property>.</para>
+ <property>Project archives view</property> and the <property>Servers
+ </property> view.</para>
<section id="JBossServerView" role="updated">
<?dbhtml filename="JBossServerView.html"?>
- <title>The JBoss Server View</title>
+ <title>The Servers view</title>
- <para>The <property>JBoss Server View</property> is built on Common Navigator Framework
+ <para>The <property>Servers</property> view is built on Common Navigator Framework
allowing extensions and is using label decorators what makes the UI enough compact
without loosing the vital information.</para>
- <para>Let's have a look at the <property>JBoss Server View</property> and inspect
+ <para>Let's have a look at the <property>Servers</property> view and inspect
in detail all parts it consists of. </para>
<figure>
- <title>The JBoss Server View</title>
+ <title>The Servers view</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/perspective/perspective_1.png"/>
@@ -43,14 +43,14 @@
</figure>
<section id="jbossserver_view_toolbar">
- <title>JBoss Server View Toolbar</title>
- <para>In the right top corner of the <property>JBoss Server View</property> there is a
+ <title>Servers view Toolbar</title>
+ <para>In the right top corner of the <property>Servers</property> view there is a
special toolbar which provides a quick access to starting a server (in the debug
mode, run mode, or profile mode), restarting a server, stopping a server and a
possibility to publish to a server.</para>
<figure>
- <title>The JBoss Server View Toolbar</title>
+ <title>The Servers view Toolbar</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/perspective/perspective_2.png"/>
@@ -78,13 +78,13 @@
</section>
<section id="jbossserver_view_structure">
- <title>JBoss Server View Structure</title>
- <para>The <property>JBoss Server View</property> displays all declared servers as well
+ <title>Servers view Structure</title>
+ <para>The <property>Servers</property> view displays all declared servers as well
as their current states (that is whether they are started or stopped) and statuses
in the square brackets next to a server name.</para>
<figure>
- <title>The JBoss Server View</title>
+ <title>The Servers view</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/perspective/perspective_1.png"/>
@@ -294,7 +294,7 @@
</tgroup>
</table>
- <para>Under the server element in the <property>JBoss Server View</property>, you can
+ <para>Under the server element in the <property>Servers</property> view, you can
see currently deployed to the server modules and some server extensions which
provide the additional information on the server.</para>
@@ -315,7 +315,7 @@
<para>The <emphasis>
<property>Filesets</property>
- </emphasis> category in the <property>JBoss Server View</property> is intended
+ </emphasis> category in the <property>Servers</property> view is intended
for files filtering.</para>
<para>To add a new file filter, right-click the <emphasis>
@@ -364,7 +364,7 @@
<para>After the filter is created, you can observe it by expanding the <emphasis>
<property>Filesets</property>
- </emphasis> category in the <property>JBoss Server View</property>.</para>
+ </emphasis> category in the <property>Servers</property> view.</para>
<para>It's possible now to edit files directly from the <emphasis>
<property>Filesets</property>
@@ -465,7 +465,7 @@
<property>XML Configuration</property>
</emphasis> category makes possible to disable it. You can disable any category
in the bottom part of the <emphasis>
- <property>JBoss Server View</property>.</emphasis> Look for them in the <emphasis>
+ <property>Servers</property> view.</emphasis> Look for them in the <emphasis>
<property>Inactive Categories</property>
</emphasis> afterwards to re-enable.</para>
@@ -566,14 +566,14 @@
</section>
<section id="dragndrop_to_jboss_server_view">
- <title>Drag-n-Drop to JBoss Server View</title>
+ <title>Drag-n-Drop to Servers view</title>
<para>Starting from 2.0.0.CR2 version of <property>JBoss AS Tools</property> the
- <property>JBoss Server View</property> supports drag-n-drop of deployable and
+ <property>Servers</property> view supports drag-n-drop of deployable and
runnable projects/resources.</para>
<figure>
- <title>Dragging to the JBoss Server View</title>
+ <title>Dragging to the Servers view</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/perspective/dnd_toJBossServerView.png"/>
Modified: trunk/as/docs/reference/en-US/quick_start.xml
===================================================================
--- trunk/as/docs/reference/en-US/quick_start.xml 2010-03-15 18:09:34 UTC (rev 20834)
+++ trunk/as/docs/reference/en-US/quick_start.xml 2010-03-15 20:15:09 UTC (rev 20835)
@@ -35,7 +35,7 @@
<row>
<entry><para>JBoss AS Perspective</para></entry>
- <entry><para>It makes managing installed JBoss Server quite easy and includes the standard Console and Properties views, and specially added Project archives View and JBoss Server View for that purpose. </para></entry>
+ <entry><para>It makes managing installed JBoss Server quite easy and includes the standard Console and Properties views, and specially added Project archives View and Servers view for that purpose. </para></entry>
<entry>
<link linkend="perspective">JBoss AS perspective</link>
</entry>
@@ -77,7 +77,7 @@
<title>Starting JBoss Server</title>
<para>Starting <property>JBoss Server</property> is quite simple. You can control the server
- behaviour with the help of a special toolbar in the <property>JBoss Server View</property>
+ behaviour with the help of a special toolbar in the <property>Servers</property> view
where you could <emphasis>
<property>start</property>
</emphasis> it in a regular or debug mode, <emphasis>
@@ -89,7 +89,7 @@
</emphasis> to the server.</para>
<figure>
- <title>JBoss Server Toolbar</title>
+ <title>Servers Toolbar</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/quick_start/quick_start_1.png"/>
@@ -97,11 +97,11 @@
</mediaobject>
</figure>
- <para>To launch the server click the green-with-white-arrow icon on the <property>JBoss Server
- View </property>or right click server name in this view and select <emphasis>
+ <para>To launch the server click the green-with-white-arrow icon on the <property>Servers
+ </property> view or right click server name in this view and select <emphasis>
<property>Start</property>. </emphasis> If this view is not open, select
<emphasis><property>Window > Show View > Other > Server >
- JBoss Server View</property>.</emphasis></para>
+ Servers</property>.</emphasis></para>
<figure>
<title>Start JBoss Server</title>
@@ -119,7 +119,7 @@
<para>To stop the server, click the <emphasis>
<property>Stop</property>
- </emphasis> icon in the <property>JBoss Server View</property> or right click the server name
+ </emphasis> icon in the <property>Servers</property> view or right click the server name
and press <emphasis><property>Stop</property>.</emphasis></para>
<figure>
@@ -134,7 +134,7 @@
<para>When the server is stopped you will see <emphasis>
<property>Stopped</property>
</emphasis> state next to its name in the square brackets.</para>
- <para>Learn more about the <property>JBoss Server View</property>
+ <para>Learn more about the <property>Servers</property> view
<link linkend="JBossServerView">here</link>.</para>
</section>
@@ -231,7 +231,7 @@
</figure>
<para>You can deploy an existing application to a server by right-clicking the target defined
- server in the <property>JBoss Servers View</property> and then selecting <emphasis><property>Add and
+ server in the <property>Servers</property> view and then selecting <emphasis><property>Add and
Remove Projects</property></emphasis> from the context menu.</para>
<figure>
14 years, 3 months