JBoss Tools SVN: r22481 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-06-02 10:36:05 -0400 (Wed, 02 Jun 2010)
New Revision: 22481
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizard.java
Log:
https://jira.jboss.org/browse/JBIDE-6374
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizard.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizard.java 2010-06-02 14:35:25 UTC (rev 22480)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizard.java 2010-06-02 14:36:05 UTC (rev 22481)
@@ -92,7 +92,20 @@
* Adding the page to the wizard.
*/
public void addPages() {
- cPage = new ExtendedWizardNewFileCreationPage( "Ccfgxml", (IStructuredSelection) selection ); //$NON-NLS-1$
+ cPage = new ExtendedWizardNewFileCreationPage( "Ccfgxml", (IStructuredSelection) selection ) {
+ protected InputStream getInitialContents() {
+ final Properties props = new Properties();
+ putIfNotNull(props, Environment.SESSION_FACTORY_NAME, connectionInfoPage.getSessionFactoryName() );
+ putIfNotNull(props, Environment.DIALECT, connectionInfoPage.getDialect() );
+ putIfNotNull(props, Environment.DRIVER, connectionInfoPage.getDriver() );
+ putIfNotNull(props, Environment.URL, connectionInfoPage.getConnectionURL() );
+ putIfNotNull(props, Environment.USER, connectionInfoPage.getUsername() );
+ putIfNotNull(props, Environment.PASS, connectionInfoPage.getPassword() );
+ putIfNotNull(props, Environment.DEFAULT_CATALOG, connectionInfoPage.getDefaultCatalog() );
+ putIfNotNull(props, Environment.DEFAULT_SCHEMA, connectionInfoPage.getDefaultSchema() );
+ return openContentStream(props);
+ }
+ }; //$NON-NLS-1$
cPage.setTitle( HibernateConsoleMessages.NewConfigurationWizard_create_hibernate_cfg_file );
cPage.setDescription( HibernateConsoleMessages.NewConfigurationWizard_create_new_hibernate_cfg_xml );
cPage.setFileName("hibernate.cfg.xml"); //$NON-NLS-1$
@@ -112,39 +125,11 @@
* using wizard as execution context.
*/
public boolean performFinish() {
- final Properties props = new Properties();
- putIfNotNull(props, Environment.SESSION_FACTORY_NAME, connectionInfoPage.getSessionFactoryName() );
- putIfNotNull(props, Environment.DIALECT, connectionInfoPage.getDialect() );
- putIfNotNull(props, Environment.DRIVER, connectionInfoPage.getDriver() );
- putIfNotNull(props, Environment.URL, connectionInfoPage.getConnectionURL() );
- putIfNotNull(props, Environment.USER, connectionInfoPage.getUsername() );
- putIfNotNull(props, Environment.PASS, connectionInfoPage.getPassword() );
- putIfNotNull(props, Environment.DEFAULT_CATALOG, connectionInfoPage.getDefaultCatalog() );
- putIfNotNull(props, Environment.DEFAULT_SCHEMA, connectionInfoPage.getDefaultSchema() );
final IFile file = cPage.createNewFile();
- IRunnableWithProgress op = new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor) throws InvocationTargetException {
- try {
- createHibernateCfgXml(file, props, monitor);
- } catch (CoreException e) {
- throw new InvocationTargetException(e);
- } finally {
- monitor.done();
- }
- }
- };
+ openHibernateCfgXml(file);
+
try {
- getContainer().run(true, false, op);
- } catch (InterruptedException e) {
- return false;
- } catch (InvocationTargetException e) {
- Throwable realException = e.getTargetException();
- HibernateConsolePlugin.getDefault().showError(getShell(), HibernateConsoleMessages.NewConfigurationWizard_error, realException);
- return false;
- }
-
- try {
if (connectionInfoPage.isCreateConsoleConfigurationEnabled()) {
confPage.performFinish();
} else {
@@ -177,30 +162,7 @@
}
}
- /**
- * The worker method. It will find the container, create the
- * file if missing or just replace its contents, and open
- * the editor on the newly created file.
- * @param file
- * @param props
- */
- private void createHibernateCfgXml(
- final IFile file, Properties props, IProgressMonitor monitor)
- throws CoreException {
- // create a sample file
- monitor.beginTask(HibernateConsoleMessages.NewConfigurationWizard_creating + file.getName(), 2);
- try {
- InputStream stream = openContentStream(props);
- if (file.exists() ) {
- file.setContents(stream, true, true, monitor);
- } else {
- file.create(stream, true, monitor);
- }
- stream.close();
- } catch (IOException e) {
- }
- monitor.worked(1);
- monitor.setTaskName(HibernateConsoleMessages.NewConfigurationWizard_open_file_for_editing);
+ private void openHibernateCfgXml(final IFile file) {
getShell().getDisplay().asyncExec(new Runnable() {
public void run() {
IWorkbenchPage page =
@@ -211,7 +173,6 @@
}
}
});
- monitor.worked(1);
}
/**
14 years, 9 months
JBoss Tools SVN: r22480 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-06-02 10:35:25 -0400 (Wed, 02 Jun 2010)
New Revision: 22480
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/HibConfig3CompoundEditor.java
Log:
https://jira.jboss.org/browse/JBIDE-6374
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/HibConfig3CompoundEditor.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/HibConfig3CompoundEditor.java 2010-06-02 14:35:00 UTC (rev 22479)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/HibConfig3CompoundEditor.java 2010-06-02 14:35:25 UTC (rev 22480)
@@ -11,9 +11,11 @@
package org.jboss.tools.hibernate.ui.xml.editor;
import org.jboss.tools.common.editor.TreeFormPage;
+import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.ui.editor.EditorDescriptor;
import org.jboss.tools.common.model.ui.editors.multipage.DefaultMultipageEditor;
import org.jboss.tools.common.model.ui.texteditors.XMLTextEditorComponent;
+import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
import org.jboss.tools.hibernate.ui.xml.HibernateUIXMLPlugin;
import org.jboss.tools.hibernate.ui.xml.Messages;
import org.jboss.tools.hibernate.xml.model.FileHibernateFilteredTreeConstraint;
@@ -31,14 +33,14 @@
sessionFactory.setLabel(Messages.HibConfig3CompoundEditor_SessionFactoryLabel);
sessionFactory.setTitle(Messages.HibConfig3CompoundEditor_SessionFactoryTitle);
((TreeFormPage)sessionFactory).addFilter(new FileHibernateFilteredTreeConstraint());
- sessionFactory.initialize(object.getChildByPath("Session Factory")); //$NON-NLS-1$
+ sessionFactory.initialize(getSessionFactoryObject());
addFormPage(sessionFactory, "sessionFactoryEditor"); //$NON-NLS-1$
security = createTreeFormPage();
security.setLabel(Messages.HibConfig3CompoundEditor_SecurityLabel);
security.setTitle(Messages.HibConfig3CompoundEditor_SecurityTitle);
((TreeFormPage)security).addFilter(new FileHibernateFilteredTreeConstraint());
- security.initialize(object.getChildByPath("Security")); //$NON-NLS-1$
+ security.initialize(getSecurityObject());
addFormPage(security, "securityEditor"); //$NON-NLS-1$
}
@@ -64,9 +66,9 @@
protected void setNormalMode() {
if (treeFormPage!=null) { // AU added
- sessionFactory.initialize(getModelObject().getChildByPath("Session Factory")); // AU added //$NON-NLS-1$
+ sessionFactory.initialize(getSessionFactoryObject());
sessionFactory.setErrorMode(isErrorMode());
- security.initialize(getModelObject().getChildByPath("Security")); // AU added //$NON-NLS-1$
+ security.initialize(getSecurityObject());
security.setErrorMode(isErrorMode());
} // AU added
if (selectionProvider!=null) {
@@ -77,11 +79,27 @@
}
}
+ XModelObject getSessionFactoryObject() {
+ XModelObject o = getModelObject().getChildByPath("Session Factory"); //$NON-NLS-1$
+ if(o == null) {
+ o = XModelObjectLoaderUtil.createValidObject(object.getModel(), "HibConfig3SessionFactory"); //$NON-NLS-1$
+ }
+ return o;
+ }
+
+ XModelObject getSecurityObject() {
+ XModelObject o = getModelObject().getChildByPath("Security"); //$NON-NLS-1$
+ if(o == null) {
+ o = XModelObjectLoaderUtil.createValidObject(object.getModel(), "HibConfig3Security"); //$NON-NLS-1$
+ }
+ return o;
+ }
+
protected void setErrorMode() {
if (treeFormPage!=null) { // AU added
- sessionFactory.initialize(getModelObject().getChildByPath("Session Factory")); // AU added //$NON-NLS-1$
+ sessionFactory.initialize(getSessionFactoryObject());
sessionFactory.setErrorMode(isErrorMode());
- security.initialize(getModelObject().getChildByPath("Security")); // AU added //$NON-NLS-1$
+ security.initialize(getSecurityObject());
security.setErrorMode(isErrorMode());
} // AU added
if (treeEditor!=null) {
@@ -100,4 +118,4 @@
return new XMLTextEditorComponent(false);
}
-}
+}
\ No newline at end of file
14 years, 9 months
JBoss Tools SVN: r22479 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-06-02 10:35:00 -0400 (Wed, 02 Jun 2010)
New Revision: 22479
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XJob.java
Log:
https://jira.jboss.org/browse/JBIDE-6374
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XJob.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XJob.java 2010-06-02 09:43:22 UTC (rev 22478)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XJob.java 2010-06-02 14:35:00 UTC (rev 22479)
@@ -118,12 +118,18 @@
ids.add(runnable.getId());
list.add(runnable);
}
- if (getState() == Job.NONE) {
+ if (getState() == Job.NONE || !isRunning()) {
schedule(1000);
}
}
}
+ private boolean isRunning() {
+ synchronized(this) {
+ return running;
+ }
+ }
+
void addRunnableInternalWithPriority(XRunnable runnable) {
if (!isSuspended()) {
synchronized (this) {
@@ -132,19 +138,27 @@
ids.add(runnable.getId());
list.add(0, runnable);
}
- if (getState() == Job.NONE) {
+ if (getState() == Job.NONE || !isRunning()) {
schedule(0);
}
}
}
+
+ boolean running = false;
@Override
public IStatus runInWorkspace(IProgressMonitor monitor)
throws CoreException {
+ synchronized(this) {
+ running = true;
+ }
while(true) {
XRunnable r = null;
synchronized (this) {
- if(list.size() == 0) break;
+ if(list.size() == 0) {
+ running = false;
+ break;
+ }
r = list.remove(0);
}
// monitor.subTask(r.getId()) is irrelevant for system jobs
@@ -154,13 +168,13 @@
//Bundle b = Platform.getBundle("org.jboss.tools.common.model");
//state = b==null ? -1 : b.getState();
//if(state == Bundle.ACTIVE) {
+ synchronized (this) {
+ ids.remove(r.getId());
+ }
if (!isSuspended()) {
r.run();
}
//}
- synchronized (this) {
- ids.remove(r.getId());
- }
}
return Status.OK_STATUS;
}
@@ -173,4 +187,4 @@
XJob.suspended = suspended;
}
-}
+}
\ No newline at end of file
14 years, 9 months
JBoss Tools SVN: r22478 - branches/3.2.helios/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-06-02 05:43:22 -0400 (Wed, 02 Jun 2010)
New Revision: 22478
Modified:
branches/3.2.helios/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
Log:
https://jira.jboss.org/browse/JBIDE-5418
Modified: branches/3.2.helios/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
===================================================================
--- branches/3.2.helios/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2010-06-02 08:57:11 UTC (rev 22477)
+++ branches/3.2.helios/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2010-06-02 09:43:22 UTC (rev 22478)
@@ -76,7 +76,7 @@
XULRUNNER_BUNDLE = (new StringBuffer("org.mozilla.xulrunner")) //$NON-NLS-1$
.append(".").append(Platform.getWS()) //$NON-NLS-1$
.append(".").append(Platform.getOS()) //$NON-NLS-1$
- .append(Platform.OS_MACOSX.equals(Platform.getOS()) ? "" : (new StringBuffer(".")).append(Platform.getOSArch()).toString()) //$NON-NLS-1$ //$NON-NLS-2$
+ .append(".").append(Platform.getOSArch()) //$NON-NLS-1$
.toString();
mozilla = Mozilla.getInstance();
@@ -84,7 +84,10 @@
public XulRunnerBrowser(Composite parent) throws XulRunnerException {
// initXulRunner();
-
+ if(Platform.OS_MACOSX.equals(Platform.getOS()) && Platform.ARCH_X86_64.equals(Platform.getOSArch())){
+ getXulRunnerPath();
+ }
+
browser = new Browser(parent, SWT.MOZILLA);
webBrowser = (nsIWebBrowser) browser.getWebBrowser();
14 years, 9 months
JBoss Tools SVN: r22476 - branches/3.2.helios.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-02 02:07:12 -0400 (Wed, 02 Jun 2010)
New Revision: 22476
Modified:
branches/3.2.helios/build.xml
Log:
Modified: branches/3.2.helios/build.xml
===================================================================
--- branches/3.2.helios/build.xml 2010-06-02 06:04:42 UTC (rev 22475)
+++ branches/3.2.helios/build.xml 2010-06-02 06:07:12 UTC (rev 22476)
@@ -1,33 +1,5 @@
-<<<<<<< .working
-<!-- Run a given ${COMPONENT} build -->
-<project default="run" basedir=".">
-=======
<project default="run" basedir="." name="jbosstools build.xml">
->>>>>>> .merge-right.r21669
-<<<<<<< .working
- <!-- Configuration Start -->
- <!-- must set name of component to build/test -->
- <property name="COMPONENT" value="tests" />
- <!-- Configuration Ends -->
-
- <!-- To run this script in Eclipse:
- Run As > Ant Build
- -->
- <!-- To run this script via commandline (build default module, tests):
- cd /home/nboldt/workspace36/jbosstools-modular_build; ant -q
- or, to build a specific module:
- cd /home/nboldt/workspace36/jbosstools-modular_build; ant -q -DCOMPONENT=jbpm
- -->
-
- <target name="run" depends="init, genpom, install, deploy" />
-
- <!-- override for local build -->
- <available file="/qa/tools/opt" type="dir" property="isJBossQA" />
- <target name="local" unless="isJBossQA">
- <property name="WORKINGDIR" value="${basedir}" />
- <property name="COMMON_TOOLS" value="${java.io.tmpdir}" />
-=======
<!--
This script is provided here for convenience if building entire tree already on disk.
Generally, you would this instead to self-bootstrap the process:
@@ -41,67 +13,5 @@
-->
<target name="run">
<ant antfile="build/build.xml" inheritall="true" inheritrefs="true" />
->>>>>>> .merge-right.r21669
</target>
-<<<<<<< .working
-
- <!-- default settings for JBQA Hudson -->
- <target name="init" depends="local">
- <property name="WORKINGDIR" value="${basedir}" />
- <!-- <property name="COMMON_TOOLS" value="/qa/tools/opt" /> -->
- <property name="COMMON_TOOLS" value="${basedir}/../tools" />
- <mkdir dir="${COMMON_TOOLS}" />
-
- <property name="MAVEN_MIRROR" value="http://mirror.csclub.uwaterloo.ca/apache/maven/binaries" />
- <get usetimestamp="true"
- dest="${COMMON_TOOLS}/apache-maven-3.0-alpha-7-bin.tar.gz"
- src="${MAVEN_MIRROR}/apache-maven-3.0-alpha-7-bin.tar.gz"
- />
- <untar compression="gzip"
- overwrite="false"
- dest="${COMMON_TOOLS}"
- src="${COMMON_TOOLS}/apache-maven-3.0-alpha-7-bin.tar.gz"
- />
- <chmod perm="755" file="${COMMON_TOOLS}/apache-maven-3.0-alpha-7/bin/mvn"/>
- </target>
-
- <target name="genpom">
- <ant antfile="genpom.xml" target="run">
- <property name="WORKINGDIR" value="${WORKINGDIR}/${COMPONENT}" />
- <property name="pathToParentPom" value="../" />
- </ant>
- </target>
-
- <target name="install">
- <echo>Run pom file: ${WORKINGDIR}/${COMPONENT}/pom.xml</echo>
-
- <exec executable="${COMMON_TOOLS}/apache-maven-3.0-alpha-7/bin/mvn" dir="${WORKINGDIR}/${COMPONENT}">
- <!-- <arg line="-o -Dmaven.test.skip" /> -->
- <arg line="-fae clean install" />
- </exec>
- </target>
-
- <target name="deploy">
- <!-- TODO enable publishing to download.jboss.org or porkchop.jboss.com
- <get usetimestamp="true"
- dest="${COMMON_TOOLS}/maven-ant-tasks-2.1.0.jar"
- src="${MAVEN_MIRROR}/maven-ant-tasks-2.1.0.jar"
- />
- <taskdef resource="org/apache/maven/artifact/ant/antlib.xml">
- <classpath>
- <pathelement location="${COMMON_TOOLS}/maven-ant-tasks-2.1.0.jar" />
- </classpath>
- </taskdef>
- <install-provider artifactId="wagon-ssh" version="1.0-beta-2"/>
- <deploy file="target/my-project-1.0.jar">
- <remoteRepository url="scp://localhost/www/repository">
- <authentication username="${repository.username}" privateKey="${user.home}/.ssh/id_dsa" />
- </remoteRepository>
- <pom refid="mypom" />
- </deploy>
- -->
- </target>
-=======
->>>>>>> .merge-right.r21669
</project>
-
14 years, 9 months
JBoss Tools SVN: r22475 - branches/3.2.helios/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-02 02:04:42 -0400 (Wed, 02 Jun 2010)
New Revision: 22475
Modified:
branches/3.2.helios/build/publish.sh
Log:
check for a file (-f) not a dir (-d)
Modified: branches/3.2.helios/build/publish.sh
===================================================================
--- branches/3.2.helios/build/publish.sh 2010-06-02 06:04:16 UTC (rev 22474)
+++ branches/3.2.helios/build/publish.sh 2010-06-02 06:04:42 UTC (rev 22475)
@@ -25,6 +25,6 @@
if [[ -d ${WORKSPACE}/site/${JOB_NAME} ]]; then
rsync -arzq --delete ${WORKSPACE}/site/${JOB_NAME} $DESTINATION/builds/nightly/3.2.helios/
fi
-if [[ -d ${WORKSPACE}/site/${SNAPNAME} ]]; then
+if [[ -f ${WORKSPACE}/site/${SNAPNAME} ]]; then
rsync -arzq --delete ${WORKSPACE}/site/${SNAPNAME} $DESTINATION/builds/nightly/3.2.helios/
fi
\ No newline at end of file
14 years, 9 months
JBoss Tools SVN: r22474 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-02 02:04:16 -0400 (Wed, 02 Jun 2010)
New Revision: 22474
Modified:
trunk/build/publish.sh
Log:
check for a file (-f) not a dir (-d)
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-06-02 05:40:35 UTC (rev 22473)
+++ trunk/build/publish.sh 2010-06-02 06:04:16 UTC (rev 22474)
@@ -25,6 +25,6 @@
if [[ -d ${WORKSPACE}/site/${JOB_NAME} ]]; then
rsync -arzq --delete ${WORKSPACE}/site/${JOB_NAME} $DESTINATION/builds/nightly/3.2.helios/
fi
-if [[ -d ${WORKSPACE}/site/${SNAPNAME} ]]; then
+if [[ -f ${WORKSPACE}/site/${SNAPNAME} ]]; then
rsync -arzq --delete ${WORKSPACE}/site/${SNAPNAME} $DESTINATION/builds/nightly/3.2.helios/
fi
\ No newline at end of file
14 years, 9 months
JBoss Tools SVN: r22473 - in trunk/jsf: plugins/org.jboss.tools.jsf.ui/META-INF and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-02 01:40:35 -0400 (Wed, 02 Jun 2010)
New Revision: 22473
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF
Log:
remove ranges
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/META-INF/MANIFEST.MF 2010-06-02 05:38:18 UTC (rev 22472)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/META-INF/MANIFEST.MF 2010-06-02 05:40:35 UTC (rev 22473)
@@ -1,23 +1,23 @@
-Manifest-Version: 1.0
-Bundle-ActivationPolicy: lazy
-Bundle-Name: %Bundle-Name.0
-Bundle-Activator: org.jboss.tools.jsf.text.ext.richfaces.RichfacesExtensionsPlugin
-Bundle-ManifestVersion: 2
-Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.jboss.tools.jsf.text.ext.richfaces; singleton:=true
-Bundle-Localization: plugin
-Require-Bundle:
- org.eclipse.ui,
- org.eclipse.jface.text,
- org.jboss.tools.common.text.ext,
- org.jboss.tools.jst.text.ext,
- org.jboss.tools.jsf.text.ext,
- org.jboss.tools.jst.web;bundle-version="2.0.0",
- org.jboss.tools.jst.web.kb;bundle-version="1.0.0",
- org.eclipse.wst.css.core;bundle-version="1.1.300",
- org.jboss.tools.common.el.core;bundle-version="2.0.0",
- org.jboss.tools.jsf.text.ext.facelets;bundle-version="2.0.0"
-Export-Package: org.jboss.tools.jsf.text.ext.richfaces,
- org.jboss.tools.jsf.text.ext.richfaces.hyperlink
-Bundle-Version: 3.1.0.qualifier
+Manifest-Version: 1.0
+Bundle-ActivationPolicy: lazy
+Bundle-Name: %Bundle-Name.0
+Bundle-Activator: org.jboss.tools.jsf.text.ext.richfaces.RichfacesExtensionsPlugin
+Bundle-ManifestVersion: 2
+Bundle-Vendor: %providerName
+Bundle-SymbolicName: org.jboss.tools.jsf.text.ext.richfaces; singleton:=true
+Bundle-Localization: plugin
+Require-Bundle:
+ org.eclipse.ui,
+ org.eclipse.jface.text,
+ org.jboss.tools.common.text.ext,
+ org.jboss.tools.jst.text.ext,
+ org.jboss.tools.jsf.text.ext,
+ org.jboss.tools.jst.web,
+ org.jboss.tools.jst.web.kb,
+ org.eclipse.wst.css.core;bundle-version="1.1.300",
+ org.jboss.tools.common.el.core,
+ org.jboss.tools.jsf.text.ext.facelets
+Export-Package: org.jboss.tools.jsf.text.ext.richfaces,
+ org.jboss.tools.jsf.text.ext.richfaces.hyperlink
+Bundle-Version: 3.1.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF 2010-06-02 05:38:18 UTC (rev 22472)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF 2010-06-02 05:40:35 UTC (rev 22473)
@@ -1,59 +1,59 @@
-Manifest-Version: 1.0
-Bundle-Name: %pluginName
-Bundle-Activator: org.jboss.tools.jsf.ui.JsfUiPlugin
-Bundle-ManifestVersion: 2
-Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.jboss.tools.jsf.ui;singleton:=true
-Bundle-Localization: plugin
-Export-Package: org.jboss.tools.jsf.ui,
- org.jboss.tools.jsf.ui.action,
- org.jboss.tools.jsf.ui.action.handler,
- org.jboss.tools.jsf.ui.adopt,
- org.jboss.tools.jsf.ui.attribute.adapter,
- org.jboss.tools.jsf.ui.editor,
- org.jboss.tools.jsf.ui.editor.actions,
- org.jboss.tools.jsf.ui.editor.dnd,
- org.jboss.tools.jsf.ui.editor.edit,
- org.jboss.tools.jsf.ui.editor.figures,
- org.jboss.tools.jsf.ui.editor.form,
- org.jboss.tools.jsf.ui.editor.model,
- org.jboss.tools.jsf.ui.editor.model.commands,
- org.jboss.tools.jsf.ui.editor.model.impl,
- org.jboss.tools.jsf.ui.editor.palette,
- org.jboss.tools.jsf.ui.editor.print,
- org.jboss.tools.jsf.ui.editor.wizard,
- org.jboss.tools.jsf.ui.el.refactoring,
- org.jboss.tools.jsf.ui.navigator,
- org.jboss.tools.jsf.ui.operation,
- org.jboss.tools.jsf.ui.perspective,
- org.jboss.tools.jsf.ui.preferences,
- org.jboss.tools.jsf.ui.wizard.bean,
- org.jboss.tools.jsf.ui.wizard.capabilities,
- org.jboss.tools.jsf.ui.wizard.newfile,
- org.jboss.tools.jsf.ui.wizard.palette,
- org.jboss.tools.jsf.ui.wizard.project
-Require-Bundle: org.jboss.tools.common.model.ui,
- org.jboss.tools.jst.web.ui,
- org.jboss.tools.jst.jsp,
- org.eclipse.jface.text,
- org.eclipse.jdt.ui,
- org.jboss.tools.jsf,
- org.eclipse.compare,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.ui.views,
- org.eclipse.ui.ide,
- org.eclipse.gef,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.core.expressions,
- org.eclipse.ui.forms,
- org.jboss.tools.common.gef,
- org.jboss.tools.common.ui,
- org.eclipse.ltk.ui.refactoring;bundle-version="3.4.100",
- org.eclipse.ltk.core.refactoring;bundle-version="3.5.0",
- org.eclipse.search;bundle-version="3.5.0",
- org.jboss.tools.common.el.core;bundle-version="2.0.0",
- org.eclipse.wst.html.ui;bundle-version="1.0.401"
-Bundle-Version: 3.1.0.qualifier
-Bundle-ActivationPolicy: lazy
+Manifest-Version: 1.0
+Bundle-Name: %pluginName
+Bundle-Activator: org.jboss.tools.jsf.ui.JsfUiPlugin
+Bundle-ManifestVersion: 2
+Bundle-Vendor: %providerName
+Bundle-SymbolicName: org.jboss.tools.jsf.ui;singleton:=true
+Bundle-Localization: plugin
+Export-Package: org.jboss.tools.jsf.ui,
+ org.jboss.tools.jsf.ui.action,
+ org.jboss.tools.jsf.ui.action.handler,
+ org.jboss.tools.jsf.ui.adopt,
+ org.jboss.tools.jsf.ui.attribute.adapter,
+ org.jboss.tools.jsf.ui.editor,
+ org.jboss.tools.jsf.ui.editor.actions,
+ org.jboss.tools.jsf.ui.editor.dnd,
+ org.jboss.tools.jsf.ui.editor.edit,
+ org.jboss.tools.jsf.ui.editor.figures,
+ org.jboss.tools.jsf.ui.editor.form,
+ org.jboss.tools.jsf.ui.editor.model,
+ org.jboss.tools.jsf.ui.editor.model.commands,
+ org.jboss.tools.jsf.ui.editor.model.impl,
+ org.jboss.tools.jsf.ui.editor.palette,
+ org.jboss.tools.jsf.ui.editor.print,
+ org.jboss.tools.jsf.ui.editor.wizard,
+ org.jboss.tools.jsf.ui.el.refactoring,
+ org.jboss.tools.jsf.ui.navigator,
+ org.jboss.tools.jsf.ui.operation,
+ org.jboss.tools.jsf.ui.perspective,
+ org.jboss.tools.jsf.ui.preferences,
+ org.jboss.tools.jsf.ui.wizard.bean,
+ org.jboss.tools.jsf.ui.wizard.capabilities,
+ org.jboss.tools.jsf.ui.wizard.newfile,
+ org.jboss.tools.jsf.ui.wizard.palette,
+ org.jboss.tools.jsf.ui.wizard.project
+Require-Bundle: org.jboss.tools.common.model.ui,
+ org.jboss.tools.jst.web.ui,
+ org.jboss.tools.jst.jsp,
+ org.eclipse.jface.text,
+ org.eclipse.jdt.ui,
+ org.jboss.tools.jsf,
+ org.eclipse.compare,
+ org.eclipse.core.resources,
+ org.eclipse.ui,
+ org.eclipse.ui.views,
+ org.eclipse.ui.ide,
+ org.eclipse.gef,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.core.expressions,
+ org.eclipse.ui.forms,
+ org.jboss.tools.common.gef,
+ org.jboss.tools.common.ui,
+ org.eclipse.ltk.ui.refactoring;bundle-version="3.4.100",
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.0",
+ org.eclipse.search;bundle-version="3.5.0",
+ org.jboss.tools.common.el.core,
+ org.eclipse.wst.html.ui;bundle-version="1.0.401"
+Bundle-Version: 3.1.0.qualifier
+Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/META-INF/MANIFEST.MF 2010-06-02 05:38:18 UTC (rev 22472)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/META-INF/MANIFEST.MF 2010-06-02 05:40:35 UTC (rev 22473)
@@ -9,7 +9,7 @@
org.jboss.tools.vpe.html,
org.mozilla.xpcom;bundle-version="1.9.1",
org.jboss.tools.vpe,
- org.jboss.tools.jsf.vpe.jsf;bundle-version="2.0.0",
+ org.jboss.tools.jsf.vpe.jsf,
org.jboss.tools.common,
org.eclipse.jface.text,
org.jboss.tools.jst.jsp
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF 2010-06-02 05:38:18 UTC (rev 22472)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF 2010-06-02 05:40:35 UTC (rev 22473)
@@ -16,7 +16,7 @@
org.eclipse.jst.jsp.core,
org.eclipse.wst.html.core,
org.jboss.tools.vpe.html,
- org.jboss.tools.jsf;bundle-version="2.0.0",
+ org.jboss.tools.jsf,
org.eclipse.ui.ide,
org.eclipse.ui.editors,
org.jboss.tools.vpe.xulrunner
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2010-06-02 05:38:18 UTC (rev 22472)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2010-06-02 05:40:35 UTC (rev 22473)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.jsf.test;singleton:=true
-Bundle-Version: 2.0.0
+Bundle-Version: 3.1.0.qualifier
Bundle-ClassPath: jsf-tests.jar,
lib/xmlunit1.0.jar
Bundle-Vendor: %Bundle-Vendor.0
@@ -22,7 +22,7 @@
org.jboss.tools.common.model.ui,
org.eclipse.ui.ide,
org.eclipse.ltk.core.refactoring;bundle-version="3.5.0",
- org.eclipse.wst.validation;bundle-version="1.2.104"
+ org.eclipse.wst.validation
Bundle-Activator: org.jboss.tools.jsf.plugin.JsfTestPlugin
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/META-INF/MANIFEST.MF 2010-06-02 05:38:18 UTC (rev 22472)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/META-INF/MANIFEST.MF 2010-06-02 05:40:35 UTC (rev 22473)
@@ -19,9 +19,9 @@
org.jboss.tools.jsf.vpe.ajax4jsf,
org.mozilla.xpcom;bundle-version="1.9.1",
org.jboss.tools.vpe.ui.test,
- org.jboss.tools.vpe.resref;bundle-version="2.0.0",
+ org.jboss.tools.vpe.resref,
org.jboss.tools.common.el.ui;bundle-version="1.0.0",
- org.jboss.tools.common.el.core;bundle-version="2.0.0"
+ org.jboss.tools.common.el.core
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: vpe-a4j-test.jar
Export-Package: org.jboss.tools.jsf.vpe.ajax4jsf.test
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF 2010-06-02 05:38:18 UTC (rev 22472)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF 2010-06-02 05:40:35 UTC (rev 22473)
@@ -22,14 +22,14 @@
org.jboss.tools.jst.web,
org.eclipse.core.filesystem,
org.eclipse.ui.ide,
- org.jboss.tools.vpe.resref;bundle-version="2.0.0",
+ org.jboss.tools.vpe.resref,
org.jboss.tools.common.el.ui;bundle-version="1.0.0",
- org.jboss.tools.common.el.core;bundle-version="2.0.0",
- org.jboss.tools.common.model.ui;bundle-version="2.0.0",
+ org.jboss.tools.common.el.core,
+ org.jboss.tools.common.model.ui,
org.eclipse.wst.xml.ui;bundle-version="1.1.0",
org.eclipse.jdt.ui;bundle-version="3.5.0",
org.jboss.tools.common.ui,
- org.jboss.tools.jst.web.ui;bundle-version="2.0.0"
+ org.jboss.tools.jst.web.ui
Bundle-ClassPath: jsf-test.jar
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
14 years, 9 months
JBoss Tools SVN: r22472 - in trunk/jsf: site and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-02 01:38:18 -0400 (Wed, 02 Jun 2010)
New Revision: 22472
Added:
trunk/jsf/site/
trunk/jsf/site/pom.xml
trunk/jsf/site/site.xml
Modified:
trunk/jsf/pom.xml
Log:
add site
Modified: trunk/jsf/pom.xml
===================================================================
--- trunk/jsf/pom.xml 2010-06-01 22:59:10 UTC (rev 22471)
+++ trunk/jsf/pom.xml 2010-06-02 05:38:18 UTC (rev 22472)
@@ -15,6 +15,7 @@
<module>features</module>
<module>plugins</module>
<module>tests</module>
+ <module>site</module>
</modules>
</project>
-
\ No newline at end of file
+
Added: trunk/jsf/site/pom.xml
===================================================================
--- trunk/jsf/site/pom.xml (rev 0)
+++ trunk/jsf/site/pom.xml 2010-06-02 05:38:18 UTC (rev 22472)
@@ -0,0 +1,13 @@
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <relativePath>../../parent-pom.xml</relativePath>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>jsf.site</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>eclipse-update-site</packaging>
+</project>
Added: trunk/jsf/site/site.xml
===================================================================
--- trunk/jsf/site/site.xml (rev 0)
+++ trunk/jsf/site/site.xml 2010-06-02 05:38:18 UTC (rev 22472)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <description>To install these features, point Eclipse at this site.</description>
+ <!-- JBoss Tools jsf Nightly Build Update Site -->
+ <category-def label="JBoss Tools jsf Nightly Build Update Site" name="JBoss Tools jsf Nightly Build Update Site">
+ <description>JBoss Tools jsf Nightly Build Update Site: contains all features in this build.</description>
+ </category-def>
+ <feature url="features/org.jboss.tools.jsf.feature_0.0.0.jar" id="org.jboss.tools.jsf.feature" version="0.0.0">
+ <category name="JBoss Tools jsf Nightly Build Update Site"/>
+ </feature>
+ <feature url="features/org.jboss.tools.richfaces.feature_0.0.0.jar" id="org.jboss.tools.richfaces.feature" version="0.0.0">
+ <category name="JBoss Tools jsf Nightly Build Update Site"/>
+ </feature>
+
+</site>
14 years, 9 months
JBoss Tools SVN: r22471 - in trunk/vpe: plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe and 7 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-06-01 18:59:10 -0400 (Tue, 01 Jun 2010)
New Revision: 22471
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java
trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties
trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/META-INF/MANIFEST.MF
trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/build.properties
trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAbstractTest.java
trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/view/XulRunnerView.java
Log:
https://jira.jboss.org/browse/JBDS-1202 problems running tests
vpe component tests fix:
- fix manifest errors
- xulrunner init code moved from vpe to vpe.xulrunner plugin
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2010-06-01 22:10:19 UTC (rev 22470)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2010-06-01 22:59:10 UTC (rev 22471)
@@ -3,9 +3,6 @@
<plugin>
<extension-point id="templates" name="Path to xml file with templates definitionj" schema="schema/templates.exsd"/>
<extension-point id="localeProvider" name="Locale provider for an opened file" schema="schema/localeProvider.exsd"/>
- <extension
- point="org.eclipse.ui.startup">
- </extension>
<extension point="org.jboss.tools.common.model.meta">
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java 2010-06-01 22:10:19 UTC (rev 22470)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java 2010-06-01 22:59:10 UTC (rev 22471)
@@ -26,7 +26,7 @@
/**
* The main plugin class to be used in the desktop.
*/
-public class VpePlugin extends BaseUIPlugin implements IStartup {
+public class VpePlugin extends BaseUIPlugin {
public static final String PLUGIN_ID = "org.jboss.tools.vpe"; //$NON-NLS-1$
public static final String EXTESION_POINT_VPE_TEMPLATES = "org.jboss.tools.vpe.templates"; //$NON-NLS-1$
@@ -48,8 +48,8 @@
*/
public void start(BundleContext context) throws Exception {
super.start(context);
- // required to get tests running in tycho, should not affect anything during regular start
- earlyStartup();
+// moved to vpe.xulrunner plug-in
+// earlyStartup();
}
/**
@@ -95,17 +95,6 @@
return getDefault();
}
- public void earlyStartup() {
- /* init xulrunner path for */
- try {
- String xulRunnerPath = XulRunnerBrowser.getXulRunnerPath();
- if ("true".equals(Platform.getDebugOption(PLUGIN_ID + "/debug/earlyStartup"))) { //$NON-NLS-1$ //$NON-NLS-2$
- logInfo("earlyStartup: XULRunner path is: " + xulRunnerPath); //$NON-NLS-1$
- }
- } catch (XulRunnerException e) {
- logError(e);
- }
- }
public static String getPluginResourcePath() {
Bundle bundle = Platform.getBundle(PLUGIN_ID);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java 2010-06-01 22:10:19 UTC (rev 22470)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java 2010-06-01 22:59:10 UTC (rev 22471)
@@ -4,6 +4,7 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.jboss.tools.common.log.BaseUIPlugin;
import org.jboss.tools.common.log.IPluginLog;
+import org.jboss.tools.vpe.xulrunner.browser.XulRunnerBrowser;
import org.osgi.framework.BundleContext;
/**
@@ -40,6 +41,8 @@
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
+ // required to be here to fix tycho test execution errors
+ earlyStartup();
}
/*
@@ -74,4 +77,16 @@
public static IPluginLog getPluginLog() {
return getDefault();
}
+
+ public void earlyStartup() {
+ /* init xulrunner path for */
+ try {
+ String xulRunnerPath = XulRunnerBrowser.getXulRunnerPath();
+// if ("true".equals(Platform.getDebugOption(PLUGIN_ID + "/debug/earlyStartup"))) { //$NON-NLS-1$ //$NON-NLS-2$
+ logInfo("earlyStartup: XULRunner path is: " + xulRunnerPath); //$NON-NLS-1$
+// }
+ } catch (XulRunnerException e) {
+ logError(e);
+ }
+ }
}
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-06-01 22:10:19 UTC (rev 22470)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-06-01 22:59:10 UTC (rev 22471)
@@ -19,7 +19,8 @@
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: lib/jmock-2.5.1/jmock-2.5.1.jar,
lib/jmock-2.5.1/hamcrest-core-1.1.jar,
- lib/jmock-2.5.1/hamcrest-library-1.1.jar
+ lib/jmock-2.5.1/hamcrest-library-1.1.jar,
+ .
Export-Package: org.hamcrest,
org.jboss.tools.vpe.ui.test,
org.jboss.tools.vpe.ui.test.dialog,
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties 2010-06-01 22:10:19 UTC (rev 22470)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties 2010-06-01 22:59:10 UTC (rev 22471)
@@ -3,7 +3,8 @@
plugin.xml,\
plugin.properties,\
resources/,\
- lib/
+ lib/,\
+ .
jars.compile.order = .
source.. = src/
source.. = src/
Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/META-INF/MANIFEST.MF 2010-06-01 22:10:19 UTC (rev 22470)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/META-INF/MANIFEST.MF 2010-06-01 22:59:10 UTC (rev 22471)
@@ -10,6 +10,7 @@
org.junit,
org.jboss.tools.common,
org.jboss.tools.vpe.xulrunner,
+ org.jboss.tools.tests;bundle-version="3.1.0",
org.mozilla.xpcom;bundle-version="1.9.1"
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.vpe.xulrunner.test,
Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/build.properties
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/build.properties 2010-06-01 22:10:19 UTC (rev 22470)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/build.properties 2010-06-01 22:59:10 UTC (rev 22471)
@@ -1,7 +1,8 @@
output.. = bin/
bin.includes = META-INF/,\
plugin.xml,\
- plugin.properties
+ plugin.properties,\
+ .
src.includes = src/,\
plugin.xml,\
build.properties,\
Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAbstractTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAbstractTest.java 2010-06-01 22:10:19 UTC (rev 22470)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAbstractTest.java 2010-06-01 22:59:10 UTC (rev 22471)
@@ -13,6 +13,7 @@
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
import org.jboss.tools.vpe.xulrunner.view.XulRunnerView;
@@ -73,28 +74,14 @@
}
}
- /**
- * Wait until all background tasks are complete.
- */
- public void waitForJobs() {
- while (Job.getJobManager().currentJob() != null)
- delay(1000);
- }
-
@Override
protected void setUp() throws Exception {
super.setUp();
- waitForJobs();
+ JobUtils.waitForIdle();
xulRunnerView
= ((XulRunnerView) PlatformUI.getWorkbench()
.getActiveWorkbenchWindow().getActivePage().showView(VIEW_ID));
-
- // Delay for 3 seconds so that
- // the Favorites view can be seen.
- waitForJobs();
- // commented by dgolovin to get rid of jvm error [libexpat.so.0+0xeff4]
- //delay(3000);
-
+ JobUtils.waitForIdle();
xulRunnerEditor = xulRunnerView.getBrowser();
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/view/XulRunnerView.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/view/XulRunnerView.java 2010-06-01 22:10:19 UTC (rev 22470)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/view/XulRunnerView.java 2010-06-01 22:59:10 UTC (rev 22471)
@@ -22,13 +22,13 @@
xulrunnerEditor.setLayoutData(new GridData(SWT.FILL, SWT.FILL,
true, true));
} catch (XulRunnerException e) {
- BrowserPlugin.getPluginLog().logError(e);
+ throw new RuntimeException(e);
}
}
@Override
public void setFocus() {
- xulrunnerEditor.setFocus();
+ xulrunnerEditor.setFocus();
}
public XulRunnerEditor getBrowser() {
14 years, 9 months