JBoss Tools SVN: r33645 - trunk/tests/plugins/org.jboss.tools.tests.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-05 20:15:14 -0400 (Fri, 05 Aug 2011)
New Revision: 33645
Modified:
trunk/tests/plugins/org.jboss.tools.tests/plugin_customization.ini
Log:
Some startup plug-ins were disabled, because they aren't required during testing
Modified: trunk/tests/plugins/org.jboss.tools.tests/plugin_customization.ini
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/plugin_customization.ini 2011-08-06 00:13:52 UTC (rev 33644)
+++ trunk/tests/plugins/org.jboss.tools.tests/plugin_customization.ini 2011-08-06 00:15:14 UTC (rev 33645)
@@ -5,3 +5,4 @@
org.eclipse.ui.ide/SWITCH_PERSPECTIVE_ON_PROJECT_CREATION=never
org.eclipse.ui.workbench/ENABLED_DECORATORS=org.eclipse.wst.server.ui.decorator\:false,org.eclipse.jdt.ui.override.decorator\:false,org.eclipse.jdt.ui.interface.decorator\:false,org.eclipse.jdt.ui.buildpath.decorator\:false,org.eclipse.pde.ui.binaryProjectDecorator\:false,org.eclipse.ui.LinkedResourceDecorator\:false,org.eclipse.ui.VirtualResourceDecorator\:false,org.eclipse.ui.ContentTypeDecorator\:false,org.eclipse.ui.ResourceFilterDecorator\:false,org.eclipse.wst.jsdt.ui.override.decorator\:false,org.eclipse.wst.server.ui.navigatorDecorator\:false,
+org.eclipse.ui.workbench/PLUGINS_NOT_ACTIVATED_ON_STARTUP=org.eclipse.equinox.p2.ui.sdk.scheduler;org.eclipse.update.scheduler;
14 years, 8 months
JBoss Tools SVN: r33644 - in trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools: tests and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-05 20:13:52 -0400 (Fri, 05 Aug 2011)
New Revision: 33644
Modified:
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/JobUtils.java
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java
Log:
Not needed comments were removed
Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/JobUtils.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/JobUtils.java 2011-08-05 22:36:04 UTC (rev 33643)
+++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/JobUtils.java 2011-08-06 00:13:52 UTC (rev 33644)
@@ -33,11 +33,6 @@
public static void waitForIdle(long delay, long maxIdle) {
long start = System.currentTimeMillis();
- // Job.getJobManager().isIdle() is more efficient than
- // EditorTestHelper.allJobsQuiet()
- // EditorTestHelper.allJobsQuiet() isn't thread-safe
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=198241 is fixed
- // while (!EditorTestHelper.allJobsQuiet()) {
while (!Job.getJobManager().isIdle()) {
delay(delay);
if ((System.currentTimeMillis() - start) > maxIdle) {
Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2011-08-05 22:36:04 UTC (rev 33643)
+++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2011-08-06 00:13:52 UTC (rev 33644)
@@ -133,7 +133,7 @@
result.add(markers[i]);
}
}
- return result.toArray(new IMarker[0]);
+ return result.toArray(new IMarker[result.size()]);
}
public static void assertMarkerIsCreated(IResource resource, MarkerData markerData) throws CoreException {
14 years, 8 months
JBoss Tools SVN: r33643 - branches/jbosstools-3.2.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-08-05 18:36:04 -0400 (Fri, 05 Aug 2011)
New Revision: 33643
Modified:
branches/jbosstools-3.2.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java
Log:
JBIDE-9103 Deadlock issue when creating a JSF portlet
Modified: branches/jbosstools-3.2.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java
===================================================================
--- branches/jbosstools-3.2.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java 2011-08-05 22:31:47 UTC (rev 33642)
+++ branches/jbosstools-3.2.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java 2011-08-05 22:36:04 UTC (rev 33643)
@@ -11,6 +11,8 @@
import org.eclipse.wst.common.project.facet.core.IFacetedProjectBase;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent;
+import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener;
import org.jboss.tools.portlet.core.IPortletConstants;
import org.jboss.tools.portlet.core.Messages;
import org.jboss.tools.portlet.core.PortletCoreActivator;
@@ -24,6 +26,7 @@
private String richfacesType;
private String richfacesRuntime;
private Boolean isEPP = null;
+ private IFacetedProjectListener listener;
@Override
public synchronized IStatus validate() {
@@ -105,11 +108,12 @@
@Override
public void reset() {
super.reset();
- isEPP = null;
+ isEPP = PortletCoreActivator.isEPP(getFacetedProject());
IProjectFacet f = getProjectFacet();
try {
Preferences prefs = FacetedProjectFramework.getPreferences( f );
prefs = prefs.node(IPortletConstants.PORTLET_BRIDGE_HOME);
+ prefs.putBoolean(IPortletConstants.IS_EPP, isEPP);
if( prefs.nodeExists( IPortletConstants.PREFS_PORTLETBRIDGE_HOME ) ) {
addRichfacesCapabilities = prefs.getBoolean(IPortletConstants.RICHFACES_CAPABILITIES, false);
richfacesType = prefs.get(IPortletConstants.RICHFACES_LIBRARIES_TYPE, null);
@@ -118,6 +122,21 @@
} catch (BackingStoreException e) {
PortletCoreActivator.log(e);
}
+ listener = new IFacetedProjectListener() {
+
+ @Override
+ public void handleEvent(IFacetedProjectEvent event) {
+ isEPP = PortletCoreActivator.isEPP(getFacetedProject());
+ IProjectFacet f = getProjectFacet();
+ try {
+ Preferences prefs = FacetedProjectFramework.getPreferences( f );
+ prefs.putBoolean(IPortletConstants.IS_EPP, isEPP);
+ } catch (BackingStoreException e) {
+ PortletCoreActivator.log(e);
+ }
+ }
+ };
+ getFacetedProject().addListener(listener, IFacetedProjectEvent.Type.PRIMARY_RUNTIME_CHANGED);
}
public void setAddRichfacesCapabilities(boolean addRichfacesCapabilities) {
@@ -146,21 +165,29 @@
}
public boolean isEPP() {
- if (isEPP == null) {
- IFacetedProjectBase facetedProject = getFacetedProject();
- if (facetedProject == null) {
- return false;
- }
- isEPP = PortletCoreActivator.isEPP(facetedProject);
- IProjectFacet f = getProjectFacet();
- try {
- Preferences prefs = FacetedProjectFramework.getPreferences( f );
- prefs.putBoolean(IPortletConstants.IS_EPP, isEPP());
- } catch (BackingStoreException e) {
- PortletCoreActivator.log(e);
- }
- }
+// if (isEPP == null) {
+// IFacetedProjectBase facetedProject = getFacetedProject();
+// if (facetedProject == null) {
+// return false;
+// }
+// isEPP = PortletCoreActivator.isEPP(facetedProject);
+// IProjectFacet f = getProjectFacet();
+// try {
+// Preferences prefs = FacetedProjectFramework.getPreferences( f );
+// prefs.putBoolean(IPortletConstants.IS_EPP, isEPP);
+// } catch (BackingStoreException e) {
+// PortletCoreActivator.log(e);
+// }
+// }
return isEPP;
}
+ @Override
+ public void dispose() {
+ if (listener != null) {
+ getFacetedProject().removeListener(listener);
+ }
+ super.dispose();
+ }
+
}
14 years, 8 months
JBoss Tools SVN: r33642 - branches/jbosstools-3.2.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-08-05 18:31:47 -0400 (Fri, 05 Aug 2011)
New Revision: 33642
Modified:
branches/jbosstools-3.2.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/WTPRuntimeFix.java
Log:
JBIDE-9361 Imported project examples with multiple projects don't have build path set correctly
Modified: branches/jbosstools-3.2.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/WTPRuntimeFix.java
===================================================================
--- branches/jbosstools-3.2.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/WTPRuntimeFix.java 2011-08-05 22:25:48 UTC (rev 33641)
+++ branches/jbosstools-3.2.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/WTPRuntimeFix.java 2011-08-05 22:31:47 UTC (rev 33642)
@@ -85,6 +85,7 @@
try {
IFacetedProject facetedProject = ProjectFacetsManager.create(eclipseProject);
if (facetedProject == null) {
+ fixNonFacetedEsbProject(project, fix, eclipseProject);
continue;
}
org.eclipse.wst.common.project.facet.core.runtime.IRuntime wtpRuntime = facetedProject.getPrimaryRuntime();
@@ -97,9 +98,11 @@
wtpRuntime = RuntimeManager.getRuntime(runtime.getId());
facetedProject.addTargetedRuntime(wtpRuntime, monitor);
facetedProject.setPrimaryRuntime(wtpRuntime, monitor);
- fixEsb(eclipseProject, fix, wtpRuntime);
+ fixEsb(eclipseProject, fix, runtime);
}
}
+ } else {
+ fixNonFacetedEsbProject(project, fix, eclipseProject);
}
} catch (CoreException e) {
ProjectExamplesActivator.log(e);
@@ -109,8 +112,16 @@
return ret;
}
+ private void fixNonFacetedEsbProject(Project project, ProjectFix fix,
+ IProject eclipseProject) throws JavaModelException {
+ IRuntime runtime = getBestRuntime(project, fix);
+ if (runtime != null) {
+ fixEsb(eclipseProject, fix, runtime);
+ }
+ }
+
private void fixEsb(IProject eclipseProject,
- ProjectFix fix, org.eclipse.wst.common.project.facet.core.runtime.IRuntime wtpRuntime) throws JavaModelException {
+ ProjectFix fix, IRuntime runtime) throws JavaModelException {
String required_components = fix.getProperties().get(REQUIRED_COMPONENTS);
if (required_components == null) {
return;
@@ -135,7 +146,6 @@
IClasspathEntry[] entries = javaProject.getRawClasspath();
IClasspathEntry[] newEntries = new IClasspathEntry[entries.length];
boolean changed = false;
- IRuntime runtime = getRuntime(wtpRuntime);
for (int i = 0; i < entries.length; i++) {
IClasspathEntry entry = entries[i];
if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
14 years, 8 months
JBoss Tools SVN: r33641 - branches/jbosstools-3.2.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-08-05 18:25:48 -0400 (Fri, 05 Aug 2011)
New Revision: 33641
Modified:
branches/jbosstools-3.2.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java
Log:
JBIDE-9344 the bpel example has a empty folder that should not be there
Modified: branches/jbosstools-3.2.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java
===================================================================
--- branches/jbosstools-3.2.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java 2011-08-05 22:09:45 UTC (rev 33640)
+++ branches/jbosstools-3.2.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java 2011-08-05 22:25:48 UTC (rev 33641)
@@ -643,11 +643,23 @@
ZipFile sourceFile = new ZipFile(file);
ZipLeveledStructureProvider structureProvider = new ZipLeveledStructureProvider(
sourceFile);
+ Enumeration<? extends ZipEntry> entries = sourceFile.entries();
+ ZipEntry entry = null;
+ List<ZipEntry> filesToImport = new ArrayList<ZipEntry>();
+ String prefix = projectName + "/"; //$NON-NLS-1$
+ while (entries.hasMoreElements()) {
+ entry = entries.nextElement();
+ if (entry.isDirectory()) {
+ continue;
+ }
+ if (entry.getName().startsWith(prefix)) {
+ filesToImport.add(entry);
+ }
+ }
structureProvider.setStrip(1);
- ImportOperation operation = new ImportOperation(project
- .getFullPath(), structureProvider.getRoot(), structureProvider,
- OVERWRITE_ALL_QUERY);
+ ImportOperation operation = new ImportOperation(project.getFullPath(), structureProvider.getRoot(),
+ structureProvider, OVERWRITE_ALL_QUERY, filesToImport);
operation.setContext(getActiveShell());
operation.run(monitor);
reconfigure(project, monitor);
14 years, 8 months
JBoss Tools SVN: r33640 - trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-08-05 18:09:45 -0400 (Fri, 05 Aug 2011)
New Revision: 33640
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java
Log:
JBIDE-9103 Deadlock issue when creating a JSF portlet
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java 2011-08-05 20:09:47 UTC (rev 33639)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java 2011-08-05 22:09:45 UTC (rev 33640)
@@ -124,7 +124,6 @@
}
listener = new IFacetedProjectListener() {
- @Override
public void handleEvent(IFacetedProjectEvent event) {
isEPP = PortletCoreActivator.isEPP(getFacetedProject());
IProjectFacet f = getProjectFacet();
14 years, 8 months
JBoss Tools SVN: r33639 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test: projects/Seam3PersistenceTest and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-05 16:09:47 -0400 (Fri, 05 Aug 2011)
New Revision: 33639
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.classpath
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.project
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.settings/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.settings/org.eclipse.jdt.core.prefs
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/A.class
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/EntityManagerTest.class
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/MyQualifier.class
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/cdi-api.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/hibernate3.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/javax.inject.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/seam-persistence.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/seam-solder.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/EntityManagerTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/MyQualifier.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java
Log:
JBIDE-9400
https://issues.jboss.org/browse/JBIDE-9400
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.classpath
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.classpath (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.classpath 2011-08-05 20:09:47 UTC (rev 33639)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/cdi-api.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate3.jar"/>
+ <classpathentry kind="lib" path="lib/javax.inject.jar"/>
+ <classpathentry kind="lib" path="lib/seam-persistence.jar"/>
+ <classpathentry kind="lib" path="lib/seam-solder.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.project
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.project (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.project 2011-08-05 20:09:47 UTC (rev 33639)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Seam3PersistenceTest</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.cdi.core.cdibuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ <nature>org.jboss.tools.cdi.core.cdinature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.settings/org.eclipse.jdt.core.prefs 2011-08-05 20:09:47 UTC (rev 33639)
@@ -0,0 +1,12 @@
+#Fri Aug 05 12:26:35 PDT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/A.class
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/A.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/EntityManagerTest.class
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/EntityManagerTest.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/MyQualifier.class
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/bin/test/MyQualifier.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/cdi-api.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/cdi-api.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/hibernate3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/hibernate3.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/javax.inject.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/javax.inject.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/seam-persistence.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/seam-persistence.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/seam-solder.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/lib/seam-solder.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/EntityManagerTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/EntityManagerTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/EntityManagerTest.java 2011-08-05 20:09:47 UTC (rev 33639)
@@ -0,0 +1,31 @@
+package test;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.jboss.seam.solder.core.ExtensionManaged;
+
+public class EntityManagerTest {
+
+ @ExtensionManaged
+ @Produces
+ @MyQualifier
+ EntityManagerFactory managerFactory;
+
+
+ @Inject
+ @MyQualifier
+ EntityManager manager;
+
+ @ExtensionManaged
+ @Produces
+ SessionFactory sessionFactory;
+
+ @Inject
+ Session session;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/EntityManagerTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/MyQualifier.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/MyQualifier.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/MyQualifier.java 2011-08-05 20:09:47 UTC (rev 33639)
@@ -0,0 +1,21 @@
+package test;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface MyQualifier {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3PersistenceTest/src/test/MyQualifier.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java 2011-08-05 19:21:31 UTC (rev 33638)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java 2011-08-05 20:09:47 UTC (rev 33639)
@@ -16,6 +16,8 @@
import org.eclipse.jdt.internal.core.JavaModelManager;
import org.jboss.tools.cdi.seam.core.test.international.BundleModelTest;
import org.jboss.tools.cdi.seam.core.test.international.SeamResourceBundlesTest;
+import org.jboss.tools.cdi.seam.core.test.persistence.SeamPersistenceTest;
+import org.jboss.tools.cdi.seam.core.test.persistence.SeamPersistenceTestSetup;
import org.jboss.tools.cdi.seam.core.test.servlet.SeamServletValidationTest;
/**
@@ -35,6 +37,10 @@
TestSuite suite = new TestSuite("Seam Core Project Tests");
suiteAll.addTest(new SeamCoreTestSetup(suite));
suiteAll.addTestSuite(SeamServletValidationTest.class);
+
+ suite = new TestSuite("Seam Persistence Project Tests");
+ suiteAll.addTest(new SeamPersistenceTestSetup(suite));
+ suiteAll.addTestSuite(SeamPersistenceTest.class);
return suiteAll;
}
}
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java 2011-08-05 20:09:47 UTC (rev 33639)
@@ -0,0 +1,58 @@
+package org.jboss.tools.cdi.seam.core.test.persistence;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.cdi.core.IInjectionPoint;
+import org.jboss.tools.cdi.core.test.DependentProjectTest;
+import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
+import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
+import org.jboss.tools.test.util.ResourcesUtils;
+import org.jboss.tools.tests.AbstractResourceMarkerTest;
+
+public class SeamPersistenceTest extends TestCase {
+
+ protected IProject project;
+
+ public IProject getTestProject() throws IOException, CoreException, InvocationTargetException, InterruptedException {
+ if(project==null) {
+ ValidatorManager.setStatus("INIT");
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject(SeamPersistenceTestSetup.PROJECT_NAME);
+ if(!project.exists()) {
+ project = ResourcesUtils.importProject(SeamPersistenceTestSetup.PLUGIN_ID, SeamPersistenceTestSetup.PROJECT_PATH);
+ }
+ TestUtil.waitForValidation();
+ }
+ return project;
+ }
+
+ public void testEntityManagerInjection() throws Exception {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+ IInjectionPoint p = DependentProjectTest.getInjectionPointField(cdi, "/src/test/EntityManagerTest.java", "manager");
+ assertNotNull(p);
+
+ Set<IBean> bs = cdi.getBeans(false, p);
+ assertEquals(1, bs.size());
+ }
+
+ public void testSessionInjection() throws Exception {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+ IInjectionPoint p = DependentProjectTest.getInjectionPointField(cdi, "/src/test/EntityManagerTest.java", "session");
+ assertNotNull(p);
+
+ Set<IBean> bs = cdi.getBeans(false, p);
+ assertFalse(bs.isEmpty());
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java 2011-08-05 20:09:47 UTC (rev 33639)
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.core.test.persistence;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class SeamPersistenceTestSetup extends TestSetup {
+
+ public static final String PLUGIN_ID = "org.jboss.tools.cdi.seam.core.test";
+ public static final String PROJECT_NAME = "Seam3PersistenceTest";
+ public static final String PROJECT_PATH = "/projects/Seam3PersistenceTest";
+
+ protected IProject project;
+
+ public SeamPersistenceTestSetup(Test test) {
+ super(test);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
+ if(!project.exists()) {
+ project = ResourcesUtils.importProject(PLUGIN_ID, PROJECT_PATH);
+ }
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ JobUtils.waitForIdle();
+ project.delete(true, true, null);
+ JobUtils.waitForIdle();
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 8 months
JBoss Tools SVN: r33638 - 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: akazakov
Date: 2011-08-05 15:21:31 -0400 (Fri, 05 Aug 2011)
New Revision: 33638
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
Log:
https://issues.jboss.org/browse/JBIDE-9288
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2011-08-05 19:21:00 UTC (rev 33637)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2011-08-05 19:21:31 UTC (rev 33638)
@@ -368,8 +368,8 @@
validationContext.addLinkedEl(variable.getName(), elReference);
}
- if (resolution.isResolved()) {
- // It's valid EL.
+ if (resolution.isResolved() || !resolution.isValidatable()) {
+ // It's valid EL or we should ignore it.
return;
}
14 years, 8 months
JBoss Tools SVN: r33637 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-05 15:21:00 -0400 (Fri, 05 Aug 2011)
New Revision: 33637
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolution.java
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolutionImpl.java
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELSegment.java
Log:
https://issues.jboss.org/browse/JBIDE-9288
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolution.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolution.java 2011-08-05 19:13:30 UTC (rev 33636)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolution.java 2011-08-05 19:21:00 UTC (rev 33637)
@@ -76,6 +76,12 @@
boolean isResolved();
/**
+ * Returns false if EL validator should ignore this EL and don't mark it as a problem even if the EL is not resolved.
+ * @return
+ */
+ boolean isValidatable();
+
+ /**
* @return last segment. May return null.
*/
ELSegment getLastSegment();
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolutionImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolutionImpl.java 2011-08-05 19:13:30 UTC (rev 33636)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolutionImpl.java 2011-08-05 19:21:00 UTC (rev 33637)
@@ -270,4 +270,18 @@
}
return super.toString();
}
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.common.el.core.resolver.ELResolution#isValidatable()
+ */
+ @Override
+ public boolean isValidatable() {
+ for (ELSegment segment : segments) {
+ if(!segment.isValidatable()) {
+ return false;
+ }
+ }
+ return true;
+ }
}
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELSegment.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELSegment.java 2011-08-05 19:13:30 UTC (rev 33636)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELSegment.java 2011-08-05 19:21:00 UTC (rev 33637)
@@ -56,7 +56,7 @@
List<IVariable> getVariables();
/**
- * Returns false if EL validator should ignore this segment and don't mark it as a problem even if the segemtn is not resolved.
+ * Returns false if EL validator should ignore this segment and don't mark it as a problem even if the segment is not resolved.
* @return
*/
boolean isValidatable();
14 years, 8 months
JBoss Tools SVN: r33636 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-05 15:13:30 -0400 (Fri, 05 Aug 2011)
New Revision: 33636
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
Log:
https://issues.jboss.org/browse/JBIDE-9288
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2011-08-05 19:07:53 UTC (rev 33635)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2011-08-05 19:13:30 UTC (rev 33636)
@@ -1023,7 +1023,8 @@
}
}
}
- segment.setResolved(!resolution.getProposals().isEmpty() || resolution.isMapOrCollectionOrBundleAmoungTheTokens());
+ segment.setResolved(!resolution.getProposals().isEmpty());
+ segment.setValidatable(!resolution.isMapOrCollectionOrBundleAmoungTheTokens());
}
protected boolean isSingularMember(TypeInfoCollector.MemberInfo mbr) {
14 years, 8 months