JBoss Tools SVN: r17200 - in trunk/bpel/plugins/org.jboss.tools.bpel.as.integration: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-08-20 21:09:27 -0400 (Thu, 20 Aug 2009)
New Revision: 17200
Added:
trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/plugin.properties
Modified:
trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/META-INF/MANIFEST.MF
Log:
https://jira.jboss.org/jira/browse/JBIDE-4571 fix provider and plug-in names for bpel.as.integration
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/META-INF/MANIFEST.MF 2009-08-21 01:07:38 UTC (rev 17199)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/META-INF/MANIFEST.MF 2009-08-21 01:09:27 UTC (rev 17200)
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: BPEL JBoss AS Publisher
+Bundle-Name: %pluginName
Bundle-SymbolicName: org.jboss.tools.bpel.as.integration;singleton:=true
Bundle-Version: 1.0.0
Bundle-Activator: org.jboss.tools.bpel.as.integration.Activator
@@ -13,3 +13,4 @@
org.eclipse.bpel.runtimes;bundle-version="0.4.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: %providerName
Added: trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/plugin.properties
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/plugin.properties (rev 0)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/plugin.properties 2009-08-21 01:09:27 UTC (rev 17200)
@@ -0,0 +1,2 @@
+pluginName=BPEL JBoss AS Publisher
+providerName=JBoss by Red Hat
\ No newline at end of file
Property changes on: trunk/bpel/plugins/org.jboss.tools.bpel.as.integration/plugin.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 4 months
JBoss Tools SVN: r17199 - trunk/smooks/plugins/org.jboss.tools.smooks.runtime.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-08-20 21:07:38 -0400 (Thu, 20 Aug 2009)
New Revision: 17199
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.runtime/build.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-4571 fix provider and plug-in names for smooks.runtime
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.runtime/build.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.runtime/build.properties 2009-08-21 00:56:50 UTC (rev 17198)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.runtime/build.properties 2009-08-21 01:07:38 UTC (rev 17199)
@@ -6,5 +6,6 @@
libs/milyn-smooks-csv-1.2.1.jar,\
libs/milyn-smooks-edi-1.2.1.jar,\
libs/milyn-smooks-json-1.2.1.jar,\
- libs/opencsv-1.8.jar
+ libs/opencsv-1.8.jar,\
+ plugin.properties
jars.compile.order =
16 years, 4 months
JBoss Tools SVN: r17198 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui: jbossui/org/jboss/ide/eclipse/as/ui/editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-08-20 20:56:50 -0400 (Thu, 20 Aug 2009)
New Revision: 17198
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleDeploymentPage.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-4374 - changing page name
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleDeploymentPage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleDeploymentPage.java 2009-08-21 00:42:46 UTC (rev 17197)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleDeploymentPage.java 2009-08-21 00:56:50 UTC (rev 17198)
@@ -84,7 +84,7 @@
ScrolledForm form = toolkit.createScrolledForm(parent);
toolkit.decorateFormHeading(form.getForm());
- form.setText("Module Deployment");
+ form.setText("Deployment");
form.getBody().setLayout(new GridLayout());
final TabFolder tabFolder = new TabFolder(form.getBody(), SWT.NONE);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2009-08-21 00:42:46 UTC (rev 17197)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2009-08-21 00:56:50 UTC (rev 17198)
@@ -145,7 +145,7 @@
<page
class="org.jboss.ide.eclipse.as.ui.editor.ModuleDeploymentPage"
id="org.jboss.ide.eclipse.as.ui.editor.deploymentPage"
- name="Module Deployment"
+ name="Deployment"
typeIds="org.jboss.ide.eclipse.as.systemCopyServer, org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50">
</page>
</extension>
16 years, 4 months
JBoss Tools SVN: r17197 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-08-20 20:42:46 -0400 (Thu, 20 Aug 2009)
New Revision: 17197
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleDeploymentPage.java
Log:
JBIDE-4374 - changed to store inside the IServer until Eclipse 286699 is fixed
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2009-08-21 00:33:42 UTC (rev 17196)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2009-08-21 00:42:46 UTC (rev 17197)
@@ -68,7 +68,8 @@
private static String getDeployRootFolder(IModule[] moduleTree,
IDeployableServer server, String defaultFolder, String moduleProperty) {
String folder = defaultFolder;
- DeploymentPreferences prefs = DeploymentPreferenceLoader.loadPreferences(server.getServer());
+ // TODO bug 286699
+ DeploymentPreferences prefs = DeploymentPreferenceLoader.loadPreferencesFromServer(server.getServer());
DeploymentTypePrefs typePrefs = prefs.getOrCreatePreferences("local"); //$NON-NLS-1$
DeploymentModulePrefs modPrefs = typePrefs.getModulePrefs(moduleTree[0]);
if( modPrefs != null ) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2009-08-21 00:33:42 UTC (rev 17196)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2009-08-21 00:42:46 UTC (rev 17197)
@@ -1,29 +1,54 @@
package org.jboss.ide.eclipse.as.core.util;
+import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.HashMap;
import java.util.Set;
import org.eclipse.core.runtime.IPath;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.internal.Server;
import org.jboss.tools.jmx.core.IMemento;
import org.jboss.tools.jmx.core.util.XMLMemento;
public class DeploymentPreferenceLoader {
- public static DeploymentPreferences loadPreferences(IServer server) {
+ public static final String DEPLOYMENT_PREFERENCES_KEY = "org.jboss.ide.eclipse.as.core.util.deploymentPreferenceKey"; //$NON-NLS-1$
+
+ public static DeploymentPreferences loadPreferencesFromFile(IServer server) {
File f = getFile(server);
- return new DeploymentPreferences(f);
+ InputStream is = null;
+ try {
+ if( f.exists())
+ is = new FileInputStream(f);
+ } catch( IOException ioe) {}
+ return new DeploymentPreferences(is);
}
+
+ public static DeploymentPreferences loadPreferencesFromServer(IServer server) {
+ String xml = ((Server)server).getAttribute(DEPLOYMENT_PREFERENCES_KEY, (String)null);
+ ByteArrayInputStream bis = null;
+ if( xml != null ) {
+ bis = new ByteArrayInputStream(xml.getBytes());
+ }
+ return new DeploymentPreferences(bis);
+ }
public static void savePreferences(IServer server, DeploymentPreferences prefs) throws IOException {
File f = getFile(server);
prefs.getMemento().saveToFile(f.getAbsolutePath());
}
+ public static void savePreferences(OutputStream os, DeploymentPreferences prefs) {
+ try {
+ prefs.getMemento().save(os);
+ } catch(IOException ioe) {}
+ }
+
protected static File getFile(IServer server) {
IPath loc = ServerUtil.getServerStateLocation(server);
return loc.append("deploymentPreferences.xml").toFile(); //$NON-NLS-1$
@@ -32,18 +57,15 @@
public static class DeploymentPreferences {
private HashMap<String, DeploymentTypePrefs> children;
private XMLMemento memento;
- public DeploymentPreferences(File f) {
+ public DeploymentPreferences(InputStream is) {
children = new HashMap<String, DeploymentTypePrefs>();
- if( f.exists()) {
- try {
- FileInputStream is = new FileInputStream(f);
+ if( is != null) {
memento = XMLMemento.createReadRoot(is);
String[] deploymentTypes = memento.getChildNames();
for( int i = 0; i < deploymentTypes.length; i++ )
children.put(deploymentTypes[i],
new DeploymentTypePrefs(deploymentTypes[i],
memento.getChild(deploymentTypes[i])));
- } catch( FileNotFoundException fnfe) {}
} else {
memento = XMLMemento.createWriteRoot("deployment"); //$NON-NLS-1$
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleDeploymentPage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleDeploymentPage.java 2009-08-21 00:33:42 UTC (rev 17196)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleDeploymentPage.java 2009-08-21 00:42:46 UTC (rev 17197)
@@ -1,5 +1,6 @@
package org.jboss.ide.eclipse.as.ui.editor;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
@@ -19,7 +20,6 @@
import org.eclipse.ui.forms.widgets.ScrolledForm;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.ui.editor.IServerEditorPartInput;
import org.eclipse.wst.server.ui.editor.ServerEditorPart;
@@ -27,6 +27,7 @@
import org.eclipse.wst.server.ui.internal.editor.ServerEditorPartInput;
import org.eclipse.wst.server.ui.internal.editor.ServerResourceCommandManager;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentModulePrefs;
@@ -37,7 +38,8 @@
private ArrayList<IModule> possibleModules;
private DeploymentPreferences preferences;
private ArrayList<IDeploymentEditorTab> tabs;
-
+ private ServerAttributeHelper helper;
+
public IModule[] getPossibleModules() {
return (IModule[]) possibleModules.toArray(new IModule[possibleModules.size()]);
}
@@ -70,11 +72,12 @@
commandManager = ((ServerEditorPartInput) sepi).getServerCommandManager();
readOnly = sepi.isServerReadOnly();
}
+ helper = new ServerAttributeHelper(server.getOriginal(), server);
}
public void createPartControl(Composite parent) {
- preferences = DeploymentPreferenceLoader.loadPreferences(server.getOriginal());
+ preferences = DeploymentPreferenceLoader.loadPreferencesFromServer(server.getOriginal());
tabs = new ArrayList<IDeploymentEditorTab>();
FormToolkit toolkit = getFormToolkit(parent);
@@ -126,10 +129,19 @@
}
public void execute() {
p.setProperty(key, newVal);
+ saveToWC();
}
public void undo() {
p.setProperty(key, oldVal);
+ saveToWC();
}
+
+ protected void saveToWC() {
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ DeploymentPreferenceLoader.savePreferences(bos, preferences);
+ String asXML = new String(bos.toByteArray());
+ helper.setAttribute(DeploymentPreferenceLoader.DEPLOYMENT_PREFERENCES_KEY, asXML);
+ }
}
@@ -159,6 +171,8 @@
public void setFocus() {
}
+
+ // Currently inactive!!! See bug 286699
public void doSave(IProgressMonitor monitor) {
try {
DeploymentPreferenceLoader.savePreferences(server.getOriginal(), preferences);
16 years, 4 months
JBoss Tools SVN: r17196 - in trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui: schema and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-08-20 20:33:42 -0400 (Thu, 20 Aug 2009)
New Revision: 17196
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/schema/referenceWizardFragment.exsd
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/WTPOveridePlugin.java
Log:
ensuring all id's are correct for our temporary page while WTP is slow
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml 2009-08-21 00:05:46 UTC (rev 17195)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml 2009-08-21 00:33:42 UTC (rev 17196)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
- <extension-point id="moduleDependencyPropertyPage" name="org.jboss.ide.eclipse.as.wtp.override.moduleDependencyPropertyPage" schema="schema/moduleDependencyPropertyPage.exsd"/>
+ <extension-point id="moduleDependencyPropertyPage" name="moduleDependencyPropertyPage" schema="schema/moduleDependencyPropertyPage.exsd"/>
<extension-point id="referenceWizardFragment" name="referenceWizardFragment" schema="schema/referenceWizardFragment.exsd"/>
<extension point="org.eclipse.ui.propertyPages">
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/schema/referenceWizardFragment.exsd
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/schema/referenceWizardFragment.exsd 2009-08-21 00:05:46 UTC (rev 17195)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/schema/referenceWizardFragment.exsd 2009-08-21 00:33:42 UTC (rev 17196)
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.jboss.ide.eclipse.as.wtp.override.ui" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.jboss.ide.eclipse.as.wtp.ui" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.jboss.ide.eclipse.as.wtp.override.ui" id="referenceWizardFragment" name="referenceWizardFragment"/>
+ <meta.schema plugin="org.jboss.ide.eclipse.as.wtp.ui" id="referenceWizardFragment" name="referenceWizardFragment"/>
</appinfo>
<documentation>
[Enter description of this extension point.]
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/WTPOveridePlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/WTPOveridePlugin.java 2009-08-21 00:05:46 UTC (rev 17195)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/WTPOveridePlugin.java 2009-08-21 00:33:42 UTC (rev 17196)
@@ -13,7 +13,7 @@
public class WTPOveridePlugin extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.wtp.override.ui"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.wtp.ui"; //$NON-NLS-1$
// The shared instance
private static WTPOveridePlugin plugin;
16 years, 4 months
JBoss Tools SVN: r17195 - in trunk: archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects and 11 other directories.
by jbosstools-commits＠lists.jboss.org
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;
}
16 years, 4 months
JBoss Tools SVN: r17194 - branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-08-20 18:20:37 -0400 (Thu, 20 Aug 2009)
New Revision: 17194
Added:
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java
Log:
JBIDE-4796 fixed
Added: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java
===================================================================
--- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java (rev 0)
+++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java 2009-08-20 22:20:37 UTC (rev 17194)
@@ -0,0 +1,73 @@
+/**
+ * JBoss by Red Hat
+ * Copyright 2006-2009, Red Hat Middleware, LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.
+ */
+package org.jboss.ide.eclipse.as.ui.wizards;
+
+import java.util.ArrayList;
+
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.IVMInstall2;
+import org.eclipse.jdt.launching.IVMInstallType;
+import org.eclipse.jdt.launching.JavaRuntime;
+import org.jboss.ide.eclipse.as.ui.Messages;
+
+public class JBossRuntimeJava6WizardFragment extends JBossRuntimeWizardFragment {
+
+ public JBossRuntimeJava6WizardFragment() {
+ }
+
+ protected boolean shouldIncludeDefaultJRE() {
+ return false;
+ }
+
+ protected ArrayList<IVMInstall> getValidJREs() {
+ ArrayList<IVMInstall> valid = new ArrayList<IVMInstall>();
+ IVMInstallType[] vmInstallTypes = JavaRuntime.getVMInstallTypes();
+ int size = vmInstallTypes.length;
+ for (int i = 0; i < size; i++) {
+ IVMInstall[] vmInstalls = vmInstallTypes[i].getVMInstalls();
+ int size2 = vmInstalls.length;
+ for (int j = 0; j < size2; j++) {
+ if( vmInstalls[j] instanceof IVMInstall2 ) {
+ String version = ((IVMInstall2)vmInstalls[j]).getJavaVersion();
+ if( isValidVersion(version))
+ valid.add(vmInstalls[j]);
+ }
+ }
+ }
+ return valid;
+ }
+
+ protected boolean isValidVersion(String version) {
+ return !version.startsWith(JavaCore.VERSION_1_1) &&
+ !version.startsWith(JavaCore.VERSION_1_2) &&
+ !version.startsWith(JavaCore.VERSION_1_3) &&
+ !version.startsWith(JavaCore.VERSION_1_4) &&
+ !version.startsWith(JavaCore.VERSION_1_5);
+ }
+
+ protected String getErrorString() {
+ if( !shouldIncludeDefaultJRE() && getValidJREs().size() == 0 )
+ return Messages.rwf_jre6NotFound;
+ return super.getErrorString();
+ }
+}
16 years, 4 months
JBoss Tools SVN: r17193 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2009-08-20 12:09:33 -0400 (Thu, 20 Aug 2009)
New Revision: 17193
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java
Log:
JBIDE-1460:
https://jira.jboss.org/jira/browse/JBIDE-1460
- JUnit fixed
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java 2009-08-20 14:52:33 UTC (rev 17192)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java 2009-08-20 16:09:33 UTC (rev 17193)
@@ -75,7 +75,7 @@
// find "span" elements
TestUtil.findElementsByName(node, elements, HTML.TAG_SPAN);
- assertEquals(1, elements.size());
+ assertEquals(3, elements.size());
nsIDOMNode span = elements.get(0);
16 years, 4 months
JBoss Tools SVN: r17192 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-08-20 10:52:33 -0400 (Thu, 20 Aug 2009)
New Revision: 17192
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3030Test.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4783 , https://jira.jboss.org/jira/browse/JBIDE-4786
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3030Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3030Test.java 2009-08-20 14:44:56 UTC (rev 17191)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3030Test.java 2009-08-20 14:52:33 UTC (rev 17192)
@@ -21,6 +21,8 @@
import org.eclipse.ui.ide.IDE;
import org.jboss.tools.jsf.vpe.jsf.test.JsfTestPlugin;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.VpeEditorPart;
+import org.jboss.tools.vpe.ui.test.TestUtil;
import org.jboss.tools.vpe.ui.test.VpeTest;
/**
@@ -66,6 +68,18 @@
IFileStore fileStore = EFS.getLocalFileSystem().getStore(file.toURI());
IEditorPart editorPart = IDE.openEditorOnFileStore(page, fileStore );
+ /**
+ * Test Case for https://jira.jboss.org/jira/browse/JBIDE-4786
+ * and for https://jira.jboss.org/jira/browse/JBIDE-4786
+ *
+ * @author mareshkau
+ *
+ */
+ JSPMultiPageEditor jspMultiPageEditor = (JSPMultiPageEditor) editorPart;
+ TestUtil.getVpeController(jspMultiPageEditor).visualRefresh();
+ TestUtil.delay(5);
+ TestUtil.waitForIdle();
+ //end of lines for testing visual refresh on external files
assertNotNull(editorPart);
@@ -80,5 +94,4 @@
}
}
}
-
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java 2009-08-20 14:44:56 UTC (rev 17191)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java 2009-08-20 14:52:33 UTC (rev 17192)
@@ -12,10 +12,12 @@
package org.jboss.tools.vpe.editor.util;
+import java.io.BufferedReader;
import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.filebuffers.FileBuffers;
@@ -37,6 +39,7 @@
import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.editors.text.ILocationProvider;
import org.eclipse.wst.sse.core.internal.FileBufferModelManager;
+import org.eclipse.wst.sse.core.internal.model.ModelManagerImpl;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocumentType;
@@ -236,10 +239,12 @@
*/
private static String getDoctype(File file) {
String docTypeValue = Constants.EMPTY;
- IDOMDocument document= null;
+ IDOMModel domModel = null;
try {
- document = getDocument(file);
- if (document != null) {
+
+ domModel = getModelForRead(file);
+ if (domModel != null && domModel.getDocument()!=null) {
+ IDOMDocument document = domModel.getDocument();
// find "component" element
Element componentElement = FaceletUtil
.findComponentElement(document.getDocumentElement());
@@ -277,8 +282,8 @@
}
}finally {
//added by Max Areshkau, we should always release document
- if(document!=null) {
- FileBufferModelManager.getInstance().releaseModel(document.getStructuredDocument());
+ if(domModel != null) {
+ domModel.releaseFromRead();
}
}
return (docTypeValue != null) ? docTypeValue.trim() : Constants.EMPTY;
@@ -293,7 +298,7 @@
* @param file
* @return
*/
- static private IDOMDocument getDocument(File file) {
+ static private IDOMModel getModelForRead(File file) {
IDOMModel model = null;
ITextFileBufferManager bufferManager = FileBuffers
@@ -307,19 +312,17 @@
if (buffer != null) {
IDocument bufferDocument = buffer.getDocument();
if (bufferDocument instanceof IStructuredDocument) {
- model = (IDOMModel) FileBufferModelManager.getInstance()
- .getModel((IStructuredDocument) bufferDocument);
- } else {
- bufferManager.disconnect(location, LocationKind.IFILE,
- new NullProgressMonitor());
- }
+ model = (IDOMModel) ModelManagerImpl.getInstance().
+ getModelForRead((IStructuredDocument) bufferDocument);
+
+ }
}
bufferManager.disconnect(location, LocationKind.LOCATION,
new NullProgressMonitor());
} catch (CoreException e) {
VpePlugin.getPluginLog().logError(e);
}
- return model==null?null:model.getDocument();
+ return model;
}
/**
@@ -337,44 +340,34 @@
/**
* get content of initFile, corrected paths on a page
*
+ * @author mareshkau
+ *
* @param initFile
* @return
*/
public static String getContentInitFile(File initFile) {
- IDOMDocument document = null;
- String result = Constants.EMPTY;
+ final String VPE_EDITOR_STYLES ="EditorOverride.css"; //$NON-NLS-1$
+ String result = ""; //$NON-NLS-1$
try {
- document = getDocument(initFile);
- if (document != null) {
- // for each tag's name
- //commented by Maksim Areshkau as fix for https://jira.jboss.org/jira/browse/JBIDE-4772
- //we not needed to correct attributes for styles which specified in init.html file.
-// for (String tag : urlTags) {
-// NodeList list = document.getElementsByTagName(tag);
-// for (int i = 0; i < list.getLength(); i++) {
-// Element element = (Element) list.item(i);
-// // for each attribute's name
-// for (String attributeName : urlAttributes) {
-// if (element.hasAttribute(attributeName)) {
-// Attr attr = element.getAttributeNode(attributeName);
-// //here we make absolute path in attributes, added by Maksim Areshkau
-// if (attr.getValue()!=null && !attr.getValue().startsWith(Constants.FILE_PREFIX ) ) {
-// // corrected path
-// attr.setValue(Constants.FILE_PREFIX + initFile.getParent()
-// + File.separator + attr.getValue());
-// }
-//
-// }
-// }
-// }
-// }
- result = document.getSource();
- }
- } finally {
- if(document!=null) {
- FileBufferModelManager.getInstance().releaseModel(document.getStructuredDocument());
+ BufferedReader inReader = new BufferedReader(new FileReader(initFile));
+ try {
+ inReader = new BufferedReader(new FileReader(initFile));
+ String line = null;
+ while (( line = inReader.readLine()) != null){
+ //Maksim Areshkau, here we correct path for internal vpe styles.
+ if(line!=null && line.contains(VPE_EDITOR_STYLES)) {
+ line=line.replace(VPE_EDITOR_STYLES, Constants.FILE_PREFIX + initFile.getParent()
+ + File.separator + VPE_EDITOR_STYLES);
+ }
+ result+=line;
+ }
+ } finally {
+ inReader.close();
}
- }
+
+ } catch (IOException e) {
+ VpePlugin.reportProblem(e);
+ }
return result;
}
}
16 years, 4 months
JBoss Tools SVN: r17191 - in trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test: ca and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-08-20 10:44:56 -0400 (Thu, 20 Aug 2009)
New Revision: 17191
Added:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/MissingKBBuilderTest.java
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4768
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2009-08-20 14:42:42 UTC (rev 17190)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2009-08-20 14:44:56 UTC (rev 17191)
@@ -15,6 +15,7 @@
import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1585Test;
import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1641Test;
import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1759Test;
+import org.jboss.tools.jst.jsp.test.ca.MissingKBBuilderTest;
import org.jboss.tools.jst.jsp.test.ca.StrutsJspJbide1648Test;
public class JstJspAllTests {
@@ -22,6 +23,7 @@
public static Test suite() {
TestSuite suite = new TestSuite("Test for org.jboss.tools.jst.jsp.test");
+ suite.addTestSuite(MissingKBBuilderTest.class);
suite.addTestSuite(JsfJspJbide1807Test.class);
suite.addTestSuite(CAForIDTest.class);
suite.addTestSuite(JsfJspJbide1813Test.class);
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/MissingKBBuilderTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/MissingKBBuilderTest.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/MissingKBBuilderTest.java 2009-08-20 14:44:56 UTC (rev 17191)
@@ -0,0 +1,61 @@
+package org.jboss.tools.jst.jsp.test.ca;
+
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.jboss.tools.common.test.util.TestProjectProvider;
+import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.test.util.JobUtils;
+
+public class MissingKBBuilderTest extends ContentAssistantTestCase{
+ TestProjectProvider provider = null;
+ boolean makeCopy = false;
+ private static final String PROJECT_NAME = "MissingKBBuilderTest";
+ private static final String PAGE_NAME = "/WebContent/pages/inputname.xhtml";
+
+ public void setUp() throws Exception {
+ provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
+ project = provider.getProject();
+ }
+
+ protected void tearDown() throws Exception {
+ if(provider != null) {
+ provider.dispose();
+ }
+ }
+
+ public void testCAForIDTest(){
+ String[] proposals = {
+ "resources"
+ };
+
+ ICompletionProposal[] ps = checkProposals(PAGE_NAME, "<f:loadBundle basename=\"\" var=\"msg\" />", 24);
+ System.out.println("-1->" + (ps == null ? 0 : ps.length));
+ JobUtils.waitForIdle(2000);
+ ps = checkProposals(PAGE_NAME, "<f:loadBundle basename=\"\" var=\"msg\" />", 24, proposals, false);
+ System.out.println("-2->" + ps.length);
+ }
+
+ protected ICompletionProposal[] checkProposals(String fileName, String substring, int offset){
+ openEditor(fileName);
+
+ int position = 0;
+ if (substring != null) {
+ String documentContent = document.get();
+ position = documentContent.indexOf(substring);
+ }
+
+ ICompletionProposal[] result = null;
+
+ IContentAssistProcessor p = TestUtil.getProcessor(viewer, position + offset, contentAssistant);
+ if (p != null) {
+ try {
+ result = p.computeCompletionProposals(viewer, position + offset);
+ } catch (Throwable x) {
+ x.printStackTrace();
+ }
+ }
+
+ return result;
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/MissingKBBuilderTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 4 months