JBoss Tools SVN: r33595 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-04 13:58:27 -0400 (Thu, 04 Aug 2011)
New Revision: 33595
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotyped.java
Log:
https://issues.jboss.org/browse/JBIDE-9453
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotyped.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotyped.java 2011-08-04 17:39:11 UTC (rev 33594)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotyped.java 2011-08-04 17:58:27 UTC (rev 33595)
@@ -15,7 +15,7 @@
import org.jboss.tools.common.java.IAnnotated;
/**
- * Represents an element that can has stereotypes.
+ * Represents an element that can have stereotypes.
*
* @author Alexey Kazakov
*/
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33594 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-04 13:39:11 -0400 (Thu, 04 Aug 2011)
New Revision: 33594
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/CDIProject.java
Log:
JBIDE-9452
https://issues.jboss.org/browse/JBIDE-9452
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 2011-08-04 17:31:24 UTC (rev 33593)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2011-08-04 17:39:11 UTC (rev 33594)
@@ -183,6 +183,10 @@
result.add(d);
}
}
+ IAnnotationDeclaration d = findNamedAnnotation();
+ if(d instanceof IQualifierDeclaration && !result.contains(d)) {
+ result.add((IQualifierDeclaration)d);
+ }
}
return result;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-08-04 17:31:24 UTC (rev 33593)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-08-04 17:39:11 UTC (rev 33594)
@@ -357,6 +357,8 @@
}
boolean delegateInjectionPoint = injectionPoint.isDelegate();
+ String injectionPointName = injectionPoint.getName();
+
for (IBean b: beans) {
if(b instanceof ClassBean && !(b instanceof IBuiltInBean)) {
IType bType = b.getBeanClass();
@@ -383,6 +385,10 @@
if(delegateInjectionPoint && b == injectionPoint.getClassBean()) {
continue;
}
+ if(injectionPointName != null && injectionPointName.equals(b.getName())) {
+ //
+ continue;
+ }
Set<IQualifierDeclaration> qsb = b.getQualifierDeclarations(true);
if(areMatchingQualifiers(qsb, qs)) {
result.add(b);
@@ -524,9 +530,13 @@
private static String getAnnotationDeclarationKey(IAnnotationDeclaration d, Set<IMethod> ignoredMembers) throws CoreException {
Set<IMethod> nb = ignoredMembers == null ? new HashSet<IMethod>() : ignoredMembers;
IType type = d.getType();
+ StringBuffer result = new StringBuffer();
+ result.append(type.getFullyQualifiedName());
+ if(CDIConstants.NAMED_QUALIFIER_TYPE_NAME.equals(type.getFullyQualifiedName())) {
+ //Declared name is excluded from comparison; names should be compared by invoking getName() method.
+ return result.toString();
+ }
IMethod[] ms = type.getMethods();
- StringBuffer result = new StringBuffer();
- result.append(type.getFullyQualifiedName());
if(ms.length > 0) {
TreeMap<String, String> values = new TreeMap<String, String>();
IMemberValuePair[] ps = d.getMemberValuePairs();
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33593 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-04 13:31:24 -0400 (Thu, 04 Aug 2011)
New Revision: 33593
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-9453
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-08-04 16:53:56 UTC (rev 33592)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-08-04 17:31:24 UTC (rev 33593)
@@ -401,10 +401,7 @@
* @return
*/
public static IAnnotationDeclaration getQualifierDeclaration(IBean bean, String qualifierTypeName) {
- IAnnotationDeclaration declaration = bean.getAnnotation(qualifierTypeName);
- if (declaration == null) {
- declaration = getQualifiedStereotypeDeclaration(bean, qualifierTypeName);
- }
+ IAnnotationDeclaration declaration = getQualifiedStereotypeDeclaration(bean, qualifierTypeName);
if(declaration == null) {
declaration = getQualifiedSpecializesDeclaration(bean, qualifierTypeName);
}
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33592 - in trunk/maven: plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators and 16 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-08-04 12:53:56 -0400 (Thu, 04 Aug 2011)
New Revision: 33592
Added:
trunk/maven/plugins/org.jboss.tools.maven.ui/.settings/org.eclipse.m2e.core.prefs
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/src/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/src/main/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/src/main/webapp/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/src/main/webapp/WEB-INF/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/src/main/webapp/WEB-INF/web.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/components.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml.l4t
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/web.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/SeamConfiguratorTest.java
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/AbstractMavenConfiguratorTest.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java
Log:
JBIDE-9454 : Deactivate adding of Faces servlet for all JSF versions, as it completely overwrites the project web.xml when m2e-wtp 0.13.x is used
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml 2011-08-04 16:32:42 UTC (rev 33591)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml 2011-08-04 16:53:56 UTC (rev 33592)
@@ -32,13 +32,13 @@
soft="true"
version="[1.0"/>
<requires
- facet="jst.appclient"
- soft="true"
- version="[1.2"/>
+ facet="jst.appclient"
+ soft="true"
+ version="[1.2"/>
<requires
- facet="jst.connector"
- soft="true"
- version="[1.0"/>
+ facet="jst.connector"
+ soft="true"
+ version="[1.0"/>
</or>
</constraint>
</project-facet-version>
@@ -235,4 +235,5 @@
</enablement>
</provider>
</extension>
+
</plugin>
Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2011-08-04 16:32:42 UTC (rev 33591)
+++ trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2011-08-04 16:53:56 UTC (rev 33592)
@@ -189,7 +189,7 @@
&& !generatedFacesConfig.exists();
IProjectFacetVersion facetVersion = null;
- boolean configureServlet = true;
+ boolean configureServlet = false;//Fix for JBIDE-9454, where existing web.xml is completely overwritten.
if (jsfVersionString.startsWith(JSF_VERSION_1_1)) {
facetVersion = JSF_FACET_VERSION_1_1;
}
@@ -198,7 +198,7 @@
}
else if (jsfVersionString.startsWith(JSF_VERSION_2_0)) {
facetVersion = JSF_FACET_VERSION_2_0;
- configureServlet = configureWebxml();
+ //configureServlet = configureWebxml();
}
if (facetVersion != null) {
Added: trunk/maven/plugins/org.jboss.tools.maven.ui/.settings/org.eclipse.m2e.core.prefs
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/.settings/org.eclipse.m2e.core.prefs (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/.settings/org.eclipse.m2e.core.prefs 2011-08-04 16:53:56 UTC (rev 33592)
@@ -0,0 +1,5 @@
+#Tue Jun 28 11:43:06 CEST 2011
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java 2011-08-04 16:32:42 UTC (rev 33591)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java 2011-08-04 16:53:56 UTC (rev 33592)
@@ -83,7 +83,6 @@
final SelectProfilesDialog dialog = new SelectProfilesDialog(window.getShell(),
facades,
sharedProfiles);
- //dialog.setBlockOnOpen(false); doesn't work
if(dialog.open() == Window.OK) {
WorkspaceJob job = new WorkspaceJob(Messages.ProfileManager_Updating_maven_profiles) {
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties 2011-08-04 16:32:42 UTC (rev 33591)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties 2011-08-04 16:53:56 UTC (rev 33592)
@@ -26,7 +26,7 @@
ConfiguratorPreferencePage_Configure_JBoss_Portlet_Core_facet=JBoss Portlet Core facet
ConfiguratorPreferencePage_Configure_JBoss_Seam_Portlet_facet=JBoss Seam Portlet facet
ConfiguratorPreferencePage_Configure_JSF_facet=JSF facet
-ConfiguratorPreferencePage_Configure_Webxml_JSF20=web.xml for JSF 2.0 facet
+ConfiguratorPreferencePage_Configure_Webxml_JSF20=web.xml for JSF facet
ConfiguratorPreferencePage_Configure_CDI_facet=CDI facet
ConfiguratorPreferencePage_Configure_Hibernate=Hibernate
ConfiguratorPreferencePage_Configure_Seam_Artifacts=Seam Artifacts (view folder, model source folder, package ...)
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/pom.xml 2011-08-04 16:53:56 UTC (rev 33592)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools.maven.tests</groupId>
+ <artifactId>seam-webxml</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <version>2.2.2.Final</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ <configuration>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <!-- You should seriously consider using a repository manager or declare repositories in your settings.xml.
+ See http://www.sonatype.com/people/2009/02/why-putting-repositories-in-your-p... -->
+ <repository>
+ <!-- The JBoss Public repository is a composite repository of several major repositories.
+ See http://community.jboss.org/wiki/MavenGettingStarted-Users -->
+ <id>jboss-public-repository</id>
+ <url>http://repository.jboss.org/nexus/content/groups/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <!-- You can disable snapshot resolution to speed up your builds -->
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+</project>
+
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seam-webxml/src/main/webapp/WEB-INF/web.xml 2011-08-04 16:53:56 UTC (rev 33592)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <display-name>seam-web</display-name>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/pom.xml 2011-08-04 16:53:56 UTC (rev 33592)
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <parent>
+ <artifactId>samples</artifactId>
+ <groupId>org.richfaces</groupId>
+ <version>3.3.3.Final</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>seamIntegration</artifactId>
+ <packaging>war</packaging>
+ <name>seamIntegration Maven Webapp</name>
+ <properties>
+ <seam.version>2.1.2</seam.version>
+ </properties>
+ <build>
+ <finalName>seamIntegration</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <!--
+ <webResources> <resource> <directory>${seamHome}</directory>
+ <targetPath>WEB-INF/lib</targetPath> <includes>
+ <include>jboss-seam.jar</include>
+ <include>jboss-seam-ui.jar</include>
+ <include>jboss-seam-debug.jar</include> <include>
+ jboss-seam-remoting.jar </include> <include> jboss-seam-pdf.jar
+ </include> </includes> </resource> <resource>
+ <directory>${seamHome}/lib</directory>
+ <targetPath>WEB-INF/lib</targetPath> <includes>
+ <include>jboss-el.jar</include> </includes> </resource>
+ </webResources>
+ -->
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.7</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>3.4.0.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ <version>1.4.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>3.1.0.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <version>${seam.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.el</groupId>
+ <artifactId>jboss-el</artifactId>
+ <version>2.0.2.CR1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui</artifactId>
+ <version>${seam.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ioc</artifactId>
+ <version>${seam.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-debug</artifactId>
+ <version>${seam.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-api</artifactId>
+ <version>1.2.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-impl</artifactId>
+ <version>1.2.10</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <!-- You should seriously consider using a repository manager or declare repositories in your settings.xml.
+ See http://www.sonatype.com/people/2009/02/why-putting-repositories-in-your-p... -->
+ <repository>
+ <!-- The JBoss Public repository is a composite repository of several major repositories.
+ See http://community.jboss.org/wiki/MavenGettingStarted-Users -->
+ <id>jboss-public-repository</id>
+ <url>http://repository.jboss.org/nexus/content/groups/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <!-- You can disable snapshot resolution to speed up your builds -->
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+</project>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/components.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/components.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/components.xml 2011-08-04 16:53:56 UTC (rev 33592)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components xmlns="http://jboss.com/products/seam/components"
+ xmlns:core="http://jboss.com/products/seam/core"
+ xmlns:persistence="http://jboss.com/products/seam/persistence"
+ xmlns:transaction="http://jboss.com/products/seam/transaction"
+ xmlns:drools="http://jboss.com/products/seam/drools"
+ xmlns:bpm="http://jboss.com/products/seam/bpm"
+ xmlns:security="http://jboss.com/products/seam/security"
+ xmlns:mail="http://jboss.com/products/seam/mail"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
+ http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd
+ http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd
+ http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.0.xsd
+ http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd
+ http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd
+ http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
+
+ <core:init debug="true" /><!-- transaction-management-enabled="false" -->
+
+ <core:manager concurrent-request-timeout="500"
+ conversation-timeout="120000" conversation-id-parameter="cid" />
+
+ <transaction:entity-transaction entity-manager="#{entityManager}" />
+
+
+ <persistence:entity-manager-factory name="exampleDatabase" />
+
+
+
+ <persistence:managed-persistence-context name="entityManager"
+ auto-create="true" entity-manager-factory="#{exampleDatabase}" />
+
+
+ <!--
+
+ <persistence:managed-persistence-context name="entityManager"
+ auto-create="true"
+ entity-manager-factory="#{seamIntegrationEntityManagerFactory}"/>
+
+ <persistence:entity-manager-factory name="seamIntegrationEntityManagerFactory"
+ persistence-unit-name="seamIntegration"/>
+
+ <drools:rule-base name="securityRules">
+ <drools:rule-files><value>/security.drl</value></drools:rule-files>
+ </drools:rule-base>
+
+ <security:identity authenticate-method="#{authenticator.authenticate}"
+ security-rules="#{securityRules}"
+ remember-me="true"/>
+
+ <event type="org.jboss.seam.notLoggedIn">
+ <action expression="#{redirect.captureCurrentView}"/>
+ </event>
+ <event type="org.jboss.seam.postAuthenticate">
+ <action expression="#{redirect.returnToCapturedView}"/>
+ </event>
+
+ <mail:mail-session host="localhost" port="2525" username="test" password="test" />
+
+ -->
+ <!-- For use with jBPM pageflow or process management -->
+ <!--
+ <bpm:jbpm>
+ <bpm:process-definitions></bpm:process-definitions>
+ <bpm:pageflow-definitions></bpm:pageflow-definitions>
+ </bpm:jbpm>
+ -->
+
+</components>
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml 2011-08-04 16:53:56 UTC (rev 33592)
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<faces-config version="1.2"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+
+ <application>
+ <message-bundle>messages</message-bundle>
+ <locale-config>
+ <default-locale>en</default-locale>
+ </locale-config>
+ <!-- Disabled when using Ajax4JSF -->
+ <!--
+ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
+ -->
+ <default-render-kit-id>
+ org.apache.myfaces.trinidad.core
+ </default-render-kit-id>
+ </application>
+</faces-config>
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml.l4t
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml.l4t (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml.l4t 2011-08-04 16:53:56 UTC (rev 33592)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PROCESS ENTITY="JSFProcess"/>
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/seamIntegration/src/main/webapp/WEB-INF/web.xml 2011-08-04 16:53:56 UTC (rev 33592)
@@ -0,0 +1,98 @@
+<?xml version="1.0" ?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+
+ <!-- Ajax4jsf -->
+ <!--
+ <context-param> <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
+ <param-value>com.sun.facelets.FaceletViewHandler</param-value>
+ </context-param>
+ -->
+ <context-param>
+ <param-name>org.apache.myfaces.trinidad.ALTERNATE_VIEW_HANDLER</param-name>
+ <param-value>com.sun.facelets.FaceletViewHandler</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.ajax4jsf.SKIN</param-name>
+ <param-value>blueSky</param-value>
+ </context-param>
+ <context-param>
+ <param-name>facelets.VIEW_MAPPINGS</param-name>
+ <param-value>*.xhtml</param-value>
+ </context-param>
+
+ <!-- Seam -->
+ <listener>
+ <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
+ </listener>
+ <filter>
+ <filter-name>Seam Filter</filter-name>
+ <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>Seam Filter</filter-name>
+ <servlet-name>Faces Servlet</servlet-name>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>ERROR</dispatcher>
+ </filter-mapping>
+ <filter>
+ <filter-name>trinidad</filter-name>
+ <filter-class>org.apache.myfaces.trinidad.webapp.TrinidadFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>trinidad</filter-name>
+ <!-- This assumes that the FacesServlet has been registered -->
+ <!-- under the name "faces" -->
+ <servlet-name>Faces Servlet</servlet-name>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>ERROR</dispatcher>
+ </filter-mapping>
+ <servlet>
+ <servlet-name>Seam Resource Servlet</servlet-name>
+ <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Seam Resource Servlet</servlet-name>
+ <url-pattern>/seam/resource/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- Facelets development mode (disable in production) -->
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+ <!-- JSF -->
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.seam</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
+ <servlet>
+ <servlet-name>resources</servlet-name>
+ <servlet-class>org.apache.myfaces.trinidad.webapp.ResourceServlet</servlet-class>
+ </servlet>
+ <!-- This cannot be configured currently -->
+ <servlet-mapping>
+ <servlet-name>resources</servlet-name>
+ <url-pattern>/adf/*</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/AbstractMavenConfiguratorTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/AbstractMavenConfiguratorTest.java 2011-08-04 16:32:42 UTC (rev 33591)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/AbstractMavenConfiguratorTest.java 2011-08-04 16:53:56 UTC (rev 33592)
@@ -15,6 +15,8 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jst.common.project.facet.core.JavaFacet;
import org.eclipse.m2e.core.MavenPlugin;
import org.eclipse.m2e.core.project.IProjectConfigurationManager;
@@ -71,18 +73,18 @@
if (newPomName != null) {
copyContent(project, newPomName, "pom.xml");
}
-
+ IProgressMonitor mon = new NullProgressMonitor();
IProjectConfigurationManager configurationManager = MavenPlugin.getProjectConfigurationManager();
ResolverConfiguration configuration = new ResolverConfiguration();
- configurationManager.enableMavenNature(project, configuration, monitor);
- configurationManager.updateProjectConfiguration(project, monitor);
- waitForJobsToComplete();
+ configurationManager.enableMavenNature(project, configuration, mon);
+ configurationManager.updateProjectConfiguration(project, mon);
+ waitForJobsToComplete(mon);
- project.build(IncrementalProjectBuilder.FULL_BUILD, monitor);
+ project.build(IncrementalProjectBuilder.FULL_BUILD, mon);
if (waitTime > 0) {
Thread.sleep(waitTime);
}
- waitForJobsToComplete();
+ waitForJobsToComplete(mon);
}
protected void updateProject(IProject project) throws Exception {
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java 2011-08-04 16:32:42 UTC (rev 33591)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java 2011-08-04 16:53:56 UTC (rev 33592)
@@ -4,6 +4,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.m2e.core.project.ResolverConfiguration;
import org.eclipse.m2e.tests.common.WorkspaceHelpers;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
@@ -24,7 +25,7 @@
"jsf-myfaces/pom.xml",
"jsf-jsfapi-12/pom.xml"},
new ResolverConfiguration());
- waitForJobsToComplete();
+ waitForJobsToComplete(new NullProgressMonitor());
IProject mojarra = projects[0];
assertNoErrors(mojarra);
assertIsJSFProject(mojarra, JSFProjectConfigurator.JSF_FACET_VERSION_2_0);
@@ -54,7 +55,7 @@
String webxmlRelPath = "src/main/webapp/WEB-INF/web.xml";
IProject jsfProject = importProject(projectLocation+"/pom.xml");
- waitForJobsToComplete();
+ waitForJobsToComplete(new NullProgressMonitor());
assertIsJSFProject(jsfProject, JSFProjectConfigurator.JSF_FACET_VERSION_2_0);
IFile webXml = jsfProject.getFile(webxmlRelPath);
@@ -67,7 +68,7 @@
public void testJBIDE9455_errorMarkers() throws Exception {
String projectLocation = "projects/jsf/jsf-error";
IProject jsfProject = importProject(projectLocation+"/pom.xml");
- waitForJobsToComplete();
+ waitForJobsToComplete(new NullProgressMonitor());
IFacetedProject facetedProject = ProjectFacetsManager.create(jsfProject);
assertNotNull(jsfProject.getName() + " is not a faceted project", facetedProject);
assertFalse("JSF Facet should be missing", facetedProject.hasProjectFacet(JSFProjectConfigurator.JSF_FACET));
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/SeamConfiguratorTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/SeamConfiguratorTest.java (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/SeamConfiguratorTest.java 2011-08-04 16:53:56 UTC (rev 33592)
@@ -0,0 +1,40 @@
+package org.jboss.tools.maven.configurators.tests;
+
+import java.io.File;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.jboss.tools.maven.jsf.configurators.JSFProjectConfigurator;
+import org.junit.Test;
+
+@SuppressWarnings("restriction")
+public class SeamConfiguratorTest extends AbstractMavenConfiguratorTest {
+
+ @Test
+ public void testJBIDE9454_webXml_overwrite() throws Exception {
+ IProject project = importAndCheckSeamProject("seam-webxml");
+ assertIsJSFProject(project, JSFProjectConfigurator.JSF_FACET_VERSION_1_2);
+ }
+
+ @Test
+ public void testJBIDE6228_webXml_changed_richfaces() throws Exception {
+ IProject project = importAndCheckSeamProject("seamIntegration");
+ assertIsJSFProject(project, JSFProjectConfigurator.JSF_FACET_VERSION_1_2);
+ }
+
+ protected IProject importAndCheckSeamProject(String projectName) throws Exception {
+ String projectLocation = "projects/seam/"+projectName;
+ String webxmlRelPath = "src/main/webapp/WEB-INF/web.xml";
+
+ IProject seamProject = importProject(projectLocation+"/pom.xml");
+ waitForJobsToComplete();
+ assertNoErrors(seamProject);
+
+ IFile webXml = seamProject.getFile(webxmlRelPath);
+ assertTrue(webXml.exists());
+ File originalWebXml = new File(projectLocation, webxmlRelPath);
+ assertEquals("web.xml content changed ", toString(originalWebXml), toString(webXml));
+ return seamProject;
+ }
+
+}
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33591 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-04 12:32:42 -0400 (Thu, 04 Aug 2011)
New Revision: 33591
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java
Log:
JBIDE-9452
https://issues.jboss.org/browse/JBIDE-9452
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java 2011-08-04 16:31:53 UTC (rev 33590)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java 2011-08-04 16:32:42 UTC (rev 33591)
@@ -134,4 +134,7 @@
return null;
}
+ public String getName() {
+ return null;
+ }
}
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33590 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-04 12:31:53 -0400 (Thu, 04 Aug 2011)
New Revision: 33590
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java
Log:
JBIDE-9452
https://issues.jboss.org/browse/JBIDE-9452
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 2011-08-04 16:30:57 UTC (rev 33589)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2011-08-04 16:31:53 UTC (rev 33590)
@@ -73,9 +73,9 @@
IAnnotationDeclaration getInjectAnnotation();
/**
- * Returns name declared by @Named.
+ * Returns name declared by @Named or null if declaration is missing.
*
- * @return name declared by @Named
+ * @return name declared by @Named or null if declaration is missing
*/
public String getName();
}
\ No newline at end of file
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33589 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-04 12:30:57 -0400 (Thu, 04 Aug 2011)
New Revision: 33589
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/internal/core/impl/BeanMember.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java
Log:
JBIDE-9452
https://issues.jboss.org/browse/JBIDE-9452
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 2011-08-04 15:45:02 UTC (rev 33588)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2011-08-04 16:30:57 UTC (rev 33589)
@@ -71,4 +71,11 @@
* @return the @Inject annotation declaration.
*/
IAnnotationDeclaration getInjectAnnotation();
+
+ /**
+ * Returns name declared by @Named.
+ *
+ * @return name declared by @Named
+ */
+ public String getName();
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2011-08-04 15:45:02 UTC (rev 33588)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2011-08-04 16:30:57 UTC (rev 33589)
@@ -42,6 +42,17 @@
return (BeanMemberDefinition)definition;
}
+ public String getName() {
+ AnnotationDeclaration d = getDefinition().getNamedAnnotation();
+ if(d != null) {
+ Object n = d.getMemberValue(null);
+ if(n != null) {
+ return n.toString();
+ }
+ }
+ return null;
+ }
+
protected void setMember(IJavaElement member) {
try {
String returnType = null;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2011-08-04 15:45:02 UTC (rev 33588)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2011-08-04 16:30:57 UTC (rev 33589)
@@ -32,6 +32,18 @@
return super.getType();
}
+ public String getName() {
+ AnnotationDeclaration d = getDefinition().getNamedAnnotation();
+ if(d != null) {
+ Object n = d.getMemberValue(null);
+ if(n != null && n.toString().length() > 0) {
+ return n.toString();
+ }
+ return field.getElementName();
+ }
+ return null;
+ }
+
public IParametedType getJavaMemberType() {
return super.getType();
}
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33588 - in trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf: jsf-webxml and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-08-04 11:45:02 -0400 (Thu, 04 Aug 2011)
New Revision: 33588
Added:
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-webxml/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-webxml/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-webxml/src/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-webxml/src/main/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-webxml/src/main/webapp/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-webxml/src/main/webapp/WEB-INF/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-webxml/src/main/webapp/WEB-INF/web.xml
Log:
JBIDE-9455 : add missing test project
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-webxml/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-webxml/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-webxml/pom.xml 2011-08-04 15:45:02 UTC (rev 33588)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools.maven.tests</groupId>
+ <artifactId>jsf-webxml</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <!-- not in central, hence requires the JBoss repo -->
+ <artifactId>jsf-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ <configuration>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <!-- You should seriously consider using a repository manager or declare repositories in your settings.xml.
+ See http://www.sonatype.com/people/2009/02/why-putting-repositories-in-your-p... -->
+ <repository>
+ <!-- The JBoss Public repository is a composite repository of several major repositories.
+ See http://community.jboss.org/wiki/MavenGettingStarted-Users -->
+ <id>jboss-public-repository</id>
+ <url>http://repository.jboss.org/nexus/content/groups/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <!-- You can disable snapshot resolution to speed up your builds -->
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+</project>
+
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-webxml/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-webxml/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-webxml/src/main/webapp/WEB-INF/web.xml 2011-08-04 15:45:02 UTC (rev 33588)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <display-name>jsf-webxml</display-name>
+ <!-- This is a nice comment -->
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33587 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test: src/org/jboss/tools/cdi/seam/core/test/international and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-08-04 11:05:54 -0400 (Thu, 04 Aug 2011)
New Revision: 33587
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamResourceBundlesTest.java
Log:
JBIDE-9288
Open On for bundle messages doesn't work for CDI projects with International Module enabled
JUnit Test case is added
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/META-INF/MANIFEST.MF 2011-08-04 12:50:56 UTC (rev 33586)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/META-INF/MANIFEST.MF 2011-08-04 15:05:54 UTC (rev 33587)
@@ -20,5 +20,7 @@
org.jboss.tools.common.base.test;bundle-version="3.3.0",
org.eclipse.jface.text;bundle-version="3.7.0",
org.jboss.tools.common.el.core;bundle-version="3.3.0",
- org.jboss.tools.common.text.ext;bundle-version="3.3.0"
+ org.jboss.tools.common.text.ext;bundle-version="3.3.0",
+ org.jboss.tools.jst.text.ext;bundle-version="3.3.0",
+ org.jboss.tools.jst.text.ext.test;bundle-version="3.3.0"
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamResourceBundlesTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamResourceBundlesTest.java 2011-08-04 12:50:56 UTC (rev 33586)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamResourceBundlesTest.java 2011-08-04 15:05:54 UTC (rev 33587)
@@ -11,6 +11,7 @@
package org.jboss.tools.cdi.seam.core.test.international;
import java.io.File;
+import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.resources.IFile;
@@ -31,6 +32,11 @@
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.jst.jsp.test.TestUtil;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
+import org.jboss.tools.jst.text.ext.hyperlink.ELHyperlink;
+import org.jboss.tools.jst.text.ext.hyperlink.ELHyperlinkDetector;
+import org.jboss.tools.jst.text.ext.test.HyperlinkTestUtil;
+import org.jboss.tools.jst.text.ext.test.HyperlinkTestUtil.TestHyperlink;
+import org.jboss.tools.jst.text.ext.test.HyperlinkTestUtil.TestRegion;
import org.jboss.tools.jst.web.kb.PageContextFactory;
import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
import org.jboss.tools.test.util.JobUtils;
@@ -153,9 +159,22 @@
caTest.checkProposals(PAGE_NAME, "value=\"#{", 9, resourceBundleNames, false);
caTest.checkProposals(PAGE_NAME, "value=\"#{bundles.messages.", 26, defaultResourceBundleNameProperties, false);
caTest.checkProposals(PAGE_NAME, "value=\"#{bundles.messages.", 26, germanResourceBundleNameProperties, false);
-
}
+ /**
+ * The method tests CA on CDI Seam International Module Resource Bundles
+ */
+ public void testSeamInternationalHyperlinks() throws Exception {
+ assertTrue(errMessage, bReadyForTesting);
+
+ // Perform Hyperlink test
+ ArrayList<TestRegion> regionList = new ArrayList<TestRegion>();
+ regionList.add(new TestRegion(381, 15, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open bundle 'messages'", null)}));
+ regionList.add(new TestRegion(398, 10, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'home_header' of bundle 'messages'", null)}));
+
+ HyperlinkTestUtil.checkRegions(tckProject, PAGE_NAME, regionList, new ELHyperlinkDetector());
+ }
+
private boolean setUpSeamInternationalLibraryAndResourceBundle() throws Exception {
Bundle b = Platform.getBundle(CDISeamCoreAllTests.PLUGIN_ID);
String projectPath = tckProject.getLocation().toOSString();
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33586 - in trunk/maven: plugins/org.jboss.tools.maven.jsf/.settings and 10 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-08-04 08:50:56 -0400 (Thu, 04 Aug 2011)
New Revision: 33586
Added:
trunk/maven/plugins/org.jboss.tools.maven.jsf/.settings/org.eclipse.m2e.core.prefs
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/MavenJSFConstants.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-error/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-error/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-error/src/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-error/src/main/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-error/src/main/webapp/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-error/src/main/webapp/WEB-INF/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-error/src/main/webapp/WEB-INF/good-web.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-error/src/main/webapp/WEB-INF/web.xml
Removed:
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/requirements.properties
Modified:
trunk/maven/plugins/org.jboss.tools.maven.jsf/plugin.properties
trunk/maven/plugins/org.jboss.tools.maven.jsf/plugin.xml
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/AbstractMavenConfiguratorTest.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java
Log:
JBIDE-9455 : add error markers for JSF Facet unsatisfied constraints
Added: trunk/maven/plugins/org.jboss.tools.maven.jsf/.settings/org.eclipse.m2e.core.prefs
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jsf/.settings/org.eclipse.m2e.core.prefs (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.jsf/.settings/org.eclipse.m2e.core.prefs 2011-08-04 12:50:56 UTC (rev 33586)
@@ -0,0 +1,5 @@
+#Tue Jun 28 11:43:06 CEST 2011
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/plugin.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jsf/plugin.properties 2011-08-04 12:45:40 UTC (rev 33585)
+++ trunk/maven/plugins/org.jboss.tools.maven.jsf/plugin.properties 2011-08-04 12:50:56 UTC (rev 33586)
@@ -1,3 +1,5 @@
Bundle-Vendor = JBoss by Red Hat
Bundle-Name = JBoss Maven JSF Configurator
JSF_Project_configurator = JSF
+Maven_Configuration_Problem=Maven Configuration Problem
+Maven_Configuration_Problems=Maven Configuration Problems
Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/plugin.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jsf/plugin.xml 2011-08-04 12:45:40 UTC (rev 33585)
+++ trunk/maven/plugins/org.jboss.tools.maven.jsf/plugin.xml 2011-08-04 12:50:56 UTC (rev 33586)
@@ -21,4 +21,22 @@
name="%JSF_Project_configurator"
secondaryTo="org.maven.ide.eclipse.configuration.wtp.configurator"/>
</extension>
+
+ <extension point="org.eclipse.core.resources.markers"
+ id="org.jbosstools.maven.configuration.jsf"
+ name="%Maven_Configuration_Problem">
+ <super type="org.eclipse.m2e.core.maven2Problem.configuration"/>
+ <persistent value="true"/>
+ </extension>
+
+ <extension
+ point="org.eclipse.ui.ide.markerSupport">
+ <markerTypeCategory
+ name="%Maven_Configuration_Problems">
+ <markerTypeReference
+ id="org.jbosstools.maven.configuration.jsf">
+ </markerTypeReference>
+ </markerTypeCategory>
+ </extension>
+
</plugin>
Added: trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/MavenJSFConstants.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/MavenJSFConstants.java (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/MavenJSFConstants.java 2011-08-04 12:50:56 UTC (rev 33586)
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.maven.jsf;
+
+/**
+ *
+ * @author Fred Bricon
+ */
+public class MavenJSFConstants {
+
+ public static final String JSF_CONFIGURATION_ERROR_MARKER_ID = "org.jbosstools.maven.configuration.jsf";
+ /**
+ * Private constructor to prevent instanciation.
+ */
+ private MavenJSFConstants() {};
+
+}
Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2011-08-04 12:45:40 UTC (rev 33585)
+++ trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2011-08-04 12:50:56 UTC (rev 33586)
@@ -20,10 +20,12 @@
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IType;
@@ -47,6 +49,7 @@
import org.jboss.tools.maven.core.IJBossMavenConstants;
import org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDataModelProvider;
import org.jboss.tools.maven.jsf.MavenJSFActivator;
+import org.jboss.tools.maven.jsf.MavenJSFConstants;
import org.jboss.tools.maven.jsf.Messages;
import org.jboss.tools.maven.ui.Activator;
@@ -56,12 +59,11 @@
*
*/
public class JSFProjectConfigurator extends AbstractProjectConfigurator {
-
+
private static final String JSF_API_GROUP_ID = "javax.faces"; //$NON-NLS-1$
private static final String JSF_API2_GROUP_ID = "com.sun.faces"; //$NON-NLS-1$
private static final String JSF_API_ARTIFACT_ID = "jsf-api"; //$NON-NLS-1$
- private static final String WEB_XML = "WEB-INF/web.xml";
private static final String WAR_SOURCE_FOLDER = "/src/main/webapp";
protected static final IProjectFacet dynamicWebFacet;
@@ -172,6 +174,8 @@
String jsfVersionString, MavenProject mavenProject,
IProgressMonitor monitor)
throws CoreException {
+
+ markerManager.deleteMarkers(fproj.getProject(), MavenJSFConstants.JSF_CONFIGURATION_ERROR_MARKER_ID);
if (!fproj.hasProjectFacet(JSF_FACET)) {
String warSourceDir = getWarSourceDirectory(mavenProject,fproj.getProject());
IPath facesConfigPath = new Path("WEB-INF/faces-config.xml");
@@ -184,20 +188,33 @@
&& !generatedFacesConfig.getLocation().equals(facesConfig.getLocation())
&& !generatedFacesConfig.exists();
+ IProjectFacetVersion facetVersion = null;
+ boolean configureServlet = true;
if (jsfVersionString.startsWith(JSF_VERSION_1_1)) {
- IDataModel model = MavenJSFActivator.getDefault().createJSFDataModel(fproj,JSF_FACET_VERSION_1_1);
- fproj.installProjectFacet(JSF_FACET_VERSION_1_1, model, monitor);
+ facetVersion = JSF_FACET_VERSION_1_1;
}
else if (jsfVersionString.startsWith(JSF_VERSION_1_2)) {
- IDataModel model = MavenJSFActivator.getDefault().createJSFDataModel(fproj,JSF_FACET_VERSION_1_2);
- fproj.installProjectFacet(JSF_FACET_VERSION_1_2, model, monitor);
+ facetVersion = JSF_FACET_VERSION_1_2;
}
else if (jsfVersionString.startsWith(JSF_VERSION_2_0)) {
- IDataModel model = MavenJSFActivator.getDefault().createJSFDataModel(fproj,JSF_FACET_VERSION_2_0);
- model.setBooleanProperty(IJSFFacetInstallDataModelProperties.CONFIGURE_SERVLET,configureWebxml());
- fproj.installProjectFacet(JSF_FACET_VERSION_2_0, model, monitor);
+ facetVersion = JSF_FACET_VERSION_2_0;
+ configureServlet = configureWebxml();
}
-
+
+ if (facetVersion != null) {
+ IStatus status = facetVersion.getConstraint().check(fproj.getProjectFacets());
+ if (status.isOK()) {
+ IDataModel model = MavenJSFActivator.getDefault().createJSFDataModel(fproj,facetVersion);
+ model.setBooleanProperty(IJSFFacetInstallDataModelProperties.CONFIGURE_SERVLET, configureServlet );
+ fproj.installProjectFacet(facetVersion, model, monitor);
+ } else {
+ addErrorMarker(fproj.getProject(), facetVersion + " can not be installed : "+ status.getMessage());
+ for (IStatus st : status.getChildren()) {
+ addErrorMarker(fproj.getProject(), st.getMessage());
+ }
+ }
+ }
+
if (shouldFixFacesConfig && generatedFacesConfig.exists()) {
if (facesConfig.exists()) {
//We have 2 config files. Delete the gen'd one
@@ -216,6 +233,14 @@
}
}
+ private void addErrorMarker(IProject project, String message) {
+ markerManager.addMarker(project,
+ MavenJSFConstants.JSF_CONFIGURATION_ERROR_MARKER_ID,
+ message
+ ,-1, IMarker.SEVERITY_ERROR);
+
+ }
+
private IFile getFileFromUnderlyingresources(final IProject project, final IPath filePath) {
IVirtualComponent component = ComponentCore.createComponent(project);
if (component == null) {
Property changes on: trunk/maven/tests/org.jboss.tools.maven.configurators.tests
___________________________________________________________________
Added: svn:ignore
+ target
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-error/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-error/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-error/pom.xml 2011-08-04 12:50:56 UTC (rev 33586)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools.maven.tests</groupId>
+ <artifactId>jsf-error</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <!-- not in central, hence requires the JBoss repo -->
+ <artifactId>jsf-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <!-- You should seriously consider using a repository manager or declare repositories in your settings.xml.
+ See http://www.sonatype.com/people/2009/02/why-putting-repositories-in-your-p... -->
+ <repository>
+ <!-- The JBoss Public repository is a composite repository of several major repositories.
+ See http://community.jboss.org/wiki/MavenGettingStarted-Users -->
+ <id>jboss-public-repository</id>
+ <url>http://repository.jboss.org/nexus/content/groups/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <!-- You can disable snapshot resolution to speed up your builds -->
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+</project>
+
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-error/src/main/webapp/WEB-INF/good-web.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-error/src/main/webapp/WEB-INF/good-web.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-error/src/main/webapp/WEB-INF/good-web.xml 2011-08-04 12:50:56 UTC (rev 33586)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <!-- This is a nice comment -->
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-error/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-error/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/jsf-error/src/main/webapp/WEB-INF/web.xml 2011-08-04 12:50:56 UTC (rev 33586)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> <display-name>jsf-webxml</display-name>
+ <!-- This is a nice comment -->
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
Deleted: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/requirements.properties
===================================================================
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/AbstractMavenConfiguratorTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/AbstractMavenConfiguratorTest.java 2011-08-04 12:45:40 UTC (rev 33585)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/AbstractMavenConfiguratorTest.java 2011-08-04 12:50:56 UTC (rev 33586)
@@ -10,8 +10,82 @@
************************************************************************************/
package org.jboss.tools.maven.configurators.tests;
+import java.io.File;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.jst.common.project.facet.core.JavaFacet;
+import org.eclipse.m2e.core.MavenPlugin;
+import org.eclipse.m2e.core.project.IProjectConfigurationManager;
+import org.eclipse.m2e.core.project.ResolverConfiguration;
import org.eclipse.m2e.tests.common.AbstractMavenProjectTestCase;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.jboss.tools.common.util.FileUtil;
+import org.jboss.tools.maven.jsf.configurators.JSFProjectConfigurator;
-public abstract class AbstractMavenConfiguratorTest extends AbstractMavenProjectTestCase {
+public abstract class AbstractMavenConfiguratorTest extends
+ AbstractMavenProjectTestCase {
+ protected String toString(File file) {
+ return FileUtil.readFile(file);
+ }
+
+ protected String toString(IFile file) {
+ return FileUtil.getContentFromEditorOrFile(file);
+ }
+
+ protected void assertIsJSFProject(IProject project,
+ IProjectFacetVersion expectedJSFVersion) throws Exception {
+ IFacetedProject facetedProject = ProjectFacetsManager.create(project);
+ assertNotNull(project.getName() + " is not a faceted project", facetedProject);
+ assertEquals("Unexpected JSF Version", expectedJSFVersion, facetedProject.getInstalledVersion(JSFProjectConfigurator.JSF_FACET));
+ assertTrue("Java Facet is missing", facetedProject.hasProjectFacet(JavaFacet.FACET));
+ assertTrue("faces-config.xml is missing", project.getFile("src/main/webapp/WEB-INF/faces-config.xml").exists());
+ }
+
+ /**
+ * Replace the project pom.xml with a new one, triggers new build
+ *
+ * @param project
+ * @param newPomName
+ * @throws Exception
+ */
+ protected void updateProject(IProject project, String newPomName) throws Exception {
+ updateProject(project, newPomName, -1);
+ }
+
+ /**
+ * Replace the project pom.xml with a new one, triggers new build, wait for
+ * waitTime milliseconds.
+ *
+ * @param project
+ * @param newPomName
+ * @param waitTime
+ * @throws Exception
+ */
+ protected void updateProject(IProject project, String newPomName, int waitTime) throws Exception {
+
+ if (newPomName != null) {
+ copyContent(project, newPomName, "pom.xml");
+ }
+
+ IProjectConfigurationManager configurationManager = MavenPlugin.getProjectConfigurationManager();
+ ResolverConfiguration configuration = new ResolverConfiguration();
+ configurationManager.enableMavenNature(project, configuration, monitor);
+ configurationManager.updateProjectConfiguration(project, monitor);
+ waitForJobsToComplete();
+
+ project.build(IncrementalProjectBuilder.FULL_BUILD, monitor);
+ if (waitTime > 0) {
+ Thread.sleep(waitTime);
+ }
+ waitForJobsToComplete();
+ }
+
+ protected void updateProject(IProject project) throws Exception {
+ updateProject(project, null, -1);
+ }
}
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java 2011-08-04 12:45:40 UTC (rev 33585)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java 2011-08-04 12:50:56 UTC (rev 33586)
@@ -1,11 +1,14 @@
package org.jboss.tools.maven.configurators.tests;
+import java.io.File;
+
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.common.project.facet.core.JavaFacet;
import org.eclipse.m2e.core.project.ResolverConfiguration;
+import org.eclipse.m2e.tests.common.WorkspaceHelpers;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.jboss.tools.maven.jsf.MavenJSFConstants;
import org.jboss.tools.maven.jsf.configurators.JSFProjectConfigurator;
import org.junit.Test;
@@ -21,6 +24,7 @@
"jsf-myfaces/pom.xml",
"jsf-jsfapi-12/pom.xml"},
new ResolverConfiguration());
+ waitForJobsToComplete();
IProject mojarra = projects[0];
assertNoErrors(mojarra);
assertIsJSFProject(mojarra, JSFProjectConfigurator.JSF_FACET_VERSION_2_0);
@@ -44,10 +48,40 @@
}
- private void assertIsJSFProject(IProject project, IProjectFacetVersion expectedJSFVersion) throws Exception {
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- assertNotNull(project.getName() + " is not a faceted project", facetedProject);
- assertEquals("Unexpected JSF Version", expectedJSFVersion, facetedProject.getInstalledVersion(JSFProjectConfigurator.JSF_FACET));
- assertTrue("Java Facet is missing", facetedProject.hasProjectFacet(JavaFacet.FACET));
+ @Test
+ public void testJBIDE8687_webXml_changed() throws Exception {
+ String projectLocation = "projects/jsf/jsf-webxml";
+ String webxmlRelPath = "src/main/webapp/WEB-INF/web.xml";
+
+ IProject jsfProject = importProject(projectLocation+"/pom.xml");
+ waitForJobsToComplete();
+ assertIsJSFProject(jsfProject, JSFProjectConfigurator.JSF_FACET_VERSION_2_0);
+
+ IFile webXml = jsfProject.getFile(webxmlRelPath);
+ assertTrue(webXml.exists());
+ File originalWebXml = new File(projectLocation, webxmlRelPath);
+ assertEquals("web.xml content changed ", toString(originalWebXml), toString(webXml));
+ }
+
+ @Test
+ public void testJBIDE9455_errorMarkers() throws Exception {
+ String projectLocation = "projects/jsf/jsf-error";
+ IProject jsfProject = importProject(projectLocation+"/pom.xml");
+ waitForJobsToComplete();
+ IFacetedProject facetedProject = ProjectFacetsManager.create(jsfProject);
+ assertNotNull(jsfProject.getName() + " is not a faceted project", facetedProject);
+ assertFalse("JSF Facet should be missing", facetedProject.hasProjectFacet(JSFProjectConfigurator.JSF_FACET));
+ assertHasJSFConfigurationError(jsfProject, "JavaServer Faces 2.0 can not be installed : One or more constraints have not been satisfied.");
+ assertHasJSFConfigurationError(jsfProject, "JavaServer Faces 2.0 requires Dynamic Web Module 2.5 or newer.");
+
+ //Check markers are removed upon configuration update
+ copyContent(jsfProject, "src/main/webapp/WEB-INF/good-web.xml", "src/main/webapp/WEB-INF/web.xml", true);
+ updateProject(jsfProject);
+ assertNoErrors(jsfProject);
+ assertIsJSFProject(jsfProject, JSFProjectConfigurator.JSF_FACET_VERSION_2_0);
}
+
+ private void assertHasJSFConfigurationError(IProject project, String message) throws Exception {
+ WorkspaceHelpers.assertErrorMarker(MavenJSFConstants.JSF_CONFIGURATION_ERROR_MARKER_ID, message, 1, "", project);
+ }
}
14 years, 8 months
- 1
- 0