Author: dgolovin Date: 2009-08-20 20:05:46 -0400 (Thu, 20 Aug 2009) New Revision: 17195 Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFEST.MF trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE1406Test.java trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2099Test.java trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2296Test.java trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2311Test.java trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2315Test.java trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2439Test.java trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ui/BuildActionTest.java trunk/bpel/tests/org.jboss.tools.bpel.ui.test/META-INF/MANIFEST.MF trunk/bpel/tests/org.jboss.tools.bpel.ui.test/build.properties trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestsBase.java trunk/seam/features/org.jboss.tools.seam.feature/feature.xml trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml trunk/struts/plugins/org.jboss.tools.struts.verification/META-INF/MANIFEST.MF trunk/struts/plugins/org.jboss.tools.struts.verification/build.properties trunk/tests/features/org.jboss.tools.all.test.feature/feature.xml trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTextTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java Log: JUnit Tests Improvements: 1. coverage errors were fixed related to emma to be not aware of many classes form drools and bpel 2. Sources were removed from coverage report to save time during upload it just shows coverage per package basis 3. Coverage was split to components 4. BPEL-Convert suit has wrong class name in properties 5. Archives tests were moved to separate feature Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFEST.MF =================================================================== --- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFEST.MF 2009-08-20 22:20:37 UTC (rev 17194) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFEST.MF 2009-08-21 00:05:46 UTC (rev 17195) @@ -9,7 +9,6 @@ org.jboss.ide.eclipse.archives.core, org.eclipse.core.resources, org.jboss.tools.tests, - org.jboss.tools.common.test, org.eclipse.core.variables;bundle-version="3.2.100", org.eclipse.debug.core;bundle-version="3.4.0", org.apache.ant;bundle-version="1.7.0", Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE1406Test.java =================================================================== --- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE1406Test.java 2009-08-20 22:20:37 UTC (rev 17194) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE1406Test.java 2009-08-21 00:05:46 UTC (rev 17195) @@ -21,7 +21,7 @@ import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate; import org.jboss.ide.eclipse.archives.core.util.PathUtils; import org.jboss.ide.eclipse.archives.test.ArchivesTest; -import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.test.util.ResourcesUtils; /** * This class tests first and foremost @@ -36,22 +36,19 @@ * */ public class JBIDE1406Test extends TestCase { - private TestProjectProvider provider; private IProject project; private IPath outputDir; private IPath propsFile; protected void setUp() throws Exception { - provider = new TestProjectProvider(ArchivesTest.PLUGIN_ID, - "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE1406", - null, true); - project = provider.getProject(); + project = ResourcesUtils.importProject(ArchivesTest.PLUGIN_ID, + "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE1406"); project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); outputDir = project.getLocation().append("output").append("JBIDE1406.jar"); propsFile = outputDir.append("src").append("in.properties"); } protected void tearDown() throws Exception { - provider.dispose(); + ResourcesUtils.deleteProject("JBIDE1406"); } public void testJBIDE1406() { Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2099Test.java =================================================================== --- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2099Test.java 2009-08-20 22:20:37 UTC (rev 17194) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2099Test.java 2009-08-21 00:05:46 UTC (rev 17195) @@ -20,24 +20,21 @@ import org.eclipse.core.runtime.Path; import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate; import org.jboss.ide.eclipse.archives.test.ArchivesTest; -import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.test.util.ResourcesUtils; public class JBIDE2099Test extends TestCase { - private TestProjectProvider provider; private IProject project; private IPath outputWar; protected void setUp() throws Exception { - provider = new TestProjectProvider(ArchivesTest.PLUGIN_ID, - "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE2099", - null, true); - project = provider.getProject(); + project = ResourcesUtils.importProject(ArchivesTest.PLUGIN_ID, + "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE2099"); project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); outputWar = project.getLocation().append("output").append("dist") .append("unified-http-invoker.sar").append("unified-invoker.war"); } protected void tearDown() throws Exception { - provider.dispose(); + ResourcesUtils.deleteProject("JBIDE2099"); } public void testJBIDE2099() { Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2296Test.java =================================================================== --- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2296Test.java 2009-08-20 22:20:37 UTC (rev 17194) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2296Test.java 2009-08-21 00:05:46 UTC (rev 17195) @@ -20,22 +20,19 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.jboss.ide.eclipse.archives.test.ArchivesTest; -import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.test.util.ResourcesUtils; public class JBIDE2296Test extends TestCase { - private TestProjectProvider provider; private IProject project; protected void setUp() throws Exception { - provider = new TestProjectProvider(ArchivesTest.PLUGIN_ID, - "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE2296", - null, true); - project = provider.getProject(); + project = ResourcesUtils.importProject(ArchivesTest.PLUGIN_ID, + "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE2296"); project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); } protected void tearDown() throws Exception { - provider.dispose(); + ResourcesUtils.deleteProject("JBIDE2296"); } public void testJBIDE2296() { Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2311Test.java =================================================================== --- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2311Test.java 2009-08-20 22:20:37 UTC (rev 17194) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2311Test.java 2009-08-21 00:05:46 UTC (rev 17195) @@ -19,22 +19,19 @@ import org.eclipse.core.runtime.Path; import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate; import org.jboss.ide.eclipse.archives.test.ArchivesTest; -import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.test.util.ResourcesUtils; public class JBIDE2311Test extends TestCase { - private TestProjectProvider provider; private IProject project; protected void setUp() throws Exception { - provider = new TestProjectProvider(ArchivesTest.PLUGIN_ID, - "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE2311", - null, true); - project = provider.getProject(); + project = ResourcesUtils.importProject(ArchivesTest.PLUGIN_ID, + "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE2311"); project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); } protected void tearDown() throws Exception { - provider.dispose(); + ResourcesUtils.deleteProject("JBIDE2311"); } public void testJBIDE2311() { Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2315Test.java =================================================================== --- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2315Test.java 2009-08-20 22:20:37 UTC (rev 17194) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2315Test.java 2009-08-21 00:05:46 UTC (rev 17195) @@ -19,22 +19,19 @@ import org.eclipse.core.runtime.Path; import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate; import org.jboss.ide.eclipse.archives.test.ArchivesTest; -import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.test.util.ResourcesUtils; public class JBIDE2315Test extends TestCase { - private TestProjectProvider provider; private IProject project; protected void setUp() throws Exception { - provider = new TestProjectProvider(ArchivesTest.PLUGIN_ID, - "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE2315", - null, true); - project = provider.getProject(); + project = ResourcesUtils.importProject(ArchivesTest.PLUGIN_ID, + "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE2315"); project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); } protected void tearDown() throws Exception { - provider.dispose(); + ResourcesUtils.deleteProject("JBIDE2315"); } public void testJBIDE2311() { Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2439Test.java =================================================================== --- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2439Test.java 2009-08-20 22:20:37 UTC (rev 17194) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2439Test.java 2009-08-21 00:05:46 UTC (rev 17195) @@ -25,24 +25,19 @@ import org.eclipse.core.runtime.Path; import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate; import org.jboss.ide.eclipse.archives.test.ArchivesTest; -import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.test.util.ResourcesUtils; public class JBIDE2439Test extends TestCase { - private TestProjectProvider aProjectProvider, bProjectProvider; private IProject aProject, bProject; protected void setUp() throws Exception { - aProjectProvider = new TestProjectProvider(ArchivesTest.PLUGIN_ID, - "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE2439a", - null, true); - aProject = aProjectProvider.getProject(); + aProject = ResourcesUtils.importProject(ArchivesTest.PLUGIN_ID, + "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE2439a"); aProject.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); - bProjectProvider = new TestProjectProvider(ArchivesTest.PLUGIN_ID, - "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE2439b", - null, true); - bProject = bProjectProvider.getProject(); + bProject = ResourcesUtils.importProject(ArchivesTest.PLUGIN_ID, + "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE2439b"); bProject.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); IResource folder = bProject.findMember("linked"); @@ -56,8 +51,8 @@ protected void tearDown() throws Exception { - aProjectProvider.dispose(); - bProjectProvider.dispose(); + ResourcesUtils.deleteProject("JBIDE2439a"); + ResourcesUtils.deleteProject("JBIDE2439b"); } public void testJBIDE2439() { Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ui/BuildActionTest.java =================================================================== --- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ui/BuildActionTest.java 2009-08-20 22:20:37 UTC (rev 17194) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ui/BuildActionTest.java 2009-08-21 00:05:46 UTC (rev 17195) @@ -30,27 +30,23 @@ import org.jboss.ide.eclipse.archives.test.ArchivesTest; import org.jboss.ide.eclipse.archives.ui.actions.BuildAction; import org.jboss.ide.eclipse.archives.ui.providers.ArchivesContentProviderDelegate.WrappedProject; -import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.test.util.ResourcesUtils; public class BuildActionTest extends TestCase { - private TestProjectProvider provider; private IProject project; private boolean waiting = true; private boolean scheduled = false; private JobChangeAdapter jobChangeAdapter; private CoreException ce; protected void setUp() throws Exception { - provider = new TestProjectProvider(ArchivesTest.PLUGIN_ID, - "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE2099", - null, true); - project = provider.getProject(); + project = ResourcesUtils.importProject(ArchivesTest.PLUGIN_ID, + "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE2099"); project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); Job.getJobManager().addJobChangeListener(getJobChangeAdapter()); } protected void tearDown() throws Exception { - provider.dispose(); - Job.getJobManager().removeJobChangeListener(jobChangeAdapter); + ResourcesUtils.deleteProject("JBIDE2099"); } protected JobChangeAdapter getJobChangeAdapter() { Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.test/META-INF/MANIFEST.MF 2009-08-20 22:20:37 UTC (rev 17194) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.test/META-INF/MANIFEST.MF 2009-08-21 00:05:46 UTC (rev 17195) @@ -14,3 +14,6 @@ Import-Package: org.eclipse.core.resources, org.eclipse.ui.ide, org.jboss.tools.common.test.util +Export-Package: org.jboss.tools.bpel.ui.test, + org.jboss.tools.bpel.ui.test.editor +Bundle-ClassPath: bpel.ui.test.jar Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.test/build.properties =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.test/build.properties 2009-08-20 22:20:37 UTC (rev 17194) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.test/build.properties 2009-08-21 00:05:46 UTC (rev 17195) @@ -1,4 +1,5 @@ -source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - . + bpel.ui.test.jar,\ + projects/ +source.bpel.ui.test.jar = src/ Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestsBase.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestsBase.java 2009-08-20 22:20:37 UTC (rev 17194) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestsBase.java 2009-08-21 00:05:46 UTC (rev 17195) @@ -163,9 +163,9 @@ for (int k = 0; k < suite.testCount(); k++) { Test test = suite.testAt(k); test.run(result); -// ---------------------------------------------- -// https://jira.jboss.org/jira/browse/JBIDE-4740 -// first way to fix OutOfMemory problems + // ---------------------------------------------- + // https://jira.jboss.org/jira/browse/JBIDE-4740 + // first way to fix OutOfMemory problems closeAllEditors(); int LIMIT = 50, ii = 0; Modified: trunk/seam/features/org.jboss.tools.seam.feature/feature.xml =================================================================== --- trunk/seam/features/org.jboss.tools.seam.feature/feature.xml 2009-08-20 22:20:37 UTC (rev 17194) +++ trunk/seam/features/org.jboss.tools.seam.feature/feature.xml 2009-08-21 00:05:46 UTC (rev 17195) @@ -235,7 +235,8 @@ id="org.jboss.tools.seam.ui" download-size="0" install-size="0" - version="0.0.0"/> + version="0.0.0" + unpack="false"/> <plugin id="org.jboss.tools.seam.xml" Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2009-08-20 22:20:37 UTC (rev 17194) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2009-08-21 00:05:46 UTC (rev 17195) @@ -18,7 +18,7 @@ category="org.jboss.tools.seam.ui" class="org.jboss.tools.seam.ui.wizard.SeamProjectWizard" finalPerspective="org.jboss.tools.seam.ui.SeamPerspective" - icon="icons/view/seam_project_new.gif" + icon="$nl$/icons/view/seam_project_new.gif" id="org.jboss.tools.seam.ui.wizards.SeamProjectWizard" name="Seam Web Project" preferredPerspectives="org.jboss.tools.seam.ui.SeamPerspective" @@ -33,7 +33,7 @@ <wizard category="org.jboss.tools.seam.ui" class="org.jboss.tools.seam.ui.wizard.SeamActionWizard" - icon="icons/seam16.png" + icon="$nl$/icons/seam16.png" id="org.jboss.tools.seam.ui.wizard.SeamActionWizard" name="Seam Action"> <description> @@ -46,7 +46,7 @@ <wizard category="org.jboss.tools.seam.ui" class="org.jboss.tools.seam.ui.wizard.SeamFormWizard" - icon="icons/seam16.png" + icon="$nl$/icons/seam16.png" id="org.jboss.tools.seam.ui.wizard.SeamFormWizard" name="Seam Form"> <description> @@ -59,7 +59,7 @@ <wizard category="org.jboss.tools.seam.ui" class="org.jboss.tools.seam.ui.wizard.SeamConversationWizard" - icon="icons/seam16.png" + icon="$nl$/icons/seam16.png" id="org.jboss.tools.seam.ui.wizard.SeamConversationWizard" name="Seam Conversation"> <description> @@ -73,7 +73,7 @@ <wizard category="org.jboss.tools.seam.ui" class="org.jboss.tools.seam.ui.wizard.SeamEntityWizard" - icon="icons/seam16.png" + icon="$nl$/icons/seam16.png" id="org.jboss.tools.seam.ui.wizard.SeamEntityWizard" name="Seam Entity"> <description> @@ -86,7 +86,7 @@ <wizard category="org.jboss.tools.seam.ui" class="org.jboss.tools.seam.ui.wizard.SeamGenerateEntitiesWizard" - icon="icons/seam16.png" + icon="$nl$/icons/seam16.png" id="org.jboss.tools.seam.ui.wizard.SeamGenerateEnitiesWizard" name="Seam Generate Entities"> <description> @@ -122,7 +122,7 @@ <view category="org.jboss.tools.seam.ui" class="org.eclipse.ui.navigator.CommonNavigator" - icon="icons/seam16.png" + icon="$nl$/icons/seam16.png" id="org.jboss.tools.seam.ui.views.SeamComponentsNavigator" name="%ViewName_SeamComponents"> </view> @@ -187,7 +187,7 @@ <navigatorContent name="%NavigatorContent_SeamComponents" priority="highest" - icon="icons/sample.gif" + icon="$nl$/icons/seam16.png" activeByDefault="true" contentProvider="org.jboss.tools.seam.ui.views.RootContentProvider" labelProvider="org.jboss.tools.seam.ui.views.SeamLabelProvider" @@ -250,7 +250,7 @@ <navigatorContent name="%NavigatorContent_SeamComponents" priority="highest" - icon="icons/sample.gif" + icon="$nl$/icons/seam16.png" activeByDefault="true" contentProvider="org.jboss.tools.seam.ui.views.ProjectContentProvider" labelProvider="org.jboss.tools.seam.ui.views.SeamProjectLabelProvider" @@ -317,7 +317,7 @@ <extension point="org.eclipse.jdt.ui.javaCompletionProposalComputer" id="seam_el_proposals" name="Seam EL Proposals"> - <proposalCategory icon="icons/seam16.png"/> + <proposalCategory icon="$nl$/icons/seam16.png"/> </extension> <extension point="org.eclipse.jdt.ui.javaCompletionProposalComputer" @@ -456,7 +456,7 @@ point="org.eclipse.ui.perspectives"> <perspective class="org.jboss.tools.seam.ui.SeamPerspectiveFactory" - icon="icons/seam16.png" + icon="$nl$/icons/seam16.png" id="org.jboss.tools.seam.ui.SeamPerspective" name="%perspective.name"> </perspective> @@ -576,7 +576,7 @@ commandId="org.jboss.tools.seam.ui.open.component" id="openComponent" mnemonic="Z" - icon="icons/open_seam_component.gif" + icon="$nl$/icons/open_seam_component.gif" label="Open Seam Component" tooltip="Open Seam Component" > </command> @@ -589,7 +589,7 @@ commandId="org.jboss.tools.seam.ui.open.component" id="openComponent" mnemonic="Z" - icon="icons/open_seam_component.gif" + icon="$nl$/icons/open_seam_component.gif" label="Open Seam Component" tooltip="Open Seam Component" > </command> @@ -612,7 +612,7 @@ commandId="org.jboss.tools.seam.ui.find.references" id="findReferences" mnemonic="G" - icon="icons/find_seam_references.gif" + icon="$nl$/icons/find_seam_references.gif" label="Find Seam References" tooltip="Find Seam References" > </command> @@ -620,7 +620,7 @@ commandId="org.jboss.tools.seam.ui.find.declarations" id="findDeclarations" mnemonic="G" - icon="icons/open_seam_component.gif" + icon="$nl$/icons/open_seam_component.gif" label="Find Seam Declarations" tooltip="Find Seam Declarations" > </command> Modified: trunk/struts/plugins/org.jboss.tools.struts.verification/META-INF/MANIFEST.MF =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.verification/META-INF/MANIFEST.MF 2009-08-20 22:20:37 UTC (rev 17194) +++ trunk/struts/plugins/org.jboss.tools.struts.verification/META-INF/MANIFEST.MF 2009-08-21 00:05:46 UTC (rev 17195) @@ -18,3 +18,4 @@ Bundle-Activator: org.jboss.tools.struts.verification.StrutsVerificationPlugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . Modified: trunk/struts/plugins/org.jboss.tools.struts.verification/build.properties =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.verification/build.properties 2009-08-20 22:20:37 UTC (rev 17194) +++ trunk/struts/plugins/org.jboss.tools.struts.verification/build.properties 2009-08-21 00:05:46 UTC (rev 17195) @@ -2,7 +2,10 @@ *.jar,\ plugin.properties,\ about.html,\ - META-INF/ + META-INF/,\ + . source.. = src/,\ resources/ jars.compile.order = . +source.. = src/,\ + resources/ Modified: trunk/tests/features/org.jboss.tools.all.test.feature/feature.xml =================================================================== --- trunk/tests/features/org.jboss.tools.all.test.feature/feature.xml 2009-08-20 22:20:37 UTC (rev 17194) +++ trunk/tests/features/org.jboss.tools.all.test.feature/feature.xml 2009-08-21 00:05:46 UTC (rev 17195) @@ -15,6 +15,7 @@ <license url="http://www.example.com/license"> [Enter License Description here.] </license> + <plugin id="org.jboss.tools.common.kb.test" download-size="0" @@ -161,12 +162,6 @@ version="0.0.0"/> <plugin - id="org.jboss.ide.eclipse.archives.test" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin id="org.jboss.tools.common.el.core.test" download-size="0" install-size="0" Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-08-20 22:20:37 UTC (rev 17194) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-08-21 00:05:46 UTC (rev 17195) @@ -15,7 +15,6 @@ import java.util.List; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -73,12 +72,10 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.jboss.tools.common.el.core.ELReferenceList; -import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.event.XModelTreeEvent; import org.jboss.tools.common.model.event.XModelTreeListener; import org.jboss.tools.common.model.options.PreferenceModelUtilities; -import org.jboss.tools.common.model.project.IModelNature; import org.jboss.tools.common.model.ui.dnd.ModelTransfer; import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput; import org.jboss.tools.common.model.ui.editors.dnd.DropCommandFactory; @@ -86,8 +83,6 @@ import org.jboss.tools.common.model.ui.editors.dnd.DropUtils; import org.jboss.tools.common.model.ui.editors.dnd.IDropCommand; import org.jboss.tools.common.model.ui.editors.dnd.JSPTagProposalFactory; -import org.jboss.tools.common.model.ui.editors.dnd.context.DropContext; -import org.jboss.tools.common.model.ui.editors.dnd.context.IDNDTextEditor; import org.jboss.tools.common.model.ui.editors.dnd.context.InnerDragBuffer; import org.jboss.tools.common.model.ui.util.ModelUtilities; import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper; @@ -97,8 +92,6 @@ import org.jboss.tools.jst.jsp.editor.IJSPTextEditor; import org.jboss.tools.jst.jsp.editor.IVisualController; import org.jboss.tools.jst.jsp.preferences.VpePreference; -import org.jboss.tools.jst.web.model.helpers.WebAppHelper; -import org.jboss.tools.jst.web.project.WebProject; import org.jboss.tools.jst.web.tld.TLDUtil; import org.jboss.tools.jst.web.tld.URIConstants; import org.jboss.tools.vpe.VpeDebug; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTextTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTextTemplate.java 2009-08-20 22:20:37 UTC (rev 17194) +++ trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTextTemplate.java 2009-08-21 00:05:46 UTC (rev 17195) @@ -70,10 +70,13 @@ Point selection = pageContext.getSourceBuilder().getSelectionRange(); //processing for el expressions int offset = TextUtil.getStartELDocumentPosition(sourceNode); - if(offset!=-1) { - return new Region(offset,0); + IRegion resultRegion; + if(offset >= 0) { + resultRegion = new Region(offset,0); + } else { + resultRegion = new Region(selection.x,0); } - return new Region(selection.x,0); + return resultRegion; }