JBoss Tools SVN: r30940 - trunk/build/aggregate/site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-04-28 16:20:38 -0400 (Thu, 28 Apr 2011)
New Revision: 30940
Modified:
trunk/build/aggregate/site/build.xml
Log:
add check that local path exists; if not, use http:// path instead
Modified: trunk/build/aggregate/site/build.xml
===================================================================
--- trunk/build/aggregate/site/build.xml 2011-04-28 20:20:10 UTC (rev 30939)
+++ trunk/build/aggregate/site/build.xml 2011-04-28 20:20:38 UTC (rev 30940)
@@ -283,7 +283,6 @@
</then>
</if>
</then>
-
<else>
<propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" />
</else>
13 years, 8 months
JBoss Tools SVN: r30939 - trunk/build/aggregate/site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-04-28 16:20:10 -0400 (Thu, 28 Apr 2011)
New Revision: 30939
Modified:
trunk/build/aggregate/site/build.xml
Log:
add check that local path exists; if not, use http:// path instead
Modified: trunk/build/aggregate/site/build.xml
===================================================================
--- trunk/build/aggregate/site/build.xml 2011-04-28 20:05:31 UTC (rev 30938)
+++ trunk/build/aggregate/site/build.xml 2011-04-28 20:20:10 UTC (rev 30939)
@@ -274,7 +274,16 @@
<available file="/home/hudson/static_build_env/jbds/builds/staging" type="dir" />
<then>
<propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="/home/hudson/static_build_env/jbds/builds/staging/" />
+ <if>
+ <not>
+ <available file="${location.cleaned}" />
+ </not>
+ <then>
+ <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" />
+ </then>
+ </if>
</then>
+
<else>
<propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" />
</else>
13 years, 8 months
JBoss Tools SVN: r30938 - workspace/examples.
by jbosstools-commits@lists.jboss.org
Author: elvisisking
Date: 2011-04-28 16:05:31 -0400 (Thu, 28 Apr 2011)
New Revision: 30938
Modified:
workspace/examples/project-examples-3.2.xml
Log:
JBIDE-8399
Modified: workspace/examples/project-examples-3.2.xml
===================================================================
--- workspace/examples/project-examples-3.2.xml 2011-04-28 20:02:10 UTC (rev 30937)
+++ workspace/examples/project-examples-3.2.xml 2011-04-28 20:05:31 UTC (rev 30938)
@@ -1,55 +1,103 @@
-<projects>
- <project>
- <category>Teiid Designer</category>
- <name>Parts</name>
- <included-projects>
- PartsProject
- </included-projects>
- <shortDescription>Parts Model Project Set Example</shortDescription>
- <description>
- This is a simple Teiid Designer model project that demonstrates how a view model can be used to create a virtual
- relational table that joins multiple physical relational tables. The project also contains a Virtual Database (VDB) which
- contains the project's models, and in a runtime environment, would also contain the needed connection information for the
- physical sources. VDBs are used by Teiid to access federated data.
- </description>
- <size>22645</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/dflorian/teiid-design...
- </url>
- <perspectiveId>modelerPerspective</perspectiveId>
- </project>
- <project>
- <category>Teiid Designer</category>
- <name>Portfolio</name>
- <included-projects>
- Portfolio
- </included-projects>
- <shortDescription>Portfolio Web Service Project Set Example</shortDescription>
- <description>
- This is a Teiid Designer model project that demonstrates how to expose any Teiid data source as a web service. The example will walk through
- the steps of creating the data sources, creating the VDB and generating/deploying the JbossWS-CXF web service war.
- </description>
- <size>22645</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/dflorian/teiid-design...
- </url>
- <perspectiveId>modelerPerspective</perspectiveId>
- </project>
- <project>
- <category>Teiid Designer</category>
- <name>US States</name>
- <included-projects>
- US_States,StateService,StateServiceEAR
- </included-projects>
- <shortDescription>US States SOAP Service Project Set Example</shortDescription>
- <description>
- This is a Teiid Designer model project that demonstrates how to consume a sample SOAP service as a source of data. The example provides the
- sample SOAP Service and a Teiid Designer project set that executes the service and transforms the responses to relational results.
- </description>
- <size>56033</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/jdoyle/teiid-designer...
- </url>
- <perspectiveId>modelerPerspective</perspectiveId>
- </project>
-</projects>
+<projects>
+ <project>
+ <category>Teiid Designer</category>
+ <name>Parts</name>
+ <included-projects>
+ PartsProject
+ </included-projects>
+ <shortDescription>Parts Model Project Set Example</shortDescription>
+ <description>
+ This is a simple Teiid Designer model project that
+ demonstrates how a view model can be used to create a virtual
+ relational table that joins multiple physical relational tables. The
+ project also contains a Virtual Database (VDB) which
+ contains the project's models, and in a runtime environment, would also
+ contain the needed connection information for the
+ physical sources. VDBs are used by Teiid to access federated data.
+ </description>
+ <size>22645</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/dflorian/teiid-design...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50,
+ org.jboss.ide.eclipse.as.runtime.51,
+ org.jboss.ide.eclipse.as.runtime.60</property>
+ <property name="eclipse-projects">PartsProject</property>
+ <property name="required-components">teiid</property>
+ <property name="description">This project example requires a Teiid
+ instance running within the JBoss EAP 5.0 or JBoss AS >= 5.1.0
+ </property>
+ </fix>
+ </fixes>
+ <welcome type="html" url="/PartsProject/readme/Example Instructions.html" />
+ <perspectiveId>modelerPerspective</perspectiveId>
+ </project>
+ <project>
+ <category>Teiid Designer</category>
+ <name>Portfolio</name>
+ <included-projects>
+ Portfolio
+ </included-projects>
+ <shortDescription>Portfolio Web Service Project Set Example
+ </shortDescription>
+ <description>
+ This is a Teiid Designer model project that demonstrates
+ how to expose any Teiid data source as a web service. The example will
+ walk through the steps of creating the data sources, creating the VDB
+ and generating/deploying the JbossWS-CXF web service war.
+ </description>
+ <size>786376</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/dflorian/teiid-design...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50,
+ org.jboss.ide.eclipse.as.runtime.51,
+ org.jboss.ide.eclipse.as.runtime.60</property>
+ <property name="eclipse-projects">Portfolio</property>
+ <property name="required-components">teiid</property>
+ <property name="description">This project example requires a Teiid
+ instance running within the JBoss EAP 5.0 or JBoss AS >= 5.1.0
+ </property>
+ </fix>
+ </fixes>
+ <welcome type="html" url="/Portfolio/readme/Example Instructions.html" />
+ <perspectiveId>modelerPerspective</perspectiveId>
+ </project>
+ <project>
+ <category>Teiid Designer</category>
+ <name>US States</name>
+ <included-projects>
+ US_States,StateService,StateServiceEAR
+ </included-projects>
+ <shortDescription>US States SOAP Service Project Set Example
+ </shortDescription>
+ <description>
+ This is a Teiid Designer model project that demonstrates
+ how to consume a sample SOAP service as a source of data. The example
+ provides the sample SOAP Service and a Teiid Designer project set that
+ executes the service and transforms the responses to relational
+ results.
+ </description>
+ <size>56084</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/jdoyle/teiid-designer...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50,
+ org.jboss.ide.eclipse.as.runtime.51,
+ org.jboss.ide.eclipse.as.runtime.60</property>
+ <property name="eclipse-projects">StateService,StateServiceEAR</property>
+ <property name="required-components">teiid</property>
+ <property name="description">This project example requires a Teiid
+ instance running within the JBoss EAP 5.0 or JBoss AS >= 5.1.0
+ </property>
+ </fix>
+ </fixes>
+ <perspectiveId>modelerPerspective</perspectiveId>
+ </project>
+</projects>
13 years, 8 months
JBoss Tools SVN: r30937 - in branches/jbosstools-3.2.x/common: features/org.jboss.tools.common.all.tests.feature and 16 other directories.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2011-04-28 16:02:10 -0400 (Thu, 28 Apr 2011)
New Revision: 30937
Modified:
branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.all.feature/feature.xml
branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.all.feature/pom.xml
branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.all.tests.feature/feature.xml
branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.all.tests.feature/pom.xml
branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.core.feature/feature.xml
branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.core.feature/pom.xml
branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.feature/feature.xml
branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.feature/pom.xml
branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.text.ext.feature/feature.xml
branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.text.ext.feature/pom.xml
branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.ui.feature/feature.xml
branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.ui.feature/pom.xml
branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.el.core/pom.xml
branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/pom.xml
branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.projecttemplates/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.projecttemplates/pom.xml
branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.text.ext/pom.xml
branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common/pom.xml
branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.test/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.test/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-8814
Modified: branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.all.feature/feature.xml
===================================================================
--- branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.all.feature/feature.xml 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.all.feature/feature.xml 2011-04-28 20:02:10 UTC (rev 30937)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.common.all.feature"
label="%featureName"
- version="3.1.0.qualifier"
+ version="3.1.1.qualifier"
provider-name="%featureProvider">
<description>
Modified: branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.all.feature/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.all.feature/pom.xml 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.all.feature/pom.xml 2011-04-28 20:02:10 UTC (rev 30937)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.all.feature</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Modified: branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.all.tests.feature/feature.xml
===================================================================
--- branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.all.tests.feature/feature.xml 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.all.tests.feature/feature.xml 2011-04-28 20:02:10 UTC (rev 30937)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.common.all.tests.feature"
label="%featureName"
- version="3.1.0.qualifier"
+ version="3.1.1.qualifier"
provider-name="%featureProvider"
image="eclipse_update_120.jpg">
@@ -19,31 +19,16 @@
</license>
<requires>
- <import plugin="org.junit" version="3.8.1" match="greaterOrEqual"/>
- <import plugin="org.eclipse.core.runtime" version="3.3.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.core.resources" version="3.3.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ant.core" version="3.1.100" match="greaterOrEqual"/>
- <import plugin="org.eclipse.core.resources" version="3.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.core.runtime" version="3.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.debug.core" version="3.2.0" match="greaterOrEqual"/>
+ <import plugin="org.junit" version="3.8.1" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.core.runtime" version="3.3.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.core.resources" version="3.3.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.ant.core" version="3.1.100" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.core.resources" version="3.2.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.core.runtime" version="3.2.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.debug.core" version="3.2.0" match="greaterOrEqual"/>
</requires>
- <!-- add to allow buildTests and tests to run via an Athena build; remove for uberbuilder -->
- <!-- <plugin
- id="org.eclipse.ant.optional.junit"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"/>
-
<plugin
- id="org.eclipse.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/> -->
- <!-- add to allow buildTests and tests to run via an Athena build; remove for uberbuilder -->
-
- <plugin
id="org.jboss.tools.tests"
download-size="0"
install-size="0"
@@ -55,76 +40,34 @@
install-size="0"
version="0.0.0"/>
- <!-- <plugin
- id="org.jboss.tools.common.el.core.test.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/> -->
-
<plugin
id="org.jboss.tools.common.model.test"
download-size="0"
install-size="0"
version="0.0.0"/>
- <!-- <plugin
- id="org.jboss.tools.common.model.test.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/> -->
-
<plugin
id="org.jboss.tools.common.model.ui.test"
download-size="0"
install-size="0"
version="0.0.0"/>
- <!-- <plugin
- id="org.jboss.tools.common.model.ui.test.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/> -->
-
<plugin
id="org.jboss.tools.common.test"
download-size="0"
install-size="0"
version="0.0.0"/>
- <!-- <plugin
- id="org.jboss.tools.common.test.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/> -->
-
- <!-- <plugin
- id="org.jboss.tools.common.text.ext.test.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/> -->
-
<plugin
id="org.jboss.tools.common.verification.test"
download-size="0"
install-size="0"
version="0.0.0"/>
- <!-- <plugin
- id="org.jboss.tools.common.verification.test.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/> -->
-
<plugin
id="org.jboss.tools.common.verification.ui.test"
download-size="0"
install-size="0"
version="0.0.0"/>
- <!-- <plugin
- id="org.jboss.tools.common.verification.ui.test.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/> -->
-
</feature>
Modified: branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.all.tests.feature/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.all.tests.feature/pom.xml 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.all.tests.feature/pom.xml 2011-04-28 20:02:10 UTC (rev 30937)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.all.tests.feature</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Modified: branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.core.feature/feature.xml
===================================================================
--- branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.core.feature/feature.xml 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.core.feature/feature.xml 2011-04-28 20:02:10 UTC (rev 30937)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.common.core.feature"
label="%featureName"
- version="3.1.0.qualifier"
+ version="3.1.1.qualifier"
provider-name="%providerName">
<description url="http://www.jboss.org/tools">
Modified: branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.core.feature/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.core.feature/pom.xml 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.core.feature/pom.xml 2011-04-28 20:02:10 UTC (rev 30937)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.core.feature</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Modified: branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.feature/feature.xml
===================================================================
--- branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.feature/feature.xml 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.feature/feature.xml 2011-04-28 20:02:10 UTC (rev 30937)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.common.feature"
label="%featureName"
- version="3.1.0.qualifier"
+ version="3.1.1.qualifier"
provider-name="%providerName">
<description url="http://www.jboss.org/tools">
@@ -13,21 +13,21 @@
%copyright
</copyright>
- <license>Red Hat, Inc. licenses these features and plugins to you under
+ <license>
+ Red Hat, Inc. licenses these features and plugins to you under
certain open source licenses (or aggregations of such licenses), which
in a particular case may include the Eclipse Public License, the GNU
Lesser General Public License, and/or certain other open source
licenses. For precise licensing details, consult the corresponding
source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
Raleigh NC 27606 USA.
-</license>
+ </license>
+
<requires>
- <import feature="org.eclipse.wst.common_core.feature"
- version="0.0.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.wst.common_ui.feature"
- version="0.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.wst.common_core.feature" version="0.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.wst.common_ui.feature" version="0.0.0" match="greaterOrEqual"/>
</requires>
-
+
<plugin
id="org.jboss.tools.common.el.core"
download-size="0"
@@ -51,4 +51,5 @@
download-size="0"
install-size="0"
version="0.0.0"/>
+
</feature>
Modified: branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.feature/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.feature/pom.xml 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.feature/pom.xml 2011-04-28 20:02:10 UTC (rev 30937)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.feature</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Modified: branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.text.ext.feature/feature.xml
===================================================================
--- branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.text.ext.feature/feature.xml 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.text.ext.feature/feature.xml 2011-04-28 20:02:10 UTC (rev 30937)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.common.text.ext.feature"
label="%featureName"
- version="3.1.0.qualifier"
+ version="3.1.1.qualifier"
provider-name="%providerName">
<description url="http://www.jboss.org/tools">
@@ -13,22 +13,20 @@
%copyright
</copyright>
- <license>Red Hat, Inc. licenses these features and plugins to you under
+ <license>
+ Red Hat, Inc. licenses these features and plugins to you under
certain open source licenses (or aggregations of such licenses), which
in a particular case may include the Eclipse Public License, the GNU
Lesser General Public License, and/or certain other open source
licenses. For precise licensing details, consult the corresponding
source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
Raleigh NC 27606 USA.
-</license>
+ </license>
<requires>
- <import feature="org.jboss.tools.common.core.feature"
- version="0.0.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.wst.common_core.feature"
- version="0.0.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.wst.common_ui.feature"
- version="0.0.0" match="greaterOrEqual"/>
+ <import feature="org.jboss.tools.common.core.feature" version="0.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.wst.common_core.feature" version="0.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.wst.common_ui.feature" version="0.0.0" match="greaterOrEqual"/>
</requires>
<plugin
Modified: branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.text.ext.feature/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.text.ext.feature/pom.xml 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.text.ext.feature/pom.xml 2011-04-28 20:02:10 UTC (rev 30937)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.text.ext.feature</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Modified: branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.ui.feature/feature.xml
===================================================================
--- branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.ui.feature/feature.xml 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.ui.feature/feature.xml 2011-04-28 20:02:10 UTC (rev 30937)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.common.ui.feature"
label="%featureName"
- version="3.1.0.qualifier"
+ version="3.1.1.qualifier"
provider-name="%providerName">
<description url="http://www.jboss.org/tools">
Modified: branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.ui.feature/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.ui.feature/pom.xml 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/features/org.jboss.tools.common.ui.feature/pom.xml 2011-04-28 20:02:10 UTC (rev 30937)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.ui.feature</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF 2011-04-28 20:02:10 UTC (rev 30937)
@@ -28,7 +28,7 @@
org.eclipse.ui.workbench.texteditor,
org.eclipse.jface.text,
org.apache.commons.httpclient
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.1.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common/pom.xml 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common/pom.xml 2011-04-28 20:02:10 UTC (rev 30937)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF 2011-04-28 20:02:10 UTC (rev 30937)
@@ -5,7 +5,7 @@
Bundle-Localization: plugin
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.common.el.core;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.1.qualifier
Export-Package: org.jboss.tools.common.el.core,
org.jboss.tools.common.el.core.ca,
org.jboss.tools.common.el.core.ca.preferences,
Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.el.core/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.el.core/pom.xml 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.el.core/pom.xml 2011-04-28 20:02:10 UTC (rev 30937)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.el.core</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF 2011-04-28 20:02:10 UTC (rev 30937)
@@ -83,6 +83,6 @@
org.eclipse.wst.common.emfworkbench.integration,
org.eclipse.core.resources;visibility:=reexport,
org.eclipse.core.runtime;visibility:=reexport
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.1.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: org.jboss.tools.common.model.jar
Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/pom.xml 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/pom.xml 2011-04-28 20:02:10 UTC (rev 30937)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.model</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.projecttemplates/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.projecttemplates/META-INF/MANIFEST.MF 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.projecttemplates/META-INF/MANIFEST.MF 2011-04-28 20:02:10 UTC (rev 30937)
@@ -9,6 +9,6 @@
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
org.jboss.tools.common
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.1.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.projecttemplates/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.projecttemplates/pom.xml 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.projecttemplates/pom.xml 2011-04-28 20:02:10 UTC (rev 30937)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.projecttemplates</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF 2011-04-28 20:02:10 UTC (rev 30937)
@@ -7,7 +7,7 @@
org.jboss.tools.common.text.ext.hyperlink.xpl,
org.jboss.tools.common.text.ext.util,
org.jboss.tools.common.text.ext.util.xpl
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.1.qualifier
Bundle-Name: %Bundle-Name.0
Bundle-ManifestVersion: 2
Bundle-Vendor: %providerName
Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.text.ext/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.text.ext/pom.xml 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.text.ext/pom.xml 2011-04-28 20:02:10 UTC (rev 30937)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.text.ext</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.test/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.test/META-INF/MANIFEST.MF 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.test/META-INF/MANIFEST.MF 2011-04-28 20:02:10 UTC (rev 30937)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.common.model.test;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.1.qualifier
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.common.model.test,
org.jboss.tools.common.model.util.test
Modified: branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.test/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.test/pom.xml 2011-04-28 19:59:18 UTC (rev 30936)
+++ branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.test/pom.xml 2011-04-28 20:02:10 UTC (rev 30937)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.model.test</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.1-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
13 years, 8 months
JBoss Tools SVN: r30936 - branches/jbosstools-3.2.x/build.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-04-28 15:59:18 -0400 (Thu, 28 Apr 2011)
New Revision: 30936
Modified:
branches/jbosstools-3.2.x/build/publish.sh
Log:
merge internal builds/staging/* rsync code from trunk to 32x branch
Modified: branches/jbosstools-3.2.x/build/publish.sh
===================================================================
--- branches/jbosstools-3.2.x/build/publish.sh 2011-04-28 19:57:31 UTC (rev 30935)
+++ branches/jbosstools-3.2.x/build/publish.sh 2011-04-28 19:59:18 UTC (rev 30936)
@@ -28,6 +28,9 @@
# for JBDS, use DESTINATION=/qa/services/http/binaries/RHDS
if [[ $DESTINATION == "" ]]; then DESTINATION="tools@filemgmt.jboss.org:/downloads_htdocs/tools"; fi
+# internal destination mirror, for file:// access (instead of http://)
+if [[ $INTRNALDEST == "" ]]; then INTRNALDEST="/home/hudson/static_build_env/jbds/"; fi
+
# cleanup from last time
rm -fr ${WORKSPACE}/results; mkdir -p ${STAGINGDIR}
@@ -253,6 +256,9 @@
#fi
fi
+ # and create/replace a snapshot dir outside Hudson which is file:// accessible
+ date; rsync -arzq --delete ${STAGINGDIR} $INTRNALDEST/builds/staging/
+
# and create/replace a snapshot dir w/ static URL
date; rsync -arzq --delete ${STAGINGDIR} $DESTINATION/builds/staging/
fi
@@ -276,6 +282,6 @@
# publish updated log
bl=${STAGINGDIR}/logs/BUILDLOG.txt
rm -f ${bl}; wget -q http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O ${bl} --timeout=900 --wait=10 --random-wait --tries=10 --retry-connrefused --no-check-certificate
-
date; rsync -arzq --delete ${STAGINGDIR}/logs $DESTINATION/builds/staging/${JOB_NAME}/
+date; rsync -arzq --delete ${STAGINGDIR}/logs $INTRNALDEST/builds/staging/${JOB_NAME}/
13 years, 8 months
JBoss Tools SVN: r30935 - in trunk/common: features/org.jboss.tools.common.all.tests.feature and 18 other directories.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2011-04-28 15:57:31 -0400 (Thu, 28 Apr 2011)
New Revision: 30935
Modified:
trunk/common/features/org.jboss.tools.common.all.feature/feature.xml
trunk/common/features/org.jboss.tools.common.all.feature/pom.xml
trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.xml
trunk/common/features/org.jboss.tools.common.all.tests.feature/pom.xml
trunk/common/features/org.jboss.tools.common.core.feature/feature.xml
trunk/common/features/org.jboss.tools.common.core.feature/pom.xml
trunk/common/features/org.jboss.tools.common.feature/feature.xml
trunk/common/features/org.jboss.tools.common.feature/pom.xml
trunk/common/features/org.jboss.tools.common.text.ext.feature/feature.xml
trunk/common/features/org.jboss.tools.common.text.ext.feature/pom.xml
trunk/common/features/org.jboss.tools.common.ui.feature/feature.xml
trunk/common/features/org.jboss.tools.common.ui.feature/pom.xml
trunk/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.el.ui/pom.xml
trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/pom.xml
trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.model/pom.xml
trunk/common/plugins/org.jboss.tools.common.projecttemplates/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.projecttemplates/pom.xml
trunk/common/plugins/org.jboss.tools.common.resref.core/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.resref.core/pom.xml
trunk/common/tests/org.jboss.tools.common.el.core.test/META-INF/MANIFEST.MF
trunk/common/tests/org.jboss.tools.common.el.core.test/pom.xml
trunk/common/tests/org.jboss.tools.common.model.test/META-INF/MANIFEST.MF
trunk/common/tests/org.jboss.tools.common.model.test/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-8815
Modified: trunk/common/features/org.jboss.tools.common.all.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.feature/feature.xml 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/features/org.jboss.tools.common.all.feature/feature.xml 2011-04-28 19:57:31 UTC (rev 30935)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.common.all.feature"
label="%featureName"
- version="3.1.0.qualifier"
+ version="3.3.0.qualifier"
provider-name="%featureProvider">
<description>
Modified: trunk/common/features/org.jboss.tools.common.all.feature/pom.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.feature/pom.xml 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/features/org.jboss.tools.common.all.feature/pom.xml 2011-04-28 19:57:31 UTC (rev 30935)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.all.feature</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
\ No newline at end of file
Modified: trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.xml 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.xml 2011-04-28 19:57:31 UTC (rev 30935)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.common.all.tests.feature"
label="%featureName"
- version="3.1.0.qualifier"
+ version="3.3.0.qualifier"
provider-name="%featureProvider"
image="eclipse_update_120.jpg">
@@ -19,31 +19,16 @@
</license>
<requires>
- <import plugin="org.junit" version="3.8.1" match="greaterOrEqual"/>
- <import plugin="org.eclipse.core.runtime" version="3.3.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.core.resources" version="3.3.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ant.core" version="3.1.100" match="greaterOrEqual"/>
- <import plugin="org.eclipse.core.resources" version="3.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.core.runtime" version="3.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.debug.core" version="3.2.0" match="greaterOrEqual"/>
+ <import plugin="org.junit" version="3.8.1" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.core.runtime" version="3.3.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.core.resources" version="3.3.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.ant.core" version="3.1.100" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.core.resources" version="3.2.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.core.runtime" version="3.2.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.debug.core" version="3.2.0" match="greaterOrEqual"/>
</requires>
- <!-- add to allow buildTests and tests to run via an Athena build; remove for uberbuilder -->
- <!-- <plugin
- id="org.eclipse.ant.optional.junit"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"/>
-
<plugin
- id="org.eclipse.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/> -->
- <!-- add to allow buildTests and tests to run via an Athena build; remove for uberbuilder -->
-
- <plugin
id="org.jboss.tools.tests"
download-size="0"
install-size="0"
@@ -55,76 +40,34 @@
install-size="0"
version="0.0.0"/>
- <!-- <plugin
- id="org.jboss.tools.common.el.core.test.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/> -->
-
<plugin
id="org.jboss.tools.common.model.test"
download-size="0"
install-size="0"
version="0.0.0"/>
- <!-- <plugin
- id="org.jboss.tools.common.model.test.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/> -->
-
<plugin
id="org.jboss.tools.common.model.ui.test"
download-size="0"
install-size="0"
version="0.0.0"/>
- <!-- <plugin
- id="org.jboss.tools.common.model.ui.test.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/> -->
-
<plugin
id="org.jboss.tools.common.test"
download-size="0"
install-size="0"
version="0.0.0"/>
- <!-- <plugin
- id="org.jboss.tools.common.test.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/> -->
-
- <!-- <plugin
- id="org.jboss.tools.common.text.ext.test.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/> -->
-
<plugin
id="org.jboss.tools.common.verification.test"
download-size="0"
install-size="0"
version="0.0.0"/>
- <!-- <plugin
- id="org.jboss.tools.common.verification.test.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/> -->
-
<plugin
id="org.jboss.tools.common.verification.ui.test"
download-size="0"
install-size="0"
version="0.0.0"/>
- <!-- <plugin
- id="org.jboss.tools.common.verification.ui.test.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/> -->
-
</feature>
Modified: trunk/common/features/org.jboss.tools.common.all.tests.feature/pom.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.tests.feature/pom.xml 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/features/org.jboss.tools.common.all.tests.feature/pom.xml 2011-04-28 19:57:31 UTC (rev 30935)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.all.tests.feature</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
\ No newline at end of file
Modified: trunk/common/features/org.jboss.tools.common.core.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.core.feature/feature.xml 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/features/org.jboss.tools.common.core.feature/feature.xml 2011-04-28 19:57:31 UTC (rev 30935)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.common.core.feature"
label="%featureName"
- version="3.1.0.qualifier"
+ version="3.3.0.qualifier"
provider-name="%providerName">
<description url="http://www.jboss.org/tools">
Modified: trunk/common/features/org.jboss.tools.common.core.feature/pom.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.core.feature/pom.xml 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/features/org.jboss.tools.common.core.feature/pom.xml 2011-04-28 19:57:31 UTC (rev 30935)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.core.feature</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
\ No newline at end of file
Modified: trunk/common/features/org.jboss.tools.common.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.feature/feature.xml 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/features/org.jboss.tools.common.feature/feature.xml 2011-04-28 19:57:31 UTC (rev 30935)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.common.feature"
label="%featureName"
- version="3.1.0.qualifier"
+ version="3.3.0.qualifier"
provider-name="%providerName">
<description url="http://www.jboss.org/tools">
@@ -13,21 +13,21 @@
%copyright
</copyright>
- <license>Red Hat, Inc. licenses these features and plugins to you under
+ <license>
+ Red Hat, Inc. licenses these features and plugins to you under
certain open source licenses (or aggregations of such licenses), which
in a particular case may include the Eclipse Public License, the GNU
Lesser General Public License, and/or certain other open source
licenses. For precise licensing details, consult the corresponding
source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
Raleigh NC 27606 USA.
-</license>
+ </license>
+
<requires>
- <import feature="org.eclipse.wst.common_core.feature"
- version="0.0.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.wst.common_ui.feature"
- version="0.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.wst.common_core.feature" version="0.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.wst.common_ui.feature" version="0.0.0" match="greaterOrEqual"/>
</requires>
-
+
<plugin
id="org.jboss.tools.common.el.core"
download-size="0"
@@ -51,4 +51,5 @@
download-size="0"
install-size="0"
version="0.0.0"/>
+
</feature>
Modified: trunk/common/features/org.jboss.tools.common.feature/pom.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.feature/pom.xml 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/features/org.jboss.tools.common.feature/pom.xml 2011-04-28 19:57:31 UTC (rev 30935)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.feature</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
\ No newline at end of file
Modified: trunk/common/features/org.jboss.tools.common.text.ext.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.text.ext.feature/feature.xml 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/features/org.jboss.tools.common.text.ext.feature/feature.xml 2011-04-28 19:57:31 UTC (rev 30935)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.common.text.ext.feature"
label="%featureName"
- version="3.1.0.qualifier"
+ version="3.3.0.qualifier"
provider-name="%providerName">
<description url="http://www.jboss.org/tools">
@@ -13,22 +13,20 @@
%copyright
</copyright>
- <license>Red Hat, Inc. licenses these features and plugins to you under
+ <license>
+ Red Hat, Inc. licenses these features and plugins to you under
certain open source licenses (or aggregations of such licenses), which
in a particular case may include the Eclipse Public License, the GNU
Lesser General Public License, and/or certain other open source
licenses. For precise licensing details, consult the corresponding
source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
Raleigh NC 27606 USA.
-</license>
+ </license>
<requires>
- <import feature="org.jboss.tools.common.core.feature"
- version="0.0.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.wst.common_core.feature"
- version="0.0.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.wst.common_ui.feature"
- version="0.0.0" match="greaterOrEqual"/>
+ <import feature="org.jboss.tools.common.core.feature" version="0.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.wst.common_core.feature" version="0.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.wst.common_ui.feature" version="0.0.0" match="greaterOrEqual"/>
</requires>
<plugin
Modified: trunk/common/features/org.jboss.tools.common.text.ext.feature/pom.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.text.ext.feature/pom.xml 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/features/org.jboss.tools.common.text.ext.feature/pom.xml 2011-04-28 19:57:31 UTC (rev 30935)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.text.ext.feature</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
\ No newline at end of file
Modified: trunk/common/features/org.jboss.tools.common.ui.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.ui.feature/feature.xml 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/features/org.jboss.tools.common.ui.feature/feature.xml 2011-04-28 19:57:31 UTC (rev 30935)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.common.ui.feature"
label="%featureName"
- version="3.1.0.qualifier"
+ version="3.3.0.qualifier"
provider-name="%providerName">
<description url="http://www.jboss.org/tools">
Modified: trunk/common/features/org.jboss.tools.common.ui.feature/pom.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.ui.feature/pom.xml 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/features/org.jboss.tools.common.ui.feature/pom.xml 2011-04-28 19:57:31 UTC (rev 30935)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.ui.feature</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF 2011-04-28 19:57:31 UTC (rev 30935)
@@ -4,7 +4,7 @@
Bundle-Localization: plugin
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.common.el.ui;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.3.0.qualifier
Export-Package: org.jboss.tools.common.el.ui,
org.jboss.tools.common.el.ui.ca
Bundle-Activator: org.jboss.tools.common.el.ui.ElUiPlugin
Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/pom.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.ui/pom.xml 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/plugins/org.jboss.tools.common.el.ui/pom.xml 2011-04-28 19:57:31 UTC (rev 30935)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.el.ui</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF 2011-04-28 19:57:31 UTC (rev 30935)
@@ -83,6 +83,6 @@
org.eclipse.wst.common.emfworkbench.integration,
org.eclipse.core.resources;visibility:=reexport,
org.eclipse.core.runtime;visibility:=reexport
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: org.jboss.tools.common.model.jar
Modified: trunk/common/plugins/org.jboss.tools.common.model/pom.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/pom.xml 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/plugins/org.jboss.tools.common.model/pom.xml 2011-04-28 19:57:31 UTC (rev 30935)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.model</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF 2011-04-28 19:57:31 UTC (rev 30935)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.jboss.tools.common.model.ui.capabilities;singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.2.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/pom.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/pom.xml 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/pom.xml 2011-04-28 19:57:31 UTC (rev 30935)
@@ -9,6 +9,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.model.ui.capabilities</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/META-INF/MANIFEST.MF 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/META-INF/MANIFEST.MF 2011-04-28 19:57:31 UTC (rev 30935)
@@ -9,6 +9,6 @@
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
org.jboss.tools.common
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.3.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/pom.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/pom.xml 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/pom.xml 2011-04-28 19:57:31 UTC (rev 30935)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.projecttemplates</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.resref.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.resref.core/META-INF/MANIFEST.MF 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/plugins/org.jboss.tools.common.resref.core/META-INF/MANIFEST.MF 2011-04-28 19:57:31 UTC (rev 30935)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.common.resref.core
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.2.0.qualifier
Bundle-Activator: org.jboss.tools.common.resref.core.ResourceReferencePlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Modified: trunk/common/plugins/org.jboss.tools.common.resref.core/pom.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.resref.core/pom.xml 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/plugins/org.jboss.tools.common.resref.core/pom.xml 2011-04-28 19:57:31 UTC (rev 30935)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.resref.core</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/common/tests/org.jboss.tools.common.el.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/tests/org.jboss.tools.common.el.core.test/META-INF/MANIFEST.MF 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/tests/org.jboss.tools.common.el.core.test/META-INF/MANIFEST.MF 2011-04-28 19:57:31 UTC (rev 30935)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.common.el.core.test;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.3.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.common.el.core.test
Modified: trunk/common/tests/org.jboss.tools.common.el.core.test/pom.xml
===================================================================
--- trunk/common/tests/org.jboss.tools.common.el.core.test/pom.xml 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/tests/org.jboss.tools.common.el.core.test/pom.xml 2011-04-28 19:57:31 UTC (rev 30935)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.el.core.test</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
<emma.filter>org.jboss.tools.common.el.core*,org.jboss.tools.common.el.internal.core*</emma.filter>
Modified: trunk/common/tests/org.jboss.tools.common.model.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/tests/org.jboss.tools.common.model.test/META-INF/MANIFEST.MF 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/tests/org.jboss.tools.common.model.test/META-INF/MANIFEST.MF 2011-04-28 19:57:31 UTC (rev 30935)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.common.model.test;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.3.0.qualifier
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.common.model.test,
org.jboss.tools.common.model.util.test
Modified: trunk/common/tests/org.jboss.tools.common.model.test/pom.xml
===================================================================
--- trunk/common/tests/org.jboss.tools.common.model.test/pom.xml 2011-04-28 19:45:32 UTC (rev 30934)
+++ trunk/common/tests/org.jboss.tools.common.model.test/pom.xml 2011-04-28 19:57:31 UTC (rev 30935)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.jboss.tools.common</groupId>
<artifactId>org.jboss.tools.common.model.test</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
13 years, 8 months
JBoss Tools SVN: r30934 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2011-04-28 15:45:32 -0400 (Thu, 28 Apr 2011)
New Revision: 30934
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIElementWrapper.java
Log:
JBIDE-8799, JBIDE-8705
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIElementWrapper.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIElementWrapper.java 2011-04-28 19:43:05 UTC (rev 30933)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIElementWrapper.java 2011-04-28 19:45:32 UTC (rev 30934)
@@ -72,6 +72,6 @@
}
public String getPath(){
- return label;
+ return path;
}
}
13 years, 8 months
JBoss Tools SVN: r30933 - trunk/requirements/jbossas.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-04-28 15:43:05 -0400 (Thu, 28 Apr 2011)
New Revision: 30933
Modified:
trunk/requirements/jbossas/buildRequirement.xml
Log:
fix path to search for things to rename; echo variables to confirm
Modified: trunk/requirements/jbossas/buildRequirement.xml
===================================================================
--- trunk/requirements/jbossas/buildRequirement.xml 2011-04-28 19:25:56 UTC (rev 30932)
+++ trunk/requirements/jbossas/buildRequirement.xml 2011-04-28 19:43:05 UTC (rev 30933)
@@ -51,13 +51,21 @@
<param name="build.archive" value="${jboss60.build.archive}" />
<param name="md5" value="${jboss60.build.archive.md5}" />
</antcall>
+
+<!-- this is called via the requirements profile in ../../build/parent/pom.xml, which sets these properties:
+ <requirements.root>${basedir}/../../../requirements</requirements.root>
+ <requirement.build.root>${requirements.root}/target</requirement.build.root>
+-->
+ <echo>${ant.file}, ${basedir}, ${unzip.dest}, ${requirement.build.root}</echo>
+
<!-- rename target folder from 6.0.0.Final to 6.0.0 -->
+
<for param="dir">
<path>
- <fileset dir="../target/" includes="jboss-6.0.0*" />
+ <fileset dir="${requirement.build.root}/" includes="jboss-6.0.0*" />
</path>
<sequential>
- <rename src="@{dir}" dest="../target/jboss-6.0.0" />
+ <rename src="@{dir}" dest="${requirement.build.root}/jboss-6.0.0" />
</sequential>
</for>
@@ -69,10 +77,10 @@
<!-- rename target folder from 7.0.0.Beta3 to 7.0.0 -->
<for param="dir">
<path>
- <fileset dir="../target/" includes="jboss-7.0.0*" />
+ <fileset dir="${requirement.build.root}/" includes="jboss-7.0.0*" />
</path>
<sequential>
- <rename src="../target/jboss-7.0.0.Beta3" dest="../target/jboss-7.0.0" />
+ <rename src="${requirement.build.root}/jboss-7.0.0.Beta3" dest="${requirement.build.root}/jboss-7.0.0" />
</sequential>
</for>
</target>
13 years, 8 months
JBoss Tools SVN: r30932 - in trunk/cdi: tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2011-04-28 15:25:56 -0400 (Thu, 28 Apr 2011)
New Revision: 30932
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/CDISearchParticipantTest.java
Log:
JBIDE-8799, JBIDE-8705
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java 2011-04-28 19:15:54 UTC (rev 30931)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java 2011-04-28 19:25:56 UTC (rev 30932)
@@ -31,7 +31,6 @@
import org.eclipse.search.ui.text.Match;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.editors.text.TextFileDocumentProvider;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.IBean;
@@ -81,7 +80,11 @@
monitor.beginTask(CDIUIMessages.CDI_BEAN_QUERY_PARTICIPANT_TASK, beans.length);
for(IBean bean : beans){
+ if(monitor.isCanceled())
+ break;
+
monitor.worked(1);
+
Set<IInjectionPoint> injectionPoints = bean.getInjectionPoints();
for(IInjectionPoint injectionPoint : injectionPoints){
@@ -95,6 +98,7 @@
}
}
}
+ monitor.done();
}
}
}
@@ -115,19 +119,9 @@
@Override
public IMatchPresentation getUIParticipant() {
- //return null;
return new CDIBeanMatchPresentation();
}
- TextFileDocumentProvider provider=null;
-
- private TextFileDocumentProvider getDocumentProvider(){
- if(provider == null){
- provider = new TextFileDocumentProvider();
- }
- return provider;
- }
-
class CDIBeanMatchPresentation implements IMatchPresentation{
@Override
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/CDISearchParticipantTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/CDISearchParticipantTest.java 2011-04-28 19:15:54 UTC (rev 30931)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/CDISearchParticipantTest.java 2011-04-28 19:25:56 UTC (rev 30932)
@@ -19,7 +19,6 @@
import org.eclipse.jdt.ui.search.ISearchRequestor;
import org.eclipse.jdt.ui.search.QuerySpecification;
import org.eclipse.search.ui.text.Match;
-import org.eclipse.ui.IMarkerResolution;
import org.jboss.tools.cdi.core.ICDIElement;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
import org.jboss.tools.cdi.internal.core.impl.ClassBean;
@@ -92,12 +91,12 @@
for(Match match : matchesForCheck){
assertTrue("Match must be CDIMatch", match instanceof CDIMatch);
MatchStructure ms = findMatch(matchList, (CDIMatch)match);
- assertNotNull("Unexpected mutch found (class - "+((CDIMatch)match).getCDIElement().getClass()+" label - "+((CDIMatch)match).getLabel()+")", ms);
+ assertNotNull("Unexpected mutch found (class - "+((CDIMatch)match).getCDIElement().getClass()+" name - "+((CDIMatch)match).getLabel()+")", ms);
ms.checked = true;
}
for(MatchStructure ms : matchList){
- assertTrue("Match not found (class - "+ms.type+" label - "+ms.name, ms.checked);
+ assertTrue("Match not found (class - "+ms.type+" name - "+ms.name, ms.checked);
}
}
13 years, 8 months
JBoss Tools SVN: r30931 - in trunk/cdi: plugins/org.jboss.tools.cdi.xml and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2011-04-28 15:15:54 -0400 (Thu, 28 Apr 2011)
New Revision: 30931
Modified:
trunk/cdi/features/org.jboss.tools.cdi.feature/feature.xml
trunk/cdi/features/org.jboss.tools.cdi.feature/pom.xml
trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/META-INF/MANIFEST.MF
trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/pom.xml
trunk/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF
trunk/cdi/plugins/org.jboss.tools.cdi.xml/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-8815
Modified: trunk/cdi/features/org.jboss.tools.cdi.feature/feature.xml
===================================================================
--- trunk/cdi/features/org.jboss.tools.cdi.feature/feature.xml 2011-04-28 19:07:35 UTC (rev 30930)
+++ trunk/cdi/features/org.jboss.tools.cdi.feature/feature.xml 2011-04-28 19:15:54 UTC (rev 30931)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.cdi.feature"
label="%featureName"
- version="1.1.0.qualifier"
+ version="1.2.0.qualifier"
provider-name="%featureProvider">
<description>
Modified: trunk/cdi/features/org.jboss.tools.cdi.feature/pom.xml
===================================================================
--- trunk/cdi/features/org.jboss.tools.cdi.feature/pom.xml 2011-04-28 19:07:35 UTC (rev 30930)
+++ trunk/cdi/features/org.jboss.tools.cdi.feature/pom.xml 2011-04-28 19:15:54 UTC (rev 30931)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.cdi.features</groupId>
<artifactId>org.jboss.tools.cdi.feature</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF 2011-04-28 19:07:35 UTC (rev 30930)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/META-INF/MANIFEST.MF 2011-04-28 19:15:54 UTC (rev 30931)
@@ -26,5 +26,5 @@
org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.wst.web
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/pom.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml/pom.xml 2011-04-28 19:07:35 UTC (rev 30930)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/pom.xml 2011-04-28 19:15:54 UTC (rev 30931)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.cdi.plugins</groupId>
<artifactId>org.jboss.tools.cdi.xml</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/META-INF/MANIFEST.MF 2011-04-28 19:07:35 UTC (rev 30930)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/META-INF/MANIFEST.MF 2011-04-28 19:15:54 UTC (rev 30931)
@@ -32,5 +32,5 @@
org.jboss.tools.jst.web.ui,
org.jboss.tools.cdi.xml,
org.jboss.tools.cdi.ui
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/pom.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/pom.xml 2011-04-28 19:07:35 UTC (rev 30930)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/pom.xml 2011-04-28 19:15:54 UTC (rev 30931)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.cdi.plugins</groupId>
<artifactId>org.jboss.tools.cdi.xml.ui</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
13 years, 8 months