JBoss Tools SVN: r22460 - in branches/3.2.helios/flow: site and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-06-01 15:18:35 -0400 (Tue, 01 Jun 2010)
New Revision: 22460
Added:
branches/3.2.helios/flow/site/
branches/3.2.helios/flow/site/pom.xml
branches/3.2.helios/flow/site/site.xml
Modified:
branches/3.2.helios/flow/pom.xml
Log:
add site
Modified: branches/3.2.helios/flow/pom.xml
===================================================================
--- branches/3.2.helios/flow/pom.xml 2010-06-01 19:17:11 UTC (rev 22459)
+++ branches/3.2.helios/flow/pom.xml 2010-06-01 19:18:35 UTC (rev 22460)
@@ -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: branches/3.2.helios/flow/site/pom.xml
===================================================================
--- branches/3.2.helios/flow/site/pom.xml (rev 0)
+++ branches/3.2.helios/flow/site/pom.xml 2010-06-01 19:18:35 UTC (rev 22460)
@@ -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>flow.site</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>eclipse-update-site</packaging>
+</project>
Added: branches/3.2.helios/flow/site/site.xml
===================================================================
--- branches/3.2.helios/flow/site/site.xml (rev 0)
+++ branches/3.2.helios/flow/site/site.xml 2010-06-01 19:18:35 UTC (rev 22460)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <description>To install these features, point Eclipse at this site.</description>
+ <!-- JBoss Tools flow Nightly Build Update Site -->
+ <category-def label="JBoss Tools flow Nightly Build Update Site" name="JBoss Tools flow Nightly Build Update Site">
+ <description>JBoss Tools flow Nightly Build Update Site: contains all features in this build.</description>
+ </category-def>
+ <feature url="features/org.jboss.tools.flow.common.feature_0.0.0.jar" id="org.jboss.tools.flow.common.feature" version="0.0.0">
+ <category name="JBoss Tools flow Nightly Build Update Site"/>
+ </feature>
+
+</site>
14 years, 7 months
JBoss Tools SVN: r22459 - in branches/3.2.helios/tests: site and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-06-01 15:17:11 -0400 (Tue, 01 Jun 2010)
New Revision: 22459
Added:
branches/3.2.helios/tests/site/
branches/3.2.helios/tests/site/pom.xml
branches/3.2.helios/tests/site/site.xml
Modified:
branches/3.2.helios/tests/pom.xml
Log:
add site
Modified: branches/3.2.helios/tests/pom.xml
===================================================================
--- branches/3.2.helios/tests/pom.xml 2010-06-01 19:12:45 UTC (rev 22458)
+++ branches/3.2.helios/tests/pom.xml 2010-06-01 19:17:11 UTC (rev 22459)
@@ -14,6 +14,7 @@
<modules>
<module>features</module>
<module>plugins</module>
+ <module>site</module>
</modules>
</project>
-
\ No newline at end of file
+
Added: branches/3.2.helios/tests/site/pom.xml
===================================================================
--- branches/3.2.helios/tests/site/pom.xml (rev 0)
+++ branches/3.2.helios/tests/site/pom.xml 2010-06-01 19:17:11 UTC (rev 22459)
@@ -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>tests.site</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>eclipse-update-site</packaging>
+</project>
Added: branches/3.2.helios/tests/site/site.xml
===================================================================
--- branches/3.2.helios/tests/site/site.xml (rev 0)
+++ branches/3.2.helios/tests/site/site.xml 2010-06-01 19:17:11 UTC (rev 22459)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <description>To install these features, point Eclipse at this site.</description>
+ <!-- JBoss Tools tests Nightly Build Update Site -->
+ <category-def label="JBoss Tools tests Nightly Build Update Site" name="JBoss Tools tests Nightly Build Update Site">
+ <description>JBoss Tools tests Nightly Build Update Site: contains all features in this build.</description>
+ </category-def>
+
+</site>
14 years, 7 months
JBoss Tools SVN: r22458 - trunk/vpe/plugins/org.jboss.tools.vpe.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2010-06-01 15:12:45 -0400 (Tue, 01 Jun 2010)
New Revision: 22458
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/
Log:
vpe.jar added to ignore list
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe
___________________________________________________________________
Name: svn:ignore
- bin
target
build
+ bin
target
build
vpe.jar
14 years, 7 months
JBoss Tools SVN: r22457 - in trunk: tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util and 14 other directories.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2010-06-01 15:10:40 -0400 (Tue, 01 Jun 2010)
New Revision: 22457
Modified:
trunk/tests/plugins/org.jboss.tools.tests/META-INF/MANIFEST.MF
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/build.properties
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.html.test/META-INF/MANIFEST.MF
trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties
trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml
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.ui.test/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/.project
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ProjectsLoader.java
trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml
Log:
https://jira.jboss.org/browse/JBDS-1202 problems running tests
vpe component tests fix:
- org.jboss.tools.vpe.xulrunner dependencies updated to include xulrunner plugins as optional to have them started during tests execution
- manifests updated to let tycho find tests
- pom.xml files updated to unpack required plug-ins
Modified: trunk/tests/plugins/org.jboss.tools.tests/META-INF/MANIFEST.MF
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/META-INF/MANIFEST.MF 2010-06-01 15:32:32 UTC (rev 22456)
+++ trunk/tests/plugins/org.jboss.tools.tests/META-INF/MANIFEST.MF 2010-06-01 19:10:40 UTC (rev 22457)
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.jboss.tools.tests
+Bundle-SymbolicName: org.jboss.tools.tests;singleton:=true
Bundle-Version: 3.1.0.qualifier
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.eclipse.ui,
@@ -20,3 +20,4 @@
Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Activator: org.jboss.tools.tests.TestsPlugin
Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2010-06-01 15:32:32 UTC (rev 22456)
+++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2010-06-01 19:10:40 UTC (rev 22457)
@@ -57,14 +57,24 @@
IOException, CoreException,
InvocationTargetException, InterruptedException {
+ return importProject(bundle, templLocation, new Path(templLocation).lastSegment(), monitor);
+ }
+
+ public static IProject importProject(
+ Bundle bundle, String templLocation, String projectName,
+ IProgressMonitor monitor)
+ throws
+ IOException, CoreException,
+ InvocationTargetException, InterruptedException {
+
String tplPrjLcStr;
tplPrjLcStr = FileLocator.resolve(bundle.getEntry(templLocation))
.getFile();
String protocol = FileLocator.resolve(bundle.getEntry(templLocation)).getProtocol();
- IProject importedPrj = importProjectIntoWorkspace(tplPrjLcStr, new Path(tplPrjLcStr).lastSegment(),protocol);
+ IProject importedPrj = importProjectIntoWorkspace(tplPrjLcStr, projectName, protocol);
return importedPrj;
}
-
+
public static IProject importProject(
Bundle bundle, String templLocation) throws IOException, CoreException, InvocationTargetException, InterruptedException {
return importProject(bundle, templLocation, new NullProgressMonitor());
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2010-06-01 15:32:32 UTC (rev 22456)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2010-06-01 19:10:40 UTC (rev 22457)
@@ -4,7 +4,6 @@
<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 point="org.jboss.tools.common.model.meta">
<meta path="meta/vpe.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 15:32:32 UTC (rev 22456)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java 2010-06-01 19:10:40 UTC (rev 22457)
@@ -18,6 +18,7 @@
import org.jboss.tools.common.log.BaseUIPlugin;
import org.jboss.tools.common.log.IPluginLog;
import org.jboss.tools.common.reporting.ProblemReportingHelper;
+import org.jboss.tools.vpe.xulrunner.XulRunnerException;
import org.jboss.tools.vpe.xulrunner.browser.XulRunnerBrowser;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -47,6 +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();
}
/**
@@ -99,8 +102,8 @@
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 (Throwable t) {
- // Ignore this. Will catch it when use Visual Editor
+ } catch (XulRunnerException e) {
+ logError(e);
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF 2010-06-01 15:32:32 UTC (rev 22456)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF 2010-06-01 19:10:40 UTC (rev 22457)
@@ -7,13 +7,17 @@
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.mozilla.xpcom;bundle-version="1.9.1",
- org.jboss.tools.common
+ org.jboss.tools.common,
+ org.mozilla.xulrunner.carbon.macosx;bundle-version="1.9.1";resolution:=optional,
+ org.mozilla.xulrunner.cocoa.macosx;bundle-version="1.9.1";resolution:=optional,
+ org.mozilla.xulrunner.gtk.linux.x86;bundle-version="1.9.1";resolution:=optional,
+ org.mozilla.xulrunner.gtk.linux.x86_64;bundle-version="1.9.1";resolution:=optional,
+ org.mozilla.xulrunner.win32.win32.x86;bundle-version="1.9.1";resolution:=optional
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.vpe.xulrunner;uses:="org.eclipse.jface.resource,org.eclipse.ui.plugin,org.osgi.framework",
org.jboss.tools.vpe.xulrunner.browser;uses:="org.mozilla.interfaces,org.eclipse.swt.widgets,org.mozilla.xpcom",
org.jboss.tools.vpe.xulrunner.editor,
org.jboss.tools.vpe.xulrunner.util
-Bundle-ClassPath: .
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/build.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/build.properties 2010-06-01 15:32:32 UTC (rev 22456)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/build.properties 2010-06-01 19:10:40 UTC (rev 22457)
@@ -1,6 +1,6 @@
-source.. = src/
-output.. = bin/
bin.includes = META-INF/,\
- .,\
plugin.properties,\
about.html
+jars.compile.order = .
+source.. = src/
+output.. = bin/
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF 2010-06-01 15:32:32 UTC (rev 22456)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF 2010-06-01 19:10:40 UTC (rev 22457)
@@ -17,7 +17,8 @@
org.jboss.tools.common.model,
org.jboss.tools.vpe.xulrunner,
org.mozilla.xpcom;bundle-version="1.9.1",
- org.jboss.tools.vpe.ui.test
+ org.jboss.tools.vpe.ui.test,
+ org.jboss.tools.vpe.html;bundle-version="3.1.0"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties 2010-06-01 15:32:32 UTC (rev 22456)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties 2010-06-01 19:10:40 UTC (rev 22457)
@@ -6,8 +6,6 @@
build.properties,\
src/,\
resources/
-jars.compile.order = html-test.jar,\
- .
-output.html-test.jar = bin/
+jars.compile.order = .
source.. = src/
output.. = bin/
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml 2010-06-01 15:32:32 UTC (rev 22456)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml 2010-06-01 19:10:40 UTC (rev 22457)
@@ -11,4 +11,22 @@
<artifactId>org.jboss.tools.vpe.html.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-test-plugin</artifactId>
+ <configuration>
+ <explodedBundles>
+ <bundle>org.jboss.tools.vpe</bundle>
+ <bundle>org.mozilla.xulrunner.carbon.macosx</bundle>
+ <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
+ <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
+ <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
+ <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle>
+ </explodedBundles>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF 2010-06-01 15:32:32 UTC (rev 22456)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF 2010-06-01 19:10:40 UTC (rev 22457)
@@ -14,7 +14,8 @@
org.jboss.tools.vpe.ui.test,
org.jboss.tools.jst.jsp,
org.jboss.tools.vpe.xulrunner,
- org.mozilla.xpcom;bundle-version="1.9.1"
+ org.mozilla.xpcom;bundle-version="1.9.1",
+ org.jboss.tools.vpe.jsp;bundle-version="3.1.0"
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.vpe.jsp.test
Bundle-Vendor: %Bundle-Vendor.0
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml 2010-06-01 15:32:32 UTC (rev 22456)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml 2010-06-01 19:10:40 UTC (rev 22457)
@@ -11,4 +11,22 @@
<artifactId>org.jboss.tools.vpe.jsp.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-test-plugin</artifactId>
+ <configuration>
+ <explodedBundles>
+ <bundle>org.jboss.tools.vpe</bundle>
+ <bundle>org.mozilla.xulrunner.carbon.macosx</bundle>
+ <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
+ <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
+ <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
+ <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle>
+ </explodedBundles>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml 2010-06-01 15:32:32 UTC (rev 22456)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml 2010-06-01 19:10:40 UTC (rev 22457)
@@ -23,5 +23,5 @@
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
</project>
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 15:32:32 UTC (rev 22456)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-06-01 19:10:40 UTC (rev 22457)
@@ -10,24 +10,17 @@
org.junit,
org.eclipse.core.resources,
org.eclipse.ui.ide,
- org.jboss.tools.common,
- org.jboss.tools.jst.web,
org.jboss.tools.jst.jsp,
- org.jboss.tools.common.text.ext,
- org.jboss.tools.common.model,
org.jboss.tools.vpe.xulrunner,
org.mozilla.xpcom;bundle-version="1.9.1",
- org.jboss.tools.jst.firstrun,
- org.eclipse.wst.server.core,
org.eclipse.jface.text,
org.jboss.tools.common.model.ui;bundle-version="2.0.0",
- org.jboss.tools.tests;bundle-version="2.0.0";visibility:=reexport,
- org.jboss.tools.common.resref.core;bundle-version="1.0.0",
- org.mozilla.xulrunner.gtk.linux.x86;bundle-version="1.9.1";resolution:=optional
+ org.jboss.tools.tests;bundle-version="2.0.0";visibility:=reexport
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 15:32:32 UTC (rev 22456)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties 2010-06-01 19:10:40 UTC (rev 22457)
@@ -3,6 +3,8 @@
plugin.xml,\
plugin.properties,\
resources/,\
- lib/
+ lib/,\
+ .
jars.compile.order = .
source.. = src/
+source.. = src/
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml 2010-06-01 15:32:32 UTC (rev 22456)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml 2010-06-01 19:10:40 UTC (rev 22457)
@@ -18,13 +18,16 @@
<artifactId>maven-osgi-test-plugin</artifactId>
<configuration>
<explodedBundles>
+ <bundle>org.jboss.tools.vpe</bundle>
<bundle>org.jboss.tools.vpe.ui.test</bundle>
+ <bundle>org.mozilla.xulrunner.carbon.macosx</bundle>
+ <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
<bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
- <bundle>org.jboss.tools.xulrunner.initializer</bundle>
+ <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
+ <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle>
</explodedBundles>
</configuration>
</plugin>
</plugins>
</build>
-
</project>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/.project
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/.project 2010-06-01 15:32:32 UTC (rev 22456)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/.project 2010-06-01 19:10:40 UTC (rev 22457)
@@ -6,11 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
@@ -21,11 +16,6 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.jboss.tools.common.verification.verifybuilder</name>
<arguments>
</arguments>
@@ -37,6 +27,5 @@
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.jboss.tools.jsf.jsfnature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ProjectsLoader.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ProjectsLoader.java 2010-06-01 15:32:32 UTC (rev 22456)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ProjectsLoader.java 2010-06-01 19:10:40 UTC (rev 22457)
@@ -11,6 +11,7 @@
package org.jboss.tools.vpe.ui.test;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
@@ -102,31 +103,20 @@
"Project '" + project + "' is not defined.");
}
- Bundle bundle = location.getBundle();
- if (bundle == null) {
- throw new NullPointerException(
- "Owning bundle of '" + project + "' is null.");
+ try {
+ project = ResourcesUtils.importProject(location.getBundle(), location.getPath(), projectName, new NullProgressMonitor());
+ } catch (CoreException e) {
+ throw new RuntimeException("Project by the path='" + location.getPath()
+ + "' cannot be imported.",e);
+ } catch (InvocationTargetException e) {
+ throw new RuntimeException("Project by the path='" + location.getPath()
+ + "' cannot be imported.",e);
+ } catch (InterruptedException e) {
+ throw new RuntimeException("Project by the path='" + location.getPath()
+ + "' cannot be imported.",e);
}
-
- URL rootEntry = bundle.getEntry("/");
- if (rootEntry == null) {
- throw new NullPointerException(
- "Root entry to the bundle with id='"
- + bundle.getBundleId() + "' cannot be resolved.");
- }
-
- URL resolvedRootEntry = FileLocator.resolve(rootEntry);
- String pluginRoot = resolvedRootEntry.getPath();
- if (pluginRoot.equals("")) {
- throw new RuntimeException("Path to '" + resolvedRootEntry
- + "' does not exist.");
- }
-
- String projectPath = pluginRoot + location.getPath();
- project = ResourcesUtils.importProjectIntoWorkspace(
- projectPath, projectName);
if (project == null) {
- throw new RuntimeException("Project by the path='" + projectPath
+ throw new RuntimeException("Project by the path='" + location.getPath()
+ "' cannot be imported.");
}
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml 2010-06-01 15:32:32 UTC (rev 22456)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml 2010-06-01 19:10:40 UTC (rev 22457)
@@ -11,4 +11,22 @@
<artifactId>org.jboss.tools.vpe.xulrunner.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-test-plugin</artifactId>
+ <configuration>
+ <explodedBundles>
+ <bundle>org.jboss.tools.vpe</bundle>
+ <bundle>org.mozilla.xulrunner.carbon.macosx</bundle>
+ <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
+ <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
+ <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
+ <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle>
+ </explodedBundles>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
14 years, 7 months
JBoss Tools SVN: r22456 - trunk/build.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-06-01 11:32:32 -0400 (Tue, 01 Jun 2010)
New Revision: 22456
Modified:
trunk/build/publish.sh
Log:
fix filename tests
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-06-01 15:16:22 UTC (rev 22455)
+++ trunk/build/publish.sh 2010-06-01 15:32:32 UTC (rev 22456)
@@ -8,11 +8,11 @@
SNAPNAME=${JOB_NAME}-Update-SNAPSHOT.zip
rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME}
-if [[ -f ${WORKSPACE}/*/site/target/site.zip ]]; then
+if [[ -f ${WORKSPACE}/sources/site/target/site.zip ]]; then
# copy into workspace for archiving
- rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${JOB_NAME}/${ZIPNAME}
+ rsync -aq ${WORKSPACE}/sources/site/target/site.zip ${WORKSPACE}/site/${JOB_NAME}/${ZIPNAME}
# copy into workspace for access by bucky aggregator
- rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${SNAPNAME}
+ rsync -aq ${WORKSPACE}/sources/site/target/site.zip ${WORKSPACE}/site/${SNAPNAME}
fi
# if zips exist produced & renamed by ant script, copy them too
14 years, 7 months
JBoss Tools SVN: r22455 - trunk/build.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-06-01 11:16:22 -0400 (Tue, 01 Jun 2010)
New Revision: 22455
Modified:
trunk/build/build.xml
Log:
don't delete site/ folder before a svn up, but do an svn revert; don't run the site build if it's already been done because of the component's agg pom.xml
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-06-01 14:06:54 UTC (rev 22454)
+++ trunk/build/build.xml 2010-06-01 15:16:22 UTC (rev 22455)
@@ -313,7 +313,7 @@
<if>
<istrue value="${svnant.enabled}" />
<then>
- <!-- remove generated site/ folder -->
+ <!-- remove generated site/ folder?
<if>
<not>
<equals arg1="@{component}" arg2="." />
@@ -324,12 +324,10 @@
quiet="true"
/>
</then>
- </if>
- <!--
+ </if> -->
<svn javahl="false" svnkit="true" failonerror="false">
<revert recurse="${svn.recurse}" dir="@{component}" />
</svn>
- -->
<svn javahl="false" svnkit="true" failonerror="false">
<update recurse="${svn.recurse}" dir="@{component}" />
</svn>
@@ -660,7 +658,7 @@
<ant antfile="${WORKINGDIR}/(a){COMPONENT}/build.xml">
<property name="COMPONENT" value="@{COMPONENT}" />
<property name="basedir" value="${WORKINGDIR}/@{COMPONENT}" />
- <property name="build.xml" value="${ant.file}"/>
+ <property name="build.xml" value="${ant.file}" />
</ant>
</then>
</if>
@@ -700,9 +698,18 @@
</not>
</and>
<then>
- <antcall target="create.update.site">
- <param name="COMPONENT" value="@{COMPONENT}" />
- </antcall>
+ <!-- only do this if the component's aggregate pom doesn't reference the site/ folder, and therefore hasn't already build it -->
+ <loadfile property="component.pom.xml" srcfile="${WORKINGDIR}/(a){COMPONENT}/pom.xml" />
+ <if>
+ <not>
+ <contains string="${component.pom.xml}" substring="<module>site</module>" />
+ </not>
+ <then>
+ <antcall target="create.update.site">
+ <param name="COMPONENT" value="@{COMPONENT}" />
+ </antcall>
+ </then>
+ </if>
</then>
</if>
</sequential>
14 years, 7 months
JBoss Tools SVN: r22454 - branches/jbosstools-3.1.x/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model.
by jbosstools-commits@lists.jboss.org
Author: vyemialyanchyk
Date: 2010-06-01 10:06:54 -0400 (Tue, 01 Jun 2010)
New Revision: 22454
Modified:
branches/jbosstools-3.1.x/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Connection.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5897 - fixed
Modified: branches/jbosstools-3.1.x/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Connection.java
===================================================================
--- branches/jbosstools-3.1.x/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Connection.java 2010-06-01 08:47:45 UTC (rev 22453)
+++ branches/jbosstools-3.1.x/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Connection.java 2010-06-01 14:06:54 UTC (rev 22454)
@@ -34,7 +34,7 @@
private static IPropertyDescriptor[] descriptors_connection_foreign_key_constraint;
private static final String PROPERTY_SOURCE = "source"; //$NON-NLS-1$
- private static final String PROPERTY_TARGET = "targer"; //$NON-NLS-1$
+ private static final String PROPERTY_TARGET = "target"; //$NON-NLS-1$
private static final String PROPERTY_TYPE = "type"; //$NON-NLS-1$
private static final String PROPERTY_CLASS_NAME = "className"; //$NON-NLS-1$
private static final String PROPERTY_TABLE_NAME = "tableName"; //$NON-NLS-1$
14 years, 7 months
JBoss Tools SVN: r22453 - trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2010-06-01 04:47:45 -0400 (Tue, 01 Jun 2010)
New Revision: 22453
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XPCOMTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6393
Create generic queryInterface method
- A wrong import has been fixed
Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XPCOMTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XPCOMTest.java 2010-06-01 07:42:29 UTC (rev 22452)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XPCOMTest.java 2010-06-01 08:47:45 UTC (rev 22453)
@@ -12,7 +12,7 @@
import java.util.List;
-import org.jboss.tools.vpe.xulrunner.XPCOM;
+import org.jboss.tools.vpe.xulrunner.util.XPCOM;
import org.mozilla.interfaces.jsdIScript;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMDocumentView;
14 years, 7 months
JBoss Tools SVN: r22452 - workspace/Denny/esb-example-soa-p5.0.
by jbosstools-commits@lists.jboss.org
Author: dennyxu
Date: 2010-06-01 03:42:29 -0400 (Tue, 01 Jun 2010)
New Revision: 22452
Added:
workspace/Denny/esb-example-soa-p5.0/helloworld_all.zip
Log:
update ESB examples for SOA-P 5.0
Added: workspace/Denny/esb-example-soa-p5.0/helloworld_all.zip
===================================================================
(Binary files differ)
Property changes on: workspace/Denny/esb-example-soa-p5.0/helloworld_all.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 7 months
JBoss Tools SVN: r22451 - workspace/Denny/esb-example.
by jbosstools-commits@lists.jboss.org
Author: dennyxu
Date: 2010-06-01 03:28:36 -0400 (Tue, 01 Jun 2010)
New Revision: 22451
Added:
workspace/Denny/esb-example/helloworld_action_all.zip
workspace/Denny/esb-example/helloworld_all.zip
workspace/Denny/esb-example/helloworld_file_action_all.zip
workspace/Denny/esb-example/transform_CSV2XML_all.zip
workspace/Denny/esb-example/transform_XML2POJO_all.zip
workspace/Denny/esb-example/transform_XML2XML_date_manipulation_all.zip
workspace/Denny/esb-example/transform_XML2XML_simple_all.zip
workspace/Denny/esb-example/webservice_consumer1_all.zip
workspace/Denny/esb-example/webservice_producer_all.zip
Log:
update ESB examples for SOA-P 4.3.0
Added: workspace/Denny/esb-example/helloworld_action_all.zip
===================================================================
(Binary files differ)
Property changes on: workspace/Denny/esb-example/helloworld_action_all.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/Denny/esb-example/helloworld_all.zip
===================================================================
(Binary files differ)
Property changes on: workspace/Denny/esb-example/helloworld_all.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/Denny/esb-example/helloworld_file_action_all.zip
===================================================================
(Binary files differ)
Property changes on: workspace/Denny/esb-example/helloworld_file_action_all.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/Denny/esb-example/transform_CSV2XML_all.zip
===================================================================
(Binary files differ)
Property changes on: workspace/Denny/esb-example/transform_CSV2XML_all.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/Denny/esb-example/transform_XML2POJO_all.zip
===================================================================
(Binary files differ)
Property changes on: workspace/Denny/esb-example/transform_XML2POJO_all.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/Denny/esb-example/transform_XML2XML_date_manipulation_all.zip
===================================================================
(Binary files differ)
Property changes on: workspace/Denny/esb-example/transform_XML2XML_date_manipulation_all.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/Denny/esb-example/transform_XML2XML_simple_all.zip
===================================================================
(Binary files differ)
Property changes on: workspace/Denny/esb-example/transform_XML2XML_simple_all.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/Denny/esb-example/webservice_consumer1_all.zip
===================================================================
(Binary files differ)
Property changes on: workspace/Denny/esb-example/webservice_consumer1_all.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/Denny/esb-example/webservice_producer_all.zip
===================================================================
(Binary files differ)
Property changes on: workspace/Denny/esb-example/webservice_producer_all.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 7 months