JBoss Tools SVN: r33885 - trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-08-13 08:27:42 -0400 (Sat, 13 Aug 2011)
New Revision: 33885
Modified:
trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators/SarProjectConfigurator.java
Log:
JBIDE-9127 : fixed compilation issues
Modified: trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators/SarProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators/SarProjectConfigurator.java 2011-08-13 12:18:53 UTC (rev 33884)
+++ trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators/SarProjectConfigurator.java 2011-08-13 12:27:42 UTC (rev 33885)
@@ -104,7 +104,7 @@
IPath source = facade.getResourceLocations()[0];
- WTPProjectsUtil.installJavaFacet(actions, project, facetedProject);
+ installJavaFacet(actions, project, facetedProject);
if (!actions.isEmpty()) {
facetedProject.modify(actions, monitor);
}
14 years, 8 months
JBoss Tools SVN: r33884 - trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-08-13 08:18:53 -0400 (Sat, 13 Aug 2011)
New Revision: 33884
Modified:
trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators/SarProjectConfigurator.java
Log:
JBIDE-9127 : fixed compilation issues
Modified: trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators/SarProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators/SarProjectConfigurator.java 2011-08-13 11:48:47 UTC (rev 33883)
+++ trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators/SarProjectConfigurator.java 2011-08-13 12:18:53 UTC (rev 33884)
@@ -30,15 +30,19 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jst.common.project.facet.core.JavaFacet;
+import org.eclipse.jst.common.project.facet.core.internal.JavaFacetUtil;
import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants;
import org.eclipse.m2e.core.project.IMavenProjectFacade;
import org.eclipse.m2e.core.project.MavenProjectChangedEvent;
+import org.eclipse.m2e.core.project.MavenProjectUtils;
import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator;
import org.eclipse.m2e.core.project.configurator.ProjectConfigurationRequest;
import org.eclipse.m2e.jdt.internal.MavenClasspathHelpers;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.ModuleCoreNature;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
@@ -110,7 +114,7 @@
ModuleCoreNature.addModuleCoreNatureIfNecessary(project, monitor);
- WTPProjectsUtil.removeTestFolderLinks(project, mavenProject, monitor, "/");
+ removeTestFolderLinks(project, mavenProject, monitor, "/");
setNonDependencyAttributeToContainer(project, monitor);
@@ -119,6 +123,38 @@
fileCleaner.cleanUp();
}
+ //TODO Fix/refactor that method from WTPProjectUtils in m2e-wtp 0.14.x
+ public static void removeTestFolderLinks(IProject project, MavenProject mavenProject, IProgressMonitor monitor,
+ String folder) throws CoreException {
+ IVirtualComponent component = ComponentCore.createComponent(project);
+ if (component != null){
+ IVirtualFolder jsrc = component.getRootFolder().getFolder(folder);
+ for(IPath location : MavenProjectUtils.getSourceLocations(project, mavenProject.getTestCompileSourceRoots())) {
+ if (location == null) continue;
+ jsrc.removeLink(location, 0, monitor);
+ }
+ for(IPath location : MavenProjectUtils.getResourceLocations(project, mavenProject.getTestResources())) {
+ if (location == null) continue;
+ jsrc.removeLink(location, 0, monitor);
+ }
+ }
+ }
+
+ /**
+ * @param actions
+ * @param project
+ * @param facetedProject
+ */
+ //TODO Fix/refactor that method from WTPProjectUtils in m2e-wtp 0.14.x
+ public static void installJavaFacet(Set<Action> actions, IProject project, IFacetedProject facetedProject) {
+ IProjectFacetVersion javaFv = JavaFacet.FACET.getVersion(JavaFacetUtil.getCompilerLevel(project));
+ if(!facetedProject.hasProjectFacet(JavaFacet.FACET)) {
+ actions.add(new IFacetedProject.Action(IFacetedProject.Action.Type.INSTALL, javaFv, null));
+ } else if(!facetedProject.hasProjectFacet(javaFv)) {
+ actions.add(new IFacetedProject.Action(IFacetedProject.Action.Type.VERSION_CHANGE, javaFv, null));
+ }
+ }
+
private void installM2Facet(IFacetedProject fproj, IProgressMonitor monitor) throws CoreException {
if (!fproj.hasProjectFacet(m2Facet)) {
IDataModel config = (IDataModel) new MavenFacetInstallDataModelProvider().create();
14 years, 8 months
JBoss Tools SVN: r33883 - in trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging: META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-08-13 07:48:47 -0400 (Sat, 13 Aug 2011)
New Revision: 33883
Modified:
trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/
trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/META-INF/MANIFEST.MF
trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators/SarProjectConfigurator.java
Log:
JBIDE-9127 : fixed compilation issues
Property changes on: trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging
___________________________________________________________________
Added: svn:ignore
+ target
Modified: trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/META-INF/MANIFEST.MF 2011-08-13 00:31:54 UTC (rev 33882)
+++ trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/META-INF/MANIFEST.MF 2011-08-13 11:48:47 UTC (rev 33883)
@@ -13,7 +13,8 @@
org.eclipse.jst.j2ee,
org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100",
org.sonatype.m2e.mavenarchiver;bundle-version="0.14.0",
- org.jboss.ide.eclipse.as.ui.mbeans;bundle-version="2.3.0"
+ org.jboss.ide.eclipse.as.ui.mbeans;bundle-version="2.3.0",
+ org.maven.ide.eclipse.wtp;bundle-version="0.13.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %Bundle-Vendor
Modified: trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators/SarProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators/SarProjectConfigurator.java 2011-08-13 00:31:54 UTC (rev 33882)
+++ trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators/SarProjectConfigurator.java 2011-08-13 11:48:47 UTC (rev 33883)
@@ -51,7 +51,6 @@
import org.jboss.tools.maven.core.IJBossMavenConstants;
import org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDataModelProvider;
import org.maven.ide.eclipse.wtp.ArtifactHelper;
-import org.maven.ide.eclipse.wtp.ResourceCleaner;
import org.maven.ide.eclipse.wtp.WTPProjectsUtil;
/**
14 years, 8 months
JBoss Tools SVN: r33882 - in trunk: jsf/tests/org.jboss.tools.jsf.test/META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-08-12 20:31:54 -0400 (Fri, 12 Aug 2011)
New Revision: 33882
Added:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/ELReferencesQueryParticipantTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/ELReferencesQueryParticipantTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/QueryParticipantTestUtils.java
Log:
https://issues.jboss.org/browse/JBIDE-9473
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/ELReferencesQueryParticipantTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/ELReferencesQueryParticipantTest.java 2011-08-12 23:55:18 UTC (rev 33881)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/ELReferencesQueryParticipantTest.java 2011-08-13 00:31:54 UTC (rev 33882)
@@ -13,13 +13,10 @@
public void testELReferencesQueryParticipantForType() throws CoreException{
ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>();
- //matches.add(new MatchStructure("/tck/JavaSource/org/jboss/jsr299/tck/tests/lookup/el/integration/JSFTestPage.jsp", "sheep"));
matches.add(new MatchStructure("/tck/WebContent/test.jsp", "sheep"));
matches.add(new MatchStructure("/tck/WebContent/el/integration/JSFTestPage.jsp", "sheep"));
matches.add(new MatchStructure("/tck/WebContent/tests/lookup/el/integration/JSFTestPage.jsp", "sheep"));
-// matches.add(new MatchStructure("/tck/JavaSource/org/jboss/jsr299/tck/tests/lookup/el/integration/JSFTestPage.jsp", "sheep"));
-
QueryParticipantTestUtils.testSearchParticipant(tckProject,
"JavaSource/org/jboss/jsr299/tck/tests/lookup/el/integration/Sheep.java",
QueryParticipantTestUtils.TYPE_SEARCH,
@@ -32,11 +29,9 @@
public void testELReferencesQueryParticipantForMethod() throws CoreException{
ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>();
- //matches.add(new MatchStructure("/tck/JavaSource/org/jboss/jsr299/tck/tests/lookup/el/integration/JSFTestPage.jsp", "name"));
matches.add(new MatchStructure("/tck/WebContent/test.jsp", "name"));
matches.add(new MatchStructure("/tck/WebContent/el/integration/JSFTestPage.jsp", "name"));
matches.add(new MatchStructure("/tck/WebContent/tests/lookup/el/integration/JSFTestPage.jsp", "name"));
-// matches.add(new MatchStructure("/tck/JavaSource/org/jboss/jsr299/tck/tests/lookup/el/integration/JSFTestPage.jsp", "name"));
QueryParticipantTestUtils.testSearchParticipant(tckProject,
"JavaSource/org/jboss/jsr299/tck/tests/lookup/el/integration/Sheep.java",
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2011-08-12 23:55:18 UTC (rev 33881)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2011-08-13 00:31:54 UTC (rev 33882)
@@ -43,7 +43,8 @@
org.eclipse.wst.web,
org.eclipse.jst.jee.ejb,
org.eclipse.jst.jee.web,
- org.eclipse.jst.jsf.common
+ org.eclipse.jst.jsf.common,
+ org.jboss.tools.jst.web.kb.test
Bundle-Activator: org.jboss.tools.jsf.plugin.JsfTestPlugin
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/ELReferencesQueryParticipantTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/ELReferencesQueryParticipantTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/ELReferencesQueryParticipantTest.java 2011-08-13 00:31:54 UTC (rev 33882)
@@ -0,0 +1,61 @@
+package org.jboss.tools.jsf.test;
+
+import java.util.ArrayList;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.jboss.tools.jst.web.kb.refactoring.ELReferencesQueryParticipant;
+import org.jboss.tools.jst.web.kb.test.QueryParticipantTestUtils;
+import org.jboss.tools.jst.web.kb.test.QueryParticipantTestUtils.MatchStructure;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+
+public class ELReferencesQueryParticipantTest extends TestCase{
+ static String projectName = "JSF2ComponentsValidator";
+ static IProject project;
+
+ public ELReferencesQueryParticipantTest(){
+ super("ELReferencesQueryParticipantTest");
+ }
+
+ protected void setUp() throws Exception {
+ project = ProjectImportTestSetup.loadProject(projectName);
+ project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+ JobUtils.waitForIdle(2000);
+ }
+
+ public void testELReferencesQueryParticipantForType() throws CoreException{
+ ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>();
+
+ matches.add(new MatchStructure("/JSF2ComponentsValidator/WebContent/pages/greeting.xhtml", "person"));
+ matches.add(new MatchStructure("/JSF2ComponentsValidator/WebContent/resources/demo/input.xhtml", "person"));
+ matches.add(new MatchStructure("/JSF2ComponentsValidator/WebContent/resources/demo/input.xhtml", "person"));
+
+ QueryParticipantTestUtils.testSearchParticipant(project,
+ "JavaSource/demo/Person.java",
+ QueryParticipantTestUtils.TYPE_SEARCH,
+ "Person",
+ "",
+ new ELReferencesQueryParticipant(),
+ matches);
+ }
+
+ public void testELReferencesQueryParticipantForMethod() throws CoreException{
+ ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>();
+
+ matches.add(new MatchStructure("/JSF2ComponentsValidator/WebContent/pages/greeting.xhtml", "name"));
+ matches.add(new MatchStructure("/JSF2ComponentsValidator/WebContent/resources/demo/input.xhtml", "name"));
+
+ QueryParticipantTestUtils.testSearchParticipant(project,
+ "JavaSource/demo/Person.java",
+ QueryParticipantTestUtils.METHOD_SEARCH,
+ "getName",
+ "",
+ new ELReferencesQueryParticipant(),
+ matches);
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/ELReferencesQueryParticipantTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-08-12 23:55:18 UTC (rev 33881)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-08-13 00:31:54 UTC (rev 33882)
@@ -79,6 +79,10 @@
JSF2RefactoringTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$
new String[] { "projects/JSF2ComponentsValidator" }, //$NON-NLS-1$
new String[] { "JSF2ComponentsValidator" })); //$NON-NLS-1$
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(
+ ELReferencesQueryParticipantTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$
+ new String[] { "projects/JSF2ComponentsValidator" }, //$NON-NLS-1$
+ new String[] { "JSF2ComponentsValidator" })); //$NON-NLS-1$
// suite.addTest(new ProjectImportTestSetup(new TestSuite(
// I18nValidatorTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$
// new String[] { "projects/i18nTestProject" }, //$NON-NLS-1$
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/QueryParticipantTestUtils.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/QueryParticipantTestUtils.java 2011-08-12 23:55:18 UTC (rev 33881)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/QueryParticipantTestUtils.java 2011-08-13 00:31:54 UTC (rev 33882)
@@ -37,10 +37,15 @@
assertNotNull("File - "+fileName+" not found", file);
ICompilationUnit compilationUnit = EclipseUtil.getCompilationUnit(file);
+
+ assertNotNull("CompilationUnit not found", compilationUnit);
+
IJavaElement element = null;
IType type = compilationUnit.findPrimaryType();
+ assertNotNull("Primary type not found", type);
+
if(searchType == FIELD_SEARCH){
element = type.getField(elementName);
}else if(searchType == METHOD_SEARCH){
14 years, 8 months
JBoss Tools SVN: r33881 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-12 19:55:18 -0400 (Fri, 12 Aug 2011)
New Revision: 33881
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ContextValidationHelper.java
Log:
JBIDE-9533
https://issues.jboss.org/browse/JBIDE-9533
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ContextValidationHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ContextValidationHelper.java 2011-08-12 23:52:28 UTC (rev 33880)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ContextValidationHelper.java 2011-08-12 23:55:18 UTC (rev 33881)
@@ -24,6 +24,7 @@
import org.eclipse.ui.editors.text.TextFileDocumentProvider;
import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
+import org.jboss.tools.jst.web.kb.WebKbPlugin;
import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree;
import org.jboss.tools.jst.web.kb.validation.IValidationContextManager;
import org.jboss.tools.jst.web.kb.validation.IValidator;
@@ -141,7 +142,11 @@
Set<IProject> projects = new HashSet<IProject>();
for (IValidator validator : validators) {
IValidatingProjectTree tree = validator.getValidatingProjects(project);
- projects.addAll(tree.getAllProjects());
+ if(tree == null) {
+ WebKbPlugin.getDefault().logError(new NullPointerException("Validator has no tree " + validator + " for project " + getProject() + ". Project exists=" + getProject().exists()));
+ } else {
+ projects.addAll(tree.getAllProjects());
+ }
}
return projects;
}
14 years, 8 months
JBoss Tools SVN: r33880 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-12 19:52:28 -0400 (Fri, 12 Aug 2011)
New Revision: 33880
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java
Log:
Fixed compilation error
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2011-08-12 23:50:32 UTC (rev 33879)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2011-08-12 23:52:28 UTC (rev 33880)
@@ -24,13 +24,12 @@
import org.eclipse.ui.editors.text.ILocationProvider;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
import org.jboss.tools.common.resref.core.ResourceReference;
-import org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor;
import org.jboss.tools.jst.jsp.contentassist.computers.JspELCompletionProposalComputer;
import org.jboss.tools.jst.jsp.outline.ValueHelper;
import org.jboss.tools.jst.web.kb.IPageContext;
import org.jboss.tools.jst.web.kb.KbQuery;
-import org.jboss.tools.jst.web.kb.PageProcessor;
import org.jboss.tools.jst.web.kb.KbQuery.Type;
+import org.jboss.tools.jst.web.kb.PageProcessor;
import org.jboss.tools.jst.web.kb.internal.proposal.CustomProposalType;
import org.jboss.tools.jst.web.kb.internal.proposal.CustomProposalType.Param;
import org.jboss.tools.jst.web.kb.internal.taglib.CustomTagLibAttribute;
@@ -39,8 +38,6 @@
import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeCreatorUtil;
-import org.jboss.tools.vpe.editor.util.ElService;
-import org.jboss.tools.vpe.editor.util.Jsf2ResourceUtil;
import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
import org.w3c.dom.Node;
14 years, 8 months
JBoss Tools SVN: r33879 - 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-12 19:50:32 -0400 (Fri, 12 Aug 2011)
New Revision: 33879
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifier.java
Log:
JBIDE-7892
https://issues.jboss.org/browse/JBIDE-7892
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java 2011-08-12 23:40:36 UTC (rev 33878)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java 2011-08-12 23:50:32 UTC (rev 33879)
@@ -259,4 +259,10 @@
public IMember getSourceMember() {
return getBeanClass();
}
+
+ @Override
+ public ICDIProject getDeclaringProject() {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifier.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifier.java 2011-08-12 23:40:36 UTC (rev 33878)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifier.java 2011-08-12 23:50:32 UTC (rev 33879)
@@ -59,5 +59,11 @@
public IResource getResource() {
return null;
}
+
+ @Override
+ public ICDIProject getDeclaringProject() {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
\ No newline at end of file
14 years, 8 months
JBoss Tools SVN: r33878 - in trunk/maven/tests/org.jboss.tools.maven.configurators.tests: META-INF and 18 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-08-12 19:40:36 -0400 (Fri, 12 Aug 2011)
New Revision: 33878
Added:
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-1/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-1/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-2/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-2/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-3/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-3/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/ear/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/ear/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/ear/src/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/ear/src/main/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/ear/src/main/application/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/src/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/src/main/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/src/main/java/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/src/main/java/com/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/src/main/java/com/acme/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/src/main/java/com/acme/HelloWorldService.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/src/main/java/com/acme/HelloWorldServiceMBean.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/src/main/resources/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/src/main/resources/META-INF/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/src/main/resources/META-INF/jboss-service.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JBossSarConfiguratorTest.java
Modified:
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/.project
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF
Log:
JBIDE-9127 : Added maven project configurator for jboss-sar packages
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/.project
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/.project 2011-08-12 23:34:16 UTC (rev 33877)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/.project 2011-08-12 23:40:36 UTC (rev 33878)
@@ -11,17 +11,17 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
+ <name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
+ <name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF 2011-08-12 23:34:16 UTC (rev 33877)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF 2011-08-12 23:40:36 UTC (rev 33878)
@@ -15,6 +15,7 @@
org.jboss.tools.maven.portlet,
org.jboss.tools.maven.seam,
org.jboss.tools.maven.jaxrs,
+ org.jboss.tools.maven.jbosspackaging,
org.jboss.tools.maven.ui,
org.eclipse.wst.server.core,
org.jboss.tools.common,
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-1/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-1/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-1/pom.xml 2011-08-12 23:40:36 UTC (rev 33878)
@@ -0,0 +1,33 @@
+<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>jboss-sar-1</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>jboss-sar</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-packaging-maven-plugin</artifactId>
+ <version>2.2</version>
+ <!-- Enable packaging types and lifecycle bindings. -->
+ <extensions>true</extensions>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.5</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-2/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-2/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-2/pom.xml 2011-08-12 23:40:36 UTC (rev 33878)
@@ -0,0 +1,34 @@
+<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>jboss-sar-2</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>jboss-sar</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-packaging-maven-plugin</artifactId>
+ <version>2.2</version>
+ <!-- Enable packaging types and lifecycle bindings. -->
+ <extensions>true</extensions>
+ <configuration>
+ <excludeAll>true</excludeAll>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-3/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-3/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/jboss-sar-3/pom.xml 2011-08-12 23:40:36 UTC (rev 33878)
@@ -0,0 +1,37 @@
+<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>jboss-sar-3</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>jboss-sar</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-packaging-maven-plugin</artifactId>
+ <version>2.2</version>
+ <!-- Enable packaging types and lifecycle bindings. -->
+ <extensions>true</extensions>
+ <configuration>
+ <excludeAll>false</excludeAll>
+ <excludes>
+ <exclude>junit:junit</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/ear/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/ear/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/ear/pom.xml 2011-08-12 23:40:36 UTC (rev 33878)
@@ -0,0 +1,40 @@
+<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>
+ <parent>
+ <groupId>org.jboss.tools.maven.tests</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <groupId>org.jboss.tools.maven.tests</groupId>
+ <artifactId>ear</artifactId>
+ <packaging>ear</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <!-- http://maven.apache.org/plugins/maven-ear-plugin/ -->
+ <version>5</version>
+ <!-- if generateApplicationXml is set to true,
+ maven-ear-plugin adds an invalid <connector> module for the sar in application.xml
+ and JBoss AS 7 doesn't like it
+ -->
+ <generateApplicationXml>false</generateApplicationXml>
+ <defaultLibBundleDir>lib</defaultLibBundleDir>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.tools.maven.tests</groupId>
+ <artifactId>sar</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <type>sar</type>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/pom.xml 2011-08-12 23:40:36 UTC (rev 33878)
@@ -0,0 +1,55 @@
+<?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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools.maven.tests</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-packaging-maven-plugin</artifactId>
+ <version>2.2</version>
+ <!-- Enable packaging types and lifecycle bindings. -->
+ <extensions>true</extensions>
+ <configuration>
+ <excludeAll>true</excludeAll>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-packaging-maven-plugin</artifactId>
+ <!-- Enable packaging types and lifecycle bindings. -->
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+ <modules>
+ <module>sar</module>
+ <module>ear</module>
+ </modules>
+ <properties>
+ <java.version>1.6</java.version>
+ <app.version>${project.version}</app.version>
+ </properties>
+</project>
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/pom.xml 2011-08-12 23:40:36 UTC (rev 33878)
@@ -0,0 +1,25 @@
+<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>
+ <parent>
+ <groupId>org.jboss.tools.maven.tests</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>sar</artifactId>
+ <packaging>jboss-sar</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.0.0.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.5</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/src/main/java/com/acme/HelloWorldService.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/src/main/java/com/acme/HelloWorldService.java (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/src/main/java/com/acme/HelloWorldService.java 2011-08-12 23:40:36 UTC (rev 33878)
@@ -0,0 +1,39 @@
+package com.acme;
+
+import org.apache.commons.lang.StringUtils;
+
+
+
+public class HelloWorldService implements HelloWorldServiceMBean
+{
+ // Our message attribute
+ private String message = "Sorry no message today";
+
+ // Getters and Setters
+ public String getMessage()
+ {
+ return message;
+ }
+
+ public void setMessage(String message)
+ {
+ this.message = message;
+ }
+
+ // The printMessage operation
+ public void printMessage()
+ {
+ System.out.println(message);
+ }
+
+ // The lifecycle
+ public void start() throws Exception
+ {
+ System.out.println("Démarrage avec le message=" + StringUtils.reverse(message));
+ }
+
+ public void stop()
+ {
+ System.out.println("Stopping with message=" + StringUtils.reverse(message));
+ }
+}
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/src/main/java/com/acme/HelloWorldServiceMBean.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/src/main/java/com/acme/HelloWorldServiceMBean.java (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/src/main/java/com/acme/HelloWorldServiceMBean.java 2011-08-12 23:40:36 UTC (rev 33878)
@@ -0,0 +1,16 @@
+package com.acme;
+
+
+public interface HelloWorldServiceMBean
+{
+ // Configure getters and setters for the message attribute
+ String getMessage();
+ void setMessage(String message);
+
+ // The print message operation
+ void printMessage();
+
+ // Lifecycle callbacks
+ void start() throws Exception;
+ void stop();
+}
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/src/main/resources/META-INF/jboss-service.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/src/main/resources/META-INF/jboss-service.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jboss-sar/parent/sar/src/main/resources/META-INF/jboss-service.xml 2011-08-12 23:40:36 UTC (rev 33878)
@@ -0,0 +1,20 @@
+<!-- ~ JBoss, Home of Professional Open Source. ~ Copyright 2010, Red Hat,
+ Inc., and individual contributors ~ as indicated by the @author tags. See
+ the copyright.txt file in the ~ distribution for a full listing of individual
+ contributors. ~ ~ This is free software; you can redistribute it and/or modify
+ it ~ under the terms of the GNU Lesser General Public License as ~ published
+ by the Free Software Foundation; either version 2.1 of ~ the License, or
+ (at your option) any later version. ~ ~ This software is distributed in the
+ hope that it will be useful, ~ but WITHOUT ANY WARRANTY; without even the
+ implied warranty of ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the GNU ~ Lesser General Public License for more details. ~ ~ You should
+ have received a copy of the GNU Lesser General Public ~ License along with
+ this software; if not, write to the Free ~ Software Foundation, Inc., 51
+ Franklin St, Fifth Floor, Boston, MA ~ 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org. -->
+<server xmlns="urn:jboss:service:7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd">
+ <mbean code="com.acme.HelloWorldService" name="acme.com:service=HelloWorld">
+ <attribute name="Message">Hello World</attribute>
+ </mbean>
+</server>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JBossSarConfiguratorTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JBossSarConfiguratorTest.java (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JBossSarConfiguratorTest.java 2011-08-12 23:40:36 UTC (rev 33878)
@@ -0,0 +1,135 @@
+package org.jboss.tools.maven.configurators.tests;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jst.common.project.facet.core.JavaFacet;
+import org.eclipse.m2e.core.project.ResolverConfiguration;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+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.jbosspackaging.configurators.SarProjectConfigurator;
+import org.junit.Test;
+
+@SuppressWarnings("restriction")
+public class JBossSarConfiguratorTest extends AbstractMavenConfiguratorTest {
+
+ @Test
+ public void testBasicSarSupport() throws Exception {
+ IProject project = importProject("projects/jboss-sar/jboss-sar-1/pom.xml");
+ waitForJobsToComplete(new NullProgressMonitor());
+ assertIsSarProject(project);
+
+ IVirtualComponent sarComponent = ComponentCore.createComponent(project);
+ assertNotNull(sarComponent);
+ IVirtualReference[] references = sarComponent.getReferences();
+ assertEquals(1, references.length);
+ assertEquals("commons-lang-2.5.jar", references[0].getArchiveName());
+ assertEquals("/lib", references[0].getRuntimePath().toPortableString());
+
+ IResource[] underlyingResources = getUnderlyingResources(project);
+ assertEquals(1, underlyingResources.length);
+ assertEquals(project.getFolder("/src/main/resources"), underlyingResources[0]);
+ }
+
+ @Test
+ public void testExcludeAllDependencies() throws Exception {
+ IProject project = importProject("projects/jboss-sar/jboss-sar-2/pom.xml");
+ waitForJobsToComplete(new NullProgressMonitor());
+ assertIsSarProject(project);
+
+ IVirtualComponent sarComponent = ComponentCore.createComponent(project);
+ assertNotNull(sarComponent);
+ IVirtualReference[] references = sarComponent.getReferences();
+ assertEquals(0, references.length);
+ }
+
+ @Test
+ public void testExcludeSomeDependencies() throws Exception {
+ IProject project = importProject("projects/jboss-sar/jboss-sar-3/pom.xml");
+ waitForJobsToComplete(new NullProgressMonitor());
+ assertIsSarProject(project);
+
+ IVirtualComponent sarComponent = ComponentCore.createComponent(project);
+ assertNotNull(sarComponent);
+ IVirtualReference[] references = sarComponent.getReferences();
+ assertEquals(1, references.length);
+ assertEquals("commons-lang-2.5.jar", references[0].getArchiveName());
+ }
+
+ @Test
+ public void testSarInEar() throws Exception {
+ IProject[] projects = importProjects("projects/jboss-sar/parent",
+ new String[] {"pom.xml", "ear/pom.xml", "sar/pom.xml"},
+ new ResolverConfiguration());
+ waitForJobsToComplete(new NullProgressMonitor());
+
+ IProject sar = projects[2];
+ assertIsSarProject(sar);
+
+ IProject ear = projects[1];
+ assertNoErrors(ear);
+
+ IVirtualComponent earComponent = ComponentCore.createComponent(ear);
+ assertNotNull(earComponent);
+ IVirtualReference[] references = earComponent.getReferences();
+ assertEquals(2, references.length);
+ assertEquals("sar-0.0.1-SNAPSHOT.sar", references[0].getArchiveName());
+ assertEquals("/", references[0].getRuntimePath().toPortableString());
+ assertEquals("commons-lang-2.5.jar", references[1].getArchiveName());
+ assertEquals("/lib", references[1].getRuntimePath().toPortableString());
+ }
+
+ // @Test
+ // public void testJBIDE9290_errorMarkers() throws Exception {
+ // String projectLocation = "projects/jaxrs/jaxrs-error";
+ // IProject jaxRsProject = importProject(projectLocation+"/pom.xml");
+ // waitForJobsToComplete(new NullProgressMonitor());
+ // IFacetedProject facetedProject =
+ // ProjectFacetsManager.create(jaxRsProject);
+ // assertNotNull(jaxRsProject.getName() + " is not a faceted project",
+ // facetedProject);
+ // assertFalse("JAX-RS Facet should be missing",
+ // facetedProject.hasProjectFacet(JaxrsProjectConfigurator.JAX_RS_FACET));
+ // assertHasJaxRsConfigurationError(jaxRsProject,
+ // "JAX-RS (REST Web Services) 1.1 can not be installed : One or more constraints have not been satisfied.");
+ // assertHasJaxRsConfigurationError(jaxRsProject,
+ // "JAX-RS (REST Web Services) 1.1 requires Dynamic Web Module 2.3 or newer.");
+ //
+ // //Check markers are removed upon configuration update
+ // copyContent(jaxRsProject, "src/main/webapp/WEB-INF/good-web.xml",
+ // "src/main/webapp/WEB-INF/web.xml", true);
+ // updateProject(jaxRsProject);
+ // assertNoErrors(jaxRsProject);
+ // assertIsJaxRsProject(jaxRsProject,
+ // JaxrsProjectConfigurator.JAX_RS_FACET_1_1);
+ // }
+
+ // private void assertHasJaxRsConfigurationError(IProject project, String
+ // message) throws Exception {
+ // WorkspaceHelpers.assertErrorMarker(MavenJaxRsConstants.JAXRS_CONFIGURATION_ERROR_MARKER_ID,
+ // message, 1, "", project);
+ // }
+
+ private void assertIsSarProject(IProject project) throws Exception {
+ IProjectFacetVersion expectedJaxRsVersion = SarProjectConfigurator.JBOSS_SAR_FACET_VERSION_1_0;
+ assertNoErrors(project);
+ IFacetedProject facetedProject = ProjectFacetsManager.create(project);
+ assertNotNull(project.getName() + " is not a faceted project", facetedProject);
+ assertEquals("Unexpected JBoss SAR Version", expectedJaxRsVersion,
+ facetedProject.getInstalledVersion(SarProjectConfigurator.JBOSS_SAR_FACET));
+ assertTrue("Java Facet is missing", facetedProject.hasProjectFacet(JavaFacet.FACET));
+ assertTrue("Manifest is missing", project.getFile("target/classes/META-INF/MANIFEST.MF").exists());
+ }
+
+ protected static IResource[] getUnderlyingResources(IProject project) {
+ IVirtualComponent component = ComponentCore.createComponent(project);
+ IVirtualFolder root = component.getRootFolder();
+ IResource[] underlyingResources = root.getUnderlyingResources();
+ return underlyingResources;
+ }
+}
14 years, 8 months
JBoss Tools SVN: r33877 - trunk/site.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-08-12 19:34:16 -0400 (Fri, 12 Aug 2011)
New Revision: 33877
Modified:
trunk/site/site.xml
Log:
JBIDE-9127 : Added maven project configurator for jboss-sar packages
Modified: trunk/site/site.xml
===================================================================
--- trunk/site/site.xml 2011-08-12 23:33:54 UTC (rev 33876)
+++ trunk/site/site.xml 2011-08-12 23:34:16 UTC (rev 33877)
@@ -32,6 +32,8 @@
<feature url="features/org.jboss.tools.maven.cdi.feature_0.0.0.jar" id="org.jboss.tools.maven.cdi.feature" version="0.0.0" />
<feature url="features/org.jboss.tools.maven.hibernate.feature_0.0.0.jar" id="org.jboss.tools.maven.hibernate.feature" version="0.0.0" />
<feature url="features/org.jboss.tools.maven.portlet.feature_0.0.0.jar" id="org.jboss.tools.maven.portlet.feature" version="0.0.0" />
+ <feature url="features/org.jboss.tools.maven.jaxrs.feature_0.0.0.jar" id="org.jboss.tools.maven.jaxrs.feature" version="0.0.0" />
+ <feature url="features/org.jboss.tools.maven.jbosspackaging.feature_0.0.0.jar" id="org.jboss.tools.maven.jbosspackaging.feature" version="0.0.0" />
<feature url="features/org.jboss.tools.xulrunner.feature_0.0.0.jar" id="org.jboss.tools.xulrunner.feature" version="0.0.0" />
<feature url="features/org.jboss.tools.jbpm.convert.feature_0.0.0.jar" id="org.jboss.tools.jbpm.convert.feature" version="0.0.0" />
<feature url="features/org.jboss.tools.jbpm.common.feature_0.0.0.jar" id="org.jboss.tools.jbpm.common.feature" version="0.0.0" />
14 years, 8 months
JBoss Tools SVN: r33876 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-08-12 19:33:54 -0400 (Fri, 12 Aug 2011)
New Revision: 33876
Modified:
trunk/build/aggregate/site/site.xml
Log:
JBIDE-9127 : Added maven project configurator for jboss-sar packages
Modified: trunk/build/aggregate/site/site.xml
===================================================================
--- trunk/build/aggregate/site/site.xml 2011-08-12 23:33:33 UTC (rev 33875)
+++ trunk/build/aggregate/site/site.xml 2011-08-12 23:33:54 UTC (rev 33876)
@@ -118,6 +118,9 @@
<feature url="features/org.jboss.tools.maven.jaxrs.feature_0.0.0.jar" id="org.jboss.tools.maven.jaxrs.feature" version="0.0.0">
<category name="MavenTools" />
</feature>
+ <feature url="features/org.jboss.tools.maven.jbosspackaging.feature_0.0.0.jar" id="org.jboss.tools.maven.jbosspackaging.feature" version="0.0.0">
+ <category name="MavenTools" />
+ </feature>
<feature url="features/org.jboss.tools.maven.project.examples.feature_0.0.0.jar" id="org.jboss.tools.maven.project.examples.feature" version="0.0.0">
<category name="MavenTools" />
</feature>
14 years, 8 months