October 2012 - jbosstools-commits

JBoss Tools SVN: r44500 - branches/jbosstools-4.0.0.Beta1/build/parent.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-10-12 23:12:25 -0400 (Fri, 12 Oct 2012) New Revision: 44500 Modified: branches/jbosstools-4.0.0.Beta1/build/parent/pom.xml Log: switch to stable_branch Modified: branches/jbosstools-4.0.0.Beta1/build/parent/pom.xml =================================================================== --- branches/jbosstools-4.0.0.Beta1/build/parent/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) +++ branches/jbosstools-4.0.0.Beta1/build/parent/pom.xml 2012-10-13 03:12:25 UTC (rev 44500) @@ -49,21 +49,21 @@  <jbosstools-target-site>http://download.jboss.org/jbosstools/updates/juno/SR0c/latest/</jbosstools-target-site> -  +   <local.site>file:///${user.home}/.m2/jbosstools-target-platform_4.0.juno.SR0c/</local.site>   - <jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk/</jbosstools-nightly-staging-composite> + <jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/core/4.0....</jbosstools-nightly-staging-composite>  - <jbosstools-nightly-staging-composite-soa-tooling>http://download.jboss.org/jbosstools/builds/staging/_composite_/soa-tooli...</jbosstools-nightly-staging-composite-soa-tooling> + <jbosstools-nightly-staging-composite-soa-tooling>http://download.jboss.org/jbosstools/builds/staging/_composite_/soa-tooli...</jbosstools-nightly-staging-composite-soa-tooling>   - <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/core/trunk/</local.composite> - <local.composite-soa-tooling>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/soa-tooling/trunk/</local.composite-soa-tooling> + <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/core/4.0.juno/</local.composite> + <local.composite-soa-tooling>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/soa-tooling/4.0.juno/</local.composite-soa-tooling>   @@ -72,11 +72,11 @@  - <jbosstools-nightly>http://download.jboss.org/jbosstools/updates/nightly/core/trunk/</jbosstools-nightly> - <jbosstools-nightly-tests>http://download.jboss.org/jbosstools/updates/nightly/coretests/trunk/</jbosstools-nightly-tests> + <jbosstools-nightly>http://download.jboss.org/jbosstools/updates/nightly/core/4.0.juno/</jbosstools-nightly> + <jbosstools-nightly-tests>http://download.jboss.org/jbosstools/updates/nightly/coretests/4.0.juno/</jbosstools-nightly-tests>  - <jbosstools-nightly-soa-tooling>http://download.jboss.org/jbosstools/updates/nightly/soa-tooling/trunk/</jbosstools-nightly-soa-tooling> - <jbosstools-nightly-soa-tooling-tests>http://download.jboss.org/jbosstools/updates/nightly/soatests/trunk/</jbosstools-nightly-soa-tooling-tests> + <jbosstools-nightly-soa-tooling>http://download.jboss.org/jbosstools/updates/nightly/soa-tooling/4.0.juno/</jbosstools-nightly-soa-tooling> + <jbosstools-nightly-soa-tooling-tests>http://download.jboss.org/jbosstools/updates/nightly/soatests/4.0.juno/</jbosstools-nightly-soa-tooling-tests>  <jboss-requirements-composite-extras-mirror>http://download.jboss.org/jbosstools/updates/juno/extras/SR0c/</jboss-requirements-composite-extras-mirror> @@ -616,7 +616,7 @@ <!-- To use this profile, must have first created a local.target file, which points to a local repo. You can do this by hand or generate it from - multiple.target using: cd ~/trunk/build/target-platform; ant See also the + multiple.target using: cd ~/4.0.juno/build/target-platform; ant See also the README in target-platform/ folder for additional usage examples. You can also run `ant help`. If you want to build the target-platform/pom.xml AND generate a local repo + local.target file ALL AT THE SAME TIME, you can do:

11 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r44499 - in trunk: as and 29 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-10-12 23:11:14 -0400 (Fri, 12 Oct 2012) New Revision: 44499 Modified: trunk/archives/pom.xml trunk/as/pom.xml trunk/birt/pom.xml trunk/build/aggregate/pom.xml trunk/build/parent/pom.xml trunk/build/pom.xml trunk/cdi/pom.xml trunk/central/pom.xml trunk/common/pom.xml trunk/esb/pom.xml trunk/examples/pom.xml trunk/forge/pom.xml trunk/freemarker/pom.xml trunk/gwt/pom.xml trunk/hibernatetools/pom.xml trunk/jbpm/pom.xml trunk/jmx/pom.xml trunk/jsf/pom.xml trunk/jst/pom.xml trunk/maven/pom.xml trunk/openshift/pom.xml trunk/portlet/pom.xml trunk/runtime-soa/pom.xml trunk/runtime/pom.xml trunk/seam/pom.xml trunk/struts/pom.xml trunk/tests/pom.xml trunk/usage/pom.xml trunk/vpe/pom.xml trunk/ws/pom.xml trunk/xulrunner/pom.xml Log: Use new 4.0.0.Beta2-SNAPSHOT version of parent pom in trunk Modified: trunk/archives/pom.xml =================================================================== --- trunk/archives/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/archives/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/as/pom.xml =================================================================== --- trunk/as/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/as/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/birt/pom.xml =================================================================== --- trunk/birt/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/birt/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/build/aggregate/pom.xml =================================================================== --- trunk/build/aggregate/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/build/aggregate/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/build/parent/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <name>JBoss Tools Parent</name> <packaging>pom</packaging> @@ -15,7 +15,7 @@ <scmBranch>trunk</scmBranch> <JBT_VERSION>4.0.0</JBT_VERSION> <JBDS_VERSION>6.0.0</JBDS_VERSION> - <BUILD_ALIAS>Beta1</BUILD_ALIAS> + <BUILD_ALIAS>Beta2</BUILD_ALIAS> <targetEclipseVersion>4.2</targetEclipseVersion> <memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1> <memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2> Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/build/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/cdi/pom.xml =================================================================== --- trunk/cdi/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/cdi/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/central/pom.xml =================================================================== --- trunk/central/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/central/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/common/pom.xml =================================================================== --- trunk/common/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/common/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/esb/pom.xml =================================================================== --- trunk/esb/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/esb/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/examples/pom.xml =================================================================== --- trunk/examples/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/examples/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/forge/pom.xml =================================================================== --- trunk/forge/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/forge/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/freemarker/pom.xml =================================================================== --- trunk/freemarker/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/freemarker/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/gwt/pom.xml =================================================================== --- trunk/gwt/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/gwt/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/hibernatetools/pom.xml =================================================================== --- trunk/hibernatetools/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/hibernatetools/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/jbpm/pom.xml =================================================================== --- trunk/jbpm/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/jbpm/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/jmx/pom.xml =================================================================== --- trunk/jmx/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/jmx/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/jsf/pom.xml =================================================================== --- trunk/jsf/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/jsf/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/jst/pom.xml =================================================================== --- trunk/jst/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/jst/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -7,7 +7,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <packaging>pom</packaging> Modified: trunk/maven/pom.xml =================================================================== --- trunk/maven/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/maven/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/openshift/pom.xml =================================================================== --- trunk/openshift/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/openshift/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/portlet/pom.xml =================================================================== --- trunk/portlet/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/portlet/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/runtime/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/runtime-soa/pom.xml =================================================================== --- trunk/runtime-soa/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/runtime-soa/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/seam/pom.xml =================================================================== --- trunk/seam/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/seam/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/struts/pom.xml =================================================================== --- trunk/struts/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/struts/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/tests/pom.xml =================================================================== --- trunk/tests/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/tests/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/usage/pom.xml =================================================================== --- trunk/usage/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/usage/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/vpe/pom.xml =================================================================== --- trunk/vpe/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/vpe/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/ws/pom.xml =================================================================== --- trunk/ws/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/ws/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> Modified: trunk/xulrunner/pom.xml =================================================================== --- trunk/xulrunner/pom.xml 2012-10-13 03:08:03 UTC (rev 44498) +++ trunk/xulrunner/pom.xml 2012-10-13 03:11:14 UTC (rev 44499) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>parent</artifactId> - <version>4.0.0.Beta1-SNAPSHOT</version> + <version>4.0.0.Beta2-SNAPSHOT</version> <relativePath>../build/parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId>

11 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r44498 - branches.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-10-12 23:08:03 -0400 (Fri, 12 Oct 2012) New Revision: 44498 Added: branches/jbosstools-4.0.0.Beta1/ Log: branch for Beta1

11 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r44497 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: resources/tck/tests/lookup/pack/annotation and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2012-10-12 18:59:36 -0400 (Fri, 12 Oct 2012) New Revision: 44497 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/annotation/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/annotation/A.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/annotation/E.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/package-info.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/PackageInfoTest.java Log: JBIDE-12841 https://issues.jboss.org/browse/JBIDE-12841 Test is modified. Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/annotation/A.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/annotation/A.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/annotation/A.java 2012-10-12 22:59:36 UTC (rev 44497) @@ -0,0 +1,5 @@ +package org.jboss.jsr299.tck.tests.lookup.pack.annotation; + +public @interface A { + E value(); +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/annotation/A.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/annotation/E.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/annotation/E.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/annotation/E.java 2012-10-12 22:59:36 UTC (rev 44497) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.lookup.pack.annotation; + +public enum E { + ONE, + TWO +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/annotation/E.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/package-info.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/package-info.java 2012-10-12 22:51:15 UTC (rev 44496) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/package-info.java 2012-10-12 22:59:36 UTC (rev 44497) @@ -1,4 +1,4 @@ -(a)Target(ElementType.FIELD) +(a)A(E.ONE) package org.jboss.jsr299.tck.tests.lookup.pack; -import java.lang.annotation.Target; -import java.lang.annotation.ElementType; +import org.jboss.jsr299.tck.tests.lookup.pack.annotation.A; +import org.jboss.jsr299.tck.tests.lookup.pack.annotation.E; Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/PackageInfoTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/PackageInfoTest.java 2012-10-12 22:51:15 UTC (rev 44496) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/PackageInfoTest.java 2012-10-12 22:59:36 UTC (rev 44497) @@ -23,15 +23,16 @@ public class PackageInfoTest extends TCKTest { /** - -s * @throws CoreException + * + * @throws CoreException */ public void testDeclaration() throws CoreException { PackageDefinition d = cdiProject.getNature().getDefinitions().getPackageDefinition("org.jboss.jsr299.tck.tests.lookup.pack"); assertNotNull(d); - AnnotationDeclaration a = d.getAnnotation("java.lang.annotation.Target"); + AnnotationDeclaration a = d.getAnnotation("org.jboss.jsr299.tck.tests.lookup.pack.annotation.A"); + assertNotNull(a); Object o = a.getMemberValue("value"); - assertEquals("java.lang.annotation.ElementType.FIELD", o); + assertEquals("org.jboss.jsr299.tck.tests.lookup.pack.annotation.E.ONE", o); } } \ No newline at end of file

11 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r44496 - in trunk/archives: tests and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-10-12 18:51:15 -0400 (Fri, 12 Oct 2012) New Revision: 44496 Modified: trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/feature.xml trunk/archives/tests/pom.xml Log: https://issues.jboss.org/browse/JBIDE-12846 comment out until this test plugin compiles OK - org.jboss.ide.eclipse.archives.test Modified: trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/feature.xml =================================================================== --- trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/feature.xml 2012-10-12 21:23:49 UTC (rev 44495) +++ trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/feature.xml 2012-10-12 22:51:15 UTC (rev 44496) @@ -19,7 +19,7 @@ Raleigh NC 27606 USA. </license> - <plugin id="org.jboss.ide.eclipse.archives.test" download-size="0" install-size="0" version="0.0.0" /> +  <plugin id="org.jboss.ide.eclipse.archives.ui.test" download-size="0" install-size="0" version="0.0.0" /> <plugin id="org.jboss.tools.archives.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> </feature> Modified: trunk/archives/tests/pom.xml =================================================================== --- trunk/archives/tests/pom.xml 2012-10-12 21:23:49 UTC (rev 44495) +++ trunk/archives/tests/pom.xml 2012-10-12 22:51:15 UTC (rev 44496) @@ -11,7 +11,7 @@ <name>archives.tests</name> <packaging>pom</packaging> <modules> - <module>org.jboss.ide.eclipse.archives.test</module> +  <module>org.jboss.ide.eclipse.archives.ui.test</module> <module>org.jboss.tools.archives.ui.bot.test</module> </modules>

11 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r44495 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal: ui/viewer and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2012-10-12 17:23:49 -0400 (Fri, 12 Oct 2012) New Revision: 44495 Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/NewConnectionAwareConnectionComparer.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/NewConnectionMarker.java Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/Connection.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionsModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/ConnectionColumLabelProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPageModel.java Log: [JBIDE-12798] implemented connection dialog that allows to select existing connections or create new ones Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/Connection.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/Connection.java 2012-10-12 18:10:47 UTC (rev 44494) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/Connection.java 2012-10-12 21:23:49 UTC (rev 44495) @@ -97,22 +97,21 @@ if (!StringUtils.isEmpty(username)) { return username; } - username = OpenShiftPreferences.INSTANCE.getLastUsername(); - if (StringUtils.isEmpty(username)) { - username = getDefaultUsername(); - } - return username; + return getDefaultUsername(); } private String getDefaultUsername() { - try { - return getOpenShiftConfiguration().getRhlogin(); - } catch (Exception e) { - Logger.error("Could not load default user name from OpenShift configuration.", e); + String username = OpenShiftPreferences.INSTANCE.getLastUsername(); + if (StringUtils.isEmpty(username)) { + try { + username = getOpenShiftConfiguration().getRhlogin(); + } catch (Exception e) { + Logger.error("Could not load default user name from OpenShift configuration.", e); + } } - return null; + return username; } - + private void setUser(IUser user) { if (user == null) { return; Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionsModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionsModel.java 2012-10-12 18:10:47 UTC (rev 44494) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionsModel.java 2012-10-12 21:23:49 UTC (rev 44495) @@ -74,6 +74,18 @@ } } + public boolean hasConnection(Connection connection) { + try { + String url = connection.toURLString(); + return getConnectionByUrl(url) != null; + } catch (UnsupportedEncodingException e) { + OpenShiftUIActivator.log( + NLS.bind("Could not get url for connection {0} - {1}", connection.getUsername(), + connection.getHost()), e); + return false; + } + } + public void fireConnectionChanged(Connection connection) { fireModelChange(connection, CHANGED); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/ConnectionColumLabelProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/ConnectionColumLabelProvider.java 2012-10-12 18:10:47 UTC (rev 44494) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/ConnectionColumLabelProvider.java 2012-10-12 21:23:49 UTC (rev 44495) @@ -18,8 +18,14 @@ */ public class ConnectionColumLabelProvider extends ColumnLabelProvider { + private static final String LABEL_NEW_CONNECTION = "<New Connection>"; + @Override public String getText(Object element) { + if (element instanceof NewConnectionMarker) { + return LABEL_NEW_CONNECTION; + } + if (!(element instanceof Connection)) { return super.getText(element); } Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/NewConnectionAwareConnectionComparer.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/NewConnectionAwareConnectionComparer.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/NewConnectionAwareConnectionComparer.java 2012-10-12 21:23:49 UTC (rev 44495) @@ -0,0 +1,55 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat Inc.. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat Incorporated - initial API and implementation + *******************************************************************************/ +package org.jboss.tools.openshift.express.internal.ui.viewer; + +import org.eclipse.jface.viewers.IElementComparer; +import org.jboss.tools.openshift.express.internal.core.connection.Connection; + +/** + * @author Andre Dietisheim + */ +public class NewConnectionAwareConnectionComparer implements IElementComparer { + + @Override + public int hashCode(Object element) { + return 0; + } + + @Override + public boolean equals(Object thisObject, Object thatObject) { + if (thisObject == null) { + if (thatObject == null) { + return true; + } else if (thatObject instanceof NewConnectionMarker) { + return true; + } else { + return false; + } + } else if (thisObject instanceof NewConnectionMarker) { + if (thatObject == null + || thatObject instanceof NewConnectionMarker) { + return true; + } else { + return false; + } + } else { + if (thatObject == null) { + return false; + } else if (thatObject instanceof NewConnectionMarker) { + return true; + } + Connection thisConnection = (Connection) thisObject; + Connection thatConnection = (Connection) thatObject; + return thisConnection.getUsername().equals(thatConnection.getUsername()) + && thisConnection.getHost().equals(thatConnection.getHost()); + } + } +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/NewConnectionAwareConnectionComparer.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/NewConnectionMarker.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/NewConnectionMarker.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/NewConnectionMarker.java 2012-10-12 21:23:49 UTC (rev 44495) @@ -0,0 +1,27 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat Inc.. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat Incorporated - initial API and implementation + *******************************************************************************/ +package org.jboss.tools.openshift.express.internal.ui.viewer; + +import org.jboss.tools.openshift.express.internal.core.connection.Connection; + +/** + * A class that is used to have an entry <New Connection> in a combo view with + * connections. + * + * @author Andre Dietisheim + * + */ +public class NewConnectionMarker extends Connection { + + public NewConnectionMarker() { + super(); + } +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/NewConnectionMarker.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPage.java 2012-10-12 18:10:47 UTC (rev 44494) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPage.java 2012-10-12 21:23:49 UTC (rev 44495) @@ -16,6 +16,9 @@ import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.beans.BeanProperties; import org.eclipse.core.databinding.observable.value.IObservableValue; +import org.eclipse.core.databinding.observable.value.IValueChangeListener; +import org.eclipse.core.databinding.observable.value.ValueChangeEvent; +import org.eclipse.core.databinding.validation.IValidator; import org.eclipse.core.databinding.validation.MultiValidator; import org.eclipse.core.databinding.validation.ValidationStatus; import org.eclipse.core.runtime.IProgressMonitor; @@ -24,20 +27,20 @@ import org.eclipse.jface.databinding.fieldassist.ControlDecorationSupport; import org.eclipse.jface.databinding.swt.WidgetProperties; import org.eclipse.jface.databinding.viewers.ViewerProperties; -import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.PageChangingEvent; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.ComboViewer; import org.eclipse.jface.wizard.IWizard; -import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.StackLayout; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Link; import org.eclipse.swt.widgets.Text; @@ -59,6 +62,9 @@ import org.jboss.tools.openshift.express.internal.ui.utils.Logger; import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils; import org.jboss.tools.openshift.express.internal.ui.utils.UIUpdatingJob; +import org.jboss.tools.openshift.express.internal.ui.viewer.ConnectionColumLabelProvider; +import org.jboss.tools.openshift.express.internal.ui.viewer.NewConnectionAwareConnectionComparer; +import org.jboss.tools.openshift.express.internal.ui.viewer.NewConnectionMarker; import org.jboss.tools.openshift.express.internal.ui.wizard.AbstractOpenShiftWizardPage; import org.jboss.tools.openshift.express.internal.ui.wizard.IConnectionAwareModel; @@ -94,8 +100,133 @@ GridDataFactory.fillDefaults() .span(2, 1).hint(SWT.DEFAULT, 6).applyTo(fillerLabel); + Label connectionLabel = new Label(container, SWT.NONE); + connectionLabel.setText("Connection:"); + GridDataFactory.fillDefaults() + .align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(connectionLabel); + Combo connectionCombo = new Combo(container, SWT.DEFAULT); + GridDataFactory.fillDefaults() + .align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(connectionCombo); + final ComboViewer connectionComboViewer = new ComboViewer(connectionCombo); + connectionComboViewer.setContentProvider(ArrayContentProvider.getInstance()); + connectionComboViewer.setLabelProvider(new ConnectionColumLabelProvider()); + connectionComboViewer.setInput(pageModel.getConnections()); + connectionComboViewer.setComparer(new NewConnectionAwareConnectionComparer()); + + Binding selectedConnectionBinding = ValueBindingBuilder + .bind(ViewerProperties.singleSelection().observe(connectionComboViewer)) + .validatingAfterGet(new IValidator() { + + @Override + public IStatus validate(Object value) { + if (value == null) { + return ValidationStatus.cancel("You have to select or create a new connection."); + } + return ValidationStatus.ok(); + } + }) + .to(BeanProperties.value( + ConnectionWizardPageModel.PROPERTY_SELECTED_CONNECTION, Connection.class).observe( + pageModel)) + .in(dbc); + ControlDecorationSupport + .create(selectedConnectionBinding, SWT.LEFT | SWT.TOP, null, new RequiredControlDecorationUpdater()); + + // stack with connection widgets / password widget + Composite connectionWidgetsContainer = new Composite(container, SWT.NONE); + GridDataFactory.fillDefaults() + .span(2, 1).applyTo(connectionWidgetsContainer); + StackLayout stackLayout = new StackLayout(); + connectionWidgetsContainer.setLayout(stackLayout); + Composite connectionWidgets = createConnectionWidgets(connectionWidgetsContainer, dbc); + Composite passwordWidgets = createPasswordWidgets(connectionWidgetsContainer, dbc); + + showConnectionWidgets(pageModel.isCreateNewConnection(), passwordWidgets, connectionWidgets, stackLayout, + connectionWidgetsContainer); + + BeanProperties + .value(ConnectionWizardPageModel.PROPERTY_SELECTED_CONNECTION) + .observe(pageModel) + .addValueChangeListener( + onNewConnectionSelected(passwordWidgets, connectionWidgets, stackLayout, + connectionWidgetsContainer)); + } + + private IValueChangeListener onNewConnectionSelected(final Composite passwordWidget, + final Composite connectionWidgets, final StackLayout stackLayout, final Composite container) { + return new IValueChangeListener() { + + @Override + public void handleValueChange(ValueChangeEvent event) { + Connection selectedConnection = pageModel.getSelectedConnection(); + boolean isNewConnection = selectedConnection instanceof NewConnectionMarker; + showConnectionWidgets(isNewConnection, passwordWidget, connectionWidgets, stackLayout, container); + } + }; + } + + private void showConnectionWidgets(boolean isNewConnection, Composite passwordWidgets, + Composite connectionsWidgets, + StackLayout stackLayout, Composite container) { + Control topControl = null; + if (isNewConnection) { + topControl = connectionsWidgets; + } else { + topControl = passwordWidgets; + } + stackLayout.topControl = topControl; + container.layout(); + } + + private Composite createPasswordWidgets(Composite container, DataBindingContext dbc) { + Composite passwordWidgets = new Composite(container, SWT.NONE); + GridLayoutFactory.fillDefaults() + .numColumns(2).applyTo(passwordWidgets); + + // password + Label passwordLabel = new Label(passwordWidgets, SWT.NONE); + passwordLabel.setText("&Password:"); + GridDataFactory.fillDefaults() + .align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(passwordLabel); + passwordText = new Text(passwordWidgets, SWT.BORDER | SWT.PASSWORD); + GridDataFactory.fillDefaults() + .align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(passwordText); + Binding passwordBinding = ValueBindingBuilder + .bind(WidgetProperties.text(SWT.Modify).observe(passwordText)) + .validatingAfterGet(new RequiredStringValidator("password")) + .to(BeanProperties.value(ConnectionWizardPageModel.PROPERTY_PASSWORD).observe(pageModel)) + .in(dbc); + ControlDecorationSupport + .create(passwordBinding, SWT.LEFT | SWT.TOP, null, new RequiredControlDecorationUpdater()); + + // remember password + Button rememberPasswordCheckBox = new Button(passwordWidgets, SWT.CHECK); + rememberPasswordCheckBox.setText(OpenshiftUIMessages.OpenshiftWizardSavePassword); + GridDataFactory.fillDefaults() + .align(SWT.FILL, SWT.CENTER).span(2, 1).grab(true, false).applyTo(rememberPasswordCheckBox); + ValueBindingBuilder + .bind(WidgetProperties.selection().observe(rememberPasswordCheckBox)) + .to(BeanProperties.value(ConnectionWizardPageModel.PROPERTY_REMEMBER_PASSWORD).observe(pageModel)) + .in(dbc); + + // credentials status + IObservableValue credentialsStatusObservable = + BeanProperties.value(ConnectionWizardPageModel.PROPERTY_VALID, IStatus.class).observe(pageModel); + final CredentialsValidator credentialsValidator = + new CredentialsValidator(credentialsStatusObservable); + dbc.addValidationStatusProvider(credentialsValidator); + ControlDecorationSupport.create(credentialsValidator, SWT.LEFT | SWT.TOP); + + return passwordWidgets; + } + + private Composite createConnectionWidgets(Composite container, DataBindingContext dbc) { + Composite connectionWidgets = new Composite(container, SWT.NONE); + GridLayoutFactory.fillDefaults() + .numColumns(2).applyTo(connectionWidgets); + // use default server - Button defaultServerCheckbox = new Button(container, SWT.CHECK); + Button defaultServerCheckbox = new Button(connectionWidgets, SWT.CHECK); defaultServerCheckbox.setText("Use default server"); GridDataFactory.fillDefaults() .align(SWT.FILL, SWT.CENTER).span(2, 1).applyTo(defaultServerCheckbox); @@ -105,11 +236,11 @@ .in(dbc); // server - Label serverLabel = new Label(container, SWT.NONE); + Label serverLabel = new Label(connectionWidgets, SWT.NONE); serverLabel.setText("&Server:"); GridDataFactory.fillDefaults() - .align(SWT.LEFT, SWT.CENTER).applyTo(serverLabel); - Combo serversCombo = new Combo(container, SWT.BORDER); + .align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(serverLabel); + Combo serversCombo = new Combo(connectionWidgets, SWT.BORDER); Binding serverBinding = ValueBindingBuilder .bind(WidgetProperties.text().observe(serversCombo)) .validatingAfterGet(new HostNameValidator()) @@ -135,11 +266,11 @@ .in(dbc); // username - Label rhLoginLabel = new Label(container, SWT.NONE); + Label rhLoginLabel = new Label(connectionWidgets, SWT.NONE); rhLoginLabel.setText("&Username:"); GridDataFactory.fillDefaults() .align(SWT.LEFT, SWT.CENTER).applyTo(rhLoginLabel); - rhLoginText = new Text(container, SWT.BORDER); + rhLoginText = new Text(connectionWidgets, SWT.BORDER); GridDataFactory.fillDefaults() .align(SWT.FILL, SWT.CENTER).grab(true, false).span(1, 1).applyTo(rhLoginText); Binding usernameBinding = ValueBindingBuilder @@ -152,11 +283,11 @@ .create(usernameBinding, SWT.LEFT | SWT.TOP, null, new RequiredControlDecorationUpdater()); // password - Label passwordLabel = new Label(container, SWT.NONE); + Label passwordLabel = new Label(connectionWidgets, SWT.NONE); passwordLabel.setText("&Password:"); GridDataFactory.fillDefaults() .align(SWT.LEFT, SWT.CENTER).applyTo(passwordLabel); - passwordText = new Text(container, SWT.BORDER | SWT.PASSWORD); + passwordText = new Text(connectionWidgets, SWT.BORDER | SWT.PASSWORD); GridDataFactory.fillDefaults() .align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(passwordText); Binding passwordBinding = ValueBindingBuilder @@ -167,7 +298,7 @@ ControlDecorationSupport .create(passwordBinding, SWT.LEFT | SWT.TOP, null, new RequiredControlDecorationUpdater()); - Button rememberPasswordCheckBox = new Button(container, SWT.CHECK); + Button rememberPasswordCheckBox = new Button(connectionWidgets, SWT.CHECK); rememberPasswordCheckBox.setText(OpenshiftUIMessages.OpenshiftWizardSavePassword); GridDataFactory.fillDefaults() .align(SWT.FILL, SWT.CENTER).span(2, 1).grab(true, false).applyTo(rememberPasswordCheckBox); @@ -183,6 +314,7 @@ dbc.addValidationStatusProvider(credentialsValidator); ControlDecorationSupport.create(credentialsValidator, SWT.LEFT | SWT.TOP); + return connectionWidgets; } protected SelectionAdapter onSignupLinkClicked() { @@ -253,6 +385,15 @@ } } + public Connection getConnection() { + return pageModel.getConnection(); + } + + @Override + protected void setupWizardPageSupport(DataBindingContext dbc) { + ParametrizableWizardPageSupport.create(IStatus.ERROR | IStatus.CANCEL, this, dbc); + } + private class ServerLabelProvider extends AbstractLabelProvider { @Override public String getText(Object element) { @@ -263,11 +404,6 @@ } } - @Override - protected void setupWizardPageSupport(DataBindingContext dbc) { - ParametrizableWizardPageSupport.create(IStatus.ERROR | IStatus.CANCEL, this, dbc); - } - private class ConnectJob extends UIUpdatingJob { private IStatus connectionStatus; @@ -288,24 +424,9 @@ if (!JobUtils.isOk(connectionStatus)) { return Status.OK_STATUS; } - boolean newConnection = false; - if (pageModel.shouldCreateNewConnection()) { - Connection connection = pageModel.getConnection(); - if (MessageDialog.openQuestion(getShell(), - "Create new connection?", - NLS.bind("You changed your connection to {0} on server {1}.\n" + - "Do you want to create a new connection?", - connection.getUsername(), connection.getHost()))) { - newConnection = true; - } - } - pageModel.createOrUpdateConnection(newConnection); + pageModel.createOrUpdateConnection(); + return Status.OK_STATUS; } } - - public Connection getConnection(){ - return pageModel.getConnection(); - } - } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPageModel.java 2012-10-12 18:10:47 UTC (rev 44494) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPageModel.java 2012-10-12 21:23:49 UTC (rev 44495) @@ -22,6 +22,8 @@ import org.jboss.tools.openshift.express.internal.core.connection.Connection; import org.jboss.tools.openshift.express.internal.core.connection.ConnectionsModel; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.utils.CollectionUtils; +import org.jboss.tools.openshift.express.internal.ui.viewer.NewConnectionMarker; import org.jboss.tools.openshift.express.internal.ui.wizard.IConnectionAwareModel; import com.openshift.client.IUser; @@ -36,25 +38,45 @@ */ public class ConnectionWizardPageModel extends ObservableUIPojo { + public static final String PROPERTY_SELECTED_CONNECTION = "selectedConnection"; public static final String PROPERTY_USERNAME = "username"; public static final String PROPERTY_PASSWORD = "password"; public static final String PROPERTY_SERVER = "server"; public static final String PROPERTY_REMEMBER_PASSWORD = "rememberPassword"; public static final String PROPERTY_USE_DEFAULTSERVER = "useDefaultServer"; public static final String PROPERTY_VALID = "valid"; - + public static final String PROPERTY_DUPLICATE_CONNECTION = "duplicateConnection"; + public static final String PROPERTY_CREATE_CONNECTION = "createConnection"; + + final private IConnectionAwareModel wizardModel; + private Connection selectedConnection; final private List<String> servers; private boolean isDefaultServer = true; - private IConnectionAwareModel wizardModel; - private Connection connection; + private Connection editedConnection; private IStatus valid; - + private boolean isCreateNewConnection; + public ConnectionWizardPageModel(IConnectionAwareModel wizardModel) { this.wizardModel = wizardModel; - this.connection = createConnection(wizardModel.getConnection()); - this.servers = getServers(connection); + Connection wizardModelConnection = wizardModel.getConnection(); + this.selectedConnection = getSelectedConnection(wizardModelConnection); + this.isCreateNewConnection = getIsCreateNewConnection(selectedConnection); + this.editedConnection = createConnection(wizardModelConnection); + this.servers = getServers(editedConnection); } + private boolean getIsCreateNewConnection(Connection connection) { + return connection instanceof NewConnectionMarker; + } + + private Connection getSelectedConnection(Connection wizardModelConnection) { + if (wizardModelConnection == null) { + return new NewConnectionMarker(); + } else { + return wizardModelConnection; + } + } + /** * Returns a new Connection for a given connection. The new connection gets * created with the username and password from the preferences (and secure @@ -70,15 +92,45 @@ * @see IUser */ private Connection createConnection(Connection connection) { - Connection newUser = null; - if (connection != null) { - newUser = new Connection(connection); + Connection newConnection = null; + if (connection instanceof NewConnectionMarker + || connection == null) { + newConnection = new Connection(); } else { - newUser = new Connection(); + newConnection = new Connection(connection); } - return newUser; + return newConnection; } + public void setSelectedConnection(Connection connection) { + if ((this.selectedConnection instanceof NewConnectionMarker + && connection instanceof NewConnectionMarker) + || Diffs.equals(selectedConnection, connection)) { + return; + } + this.isCreateNewConnection = getIsCreateNewConnection(connection); + setEditedConnection(createConnection(connection)); + firePropertyChange(PROPERTY_SELECTED_CONNECTION, this.selectedConnection, this.selectedConnection = connection); + } + + private void setEditedConnection(Connection connection) { + Connection oldValue = editedConnection; + this.editedConnection = connection; + firePropertyChange(PROPERTY_SERVER, oldValue.getHost(), this.editedConnection.getHost()); + firePropertyChange(PROPERTY_USERNAME, oldValue.getUsername(), this.editedConnection.getUsername()); + firePropertyChange(PROPERTY_PASSWORD, oldValue.getPassword(), this.editedConnection.getPassword()); + } + + public Connection getSelectedConnection() { + return selectedConnection; + } + + public List<Connection> getConnections() { + List<Connection> connections = CollectionUtils.toList(ConnectionsModel.getDefault().getConnections()); + connections.add(new NewConnectionMarker()); + return connections; + } + public boolean isUseDefaultServer() { return isDefaultServer; } @@ -88,17 +140,17 @@ firePropertyChange(PROPERTY_USE_DEFAULTSERVER, this.isDefaultServer, this.isDefaultServer = isDefaultServer); if (isDefaultServer) { - setServer(connection.getHost()); + setServer(editedConnection.getHost()); } resetValid(); } } - private List<String> getServers(Connection user) { + private List<String> getServers(Connection connection) { List<String> servers = new ArrayList<String>(); HashSet<String> uniqueServers = new HashSet<String>(); uniqueServers.add(getDefaultServer()); - servers.add(user.getHost()); + servers.add(connection.getHost()); return servers; } @@ -110,40 +162,44 @@ return null; } } - + public String getUsername() { - return connection.getUsername(); + return editedConnection.getUsername(); } public void setUsername(String username) { - if (!Diffs.equals(connection.getUsername(), username)) { - firePropertyChange(PROPERTY_USERNAME, connection.getUsername(), connection.setUsername(username)); + if (!Diffs.equals(editedConnection.getUsername(), username)) { + firePropertyChange(PROPERTY_USERNAME, editedConnection.getUsername(), + editedConnection.setUsername(username)); resetValid(); + fireDuplicateConnectionUpdated(); } } public String getPassword() { - return connection.getPassword(); + return editedConnection.getPassword(); } public void setPassword(String password) { - if (!Diffs.equals(password, connection.getPassword())) { - firePropertyChange(PROPERTY_PASSWORD, connection.getPassword(), connection.setPassword(password)); + if (!Diffs.equals(password, editedConnection.getPassword())) { + firePropertyChange(PROPERTY_PASSWORD, editedConnection.getPassword(), + editedConnection.setPassword(password)); resetValid(); } } public String getServer() { - return connection.getHost(); + return editedConnection.getHost(); } public void setServer(String server) { if (server == null) { // workaround return; } - if (!Diffs.equals(connection.getHost(), server)) { - firePropertyChange(PROPERTY_SERVER, connection.getHost(), connection.setHost(server)); + if (!Diffs.equals(editedConnection.getHost(), server)) { + firePropertyChange(PROPERTY_SERVER, editedConnection.getHost(), editedConnection.setHost(server)); resetValid(); + fireDuplicateConnectionUpdated(); } } @@ -152,12 +208,12 @@ } public boolean isRememberPassword() { - return connection.isRememberPassword(); + return editedConnection.isRememberPassword(); } public void setRememberPassword(boolean rememberPassword) { firePropertyChange(PROPERTY_REMEMBER_PASSWORD, - connection.isRememberPassword(), connection.setRememberPassword(rememberPassword)); + editedConnection.isRememberPassword(), editedConnection.setRememberPassword(rememberPassword)); } private void resetValid() { @@ -175,15 +231,15 @@ public IStatus connect() { IStatus status = Status.OK_STATUS; try { - if (!connection.isConnected()) { + if (!editedConnection.isConnected()) { try { - connection.connect(); + editedConnection.connect(); } catch (OpenShiftTimeoutException e) { status = OpenShiftUIActivator.createErrorStatus(NLS.bind( - "Could not reach server at {0}. Connection timeouted.", connection.getHost())); + "Could not reach server at {0}. Connection timeouted.", editedConnection.getHost())); } catch (OpenShiftException e) { status = OpenShiftUIActivator.createErrorStatus(NLS.bind( - "The credentials for user {0} are not valid", connection.getUsername())); + "The credentials for user {0} are not valid", editedConnection.getUsername())); } } } catch (NotFoundOpenShiftException e) { @@ -196,24 +252,23 @@ return status; } - /** - * Returns <code>true</code> if the connection that this wizards edits was - * changed in a way that would suggest creating a new connection (instead of - * updating it). The current implementation would suggests to create a new - * connection as soon as the username or the server was changed. - * - * @return true if you should create a new connection - */ - public boolean shouldCreateNewConnection() { - Connection wizardModelConnection = wizardModel.getConnection(); - return wizardModelConnection != null - && ( - // username changed - !wizardModelConnection.getUsername().equals(connection.getUsername()) - // server changed - || !wizardModelConnection.getHost().equals(connection.getHost())); + public boolean isDuplicateConnection() { + return editedConnection == null + || ConnectionsModel.getDefault().hasConnection(editedConnection); } + private void fireDuplicateConnectionUpdated() { + firePropertyChange(PROPERTY_DUPLICATE_CONNECTION, null, isDuplicateConnection()); + } + + public Connection getConnection() { + return editedConnection; + } + + public boolean isCreateNewConnection() { + return isCreateNewConnection; + } + /** * Updates the connection that this wizard operates on or creates a new one. * Will create a new connection if the wizard had no connection to operate @@ -224,21 +279,18 @@ * if true, creates a new connection if the wizard had a * connection to edit. Updates the existing one otherwise. */ - public void createOrUpdateConnection(boolean create) { + public void createOrUpdateConnection() { Connection wizardModelConnection = wizardModel.getConnection(); if (wizardModelConnection == null - || create) { - wizardModel.setConnection(connection); - ConnectionsModel.getDefault().addConnection(connection); -// connection.save(); + || isCreateNewConnection()) { + wizardModel.setConnection(editedConnection); + ConnectionsModel.getDefault().addConnection(editedConnection); + // editedConnection.save(); } else { - wizardModelConnection.update(connection); + wizardModelConnection.update(editedConnection); ConnectionsModel.getDefault().fireConnectionChanged(wizardModelConnection); -// wizardModelConnection.save(); + // wizardModelConnection.save(); } } - public Connection getConnection() { - return connection; - } }

11 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r44494 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2012-10-12 14:10:47 -0400 (Fri, 12 Oct 2012) New Revision: 44494 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddAttributeMarkerResolution.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java Log: "Add missing required attribute(s)" quick fix for "Missing required attribute" WTP problem marker https://issues.jboss.org/browse/JBIDE-12390 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddAttributeMarkerResolution.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddAttributeMarkerResolution.java 2012-10-12 17:57:59 UTC (rev 44493) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddAttributeMarkerResolution.java 2012-10-12 18:10:47 UTC (rev 44494) @@ -14,12 +14,14 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.contentassist.IContextInformation; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; +import org.eclipse.ui.IMarkerResolution2; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.ui.texteditor.DocumentProviderRegistry; import org.eclipse.ui.texteditor.IDocumentProvider; @@ -37,7 +39,7 @@ * @author Daniel Azarov * */ -public class AddAttributeMarkerResolution implements IQuickFix{ +public class AddAttributeMarkerResolution implements IMarkerResolution2, IJavaCompletionProposal{ private IFile file; private int start, end; @@ -97,9 +99,11 @@ String text = "<"+node.getNodeName()+" "; NamedNodeMap attributes = node.getAttributes(); - for(int i = 0; i < attributes.getLength(); i++){ - Node att = attributes.item(i); - text += att.getNodeName()+"=\""+att.getNodeValue()+"\" "; + if(attributes != null){ + for(int i = 0; i < attributes.getLength(); i++){ + Node att = attributes.item(i); + text += att.getNodeName()+"=\""+att.getNodeValue()+"\" "; + } } text += attributeName+"=\"\">"; Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java 2012-10-12 17:57:59 UTC (rev 44493) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java 2012-10-12 18:10:47 UTC (rev 44494) @@ -377,7 +377,7 @@ public boolean hasResolutions(IMarker marker) { try{ String message = (String)marker.getAttribute(IMarker.MESSAGE); - return message.startsWith(UNKNOWN_TAG); + return message.startsWith(UNKNOWN_TAG) || message.startsWith(MISSING_ATTRIBUTE); }catch(CoreException ex){ WebUiPlugin.getPluginLog().logError(ex); } @@ -387,7 +387,7 @@ @Override public boolean hasProposals(Annotation annotation, Position position) { String message = annotation.getText(); - return message.startsWith(UNKNOWN_TAG); + return message.startsWith(UNKNOWN_TAG) || message.startsWith(MISSING_ATTRIBUTE); } @Override

11 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r44493 - trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/java/impl.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2012-10-12 13:57:59 -0400 (Fri, 12 Oct 2012) New Revision: 44493 Modified: trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java Log: JBIDE-12841 https://issues.jboss.org/browse/JBIDE-12841 VAnnotation value in package-info.java is resolved. Modified: trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java 2012-10-12 17:56:23 UTC (rev 44492) +++ trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java 2012-10-12 17:57:59 UTC (rev 44493) @@ -15,6 +15,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.core.Flags; import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jdt.core.ICompilationUnit; @@ -23,7 +24,9 @@ import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.IMemberValuePair; +import org.eclipse.jdt.core.IPackageDeclaration; import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaModelException; import org.jboss.tools.common.core.CommonCorePlugin; import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.java.IAnnotationType; @@ -130,8 +133,24 @@ } } else { ICompilationUnit u = (ICompilationUnit)a.getAncestor(IJavaElement.COMPILATION_UNIT); + ICompilationUnit u2 = null; IType type = (IType)a.getAncestor(IJavaElement.TYPE); - try { + if(type == null) { + if(u != null && a.getParent() instanceof IPackageDeclaration) { + try { + IType[] ts = u.getTypes(); + if(ts != null && ts.length > 0) { + type = ts[0]; + } else { + u2 = u.getWorkingCopy(new NullProgressMonitor()); + type = u2.createType("class A {}", null, false, new NullProgressMonitor()); + } + } catch (CoreException e) { + CommonCorePlugin.getDefault().logError(e); + } + } + } + if(type != null) try { IImportDeclaration[] is = u.getImports(); String stringValue = value.toString(); int lastDot = stringValue.lastIndexOf('.'); @@ -160,6 +179,13 @@ } catch (CoreException e) { CommonCorePlugin.getDefault().logError(e); } + if (u2 != null) { + try { + u2.discardWorkingCopy(); + } catch (JavaModelException e) { + + } + } } return value;

11 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r44492 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: resources/tck/tests/lookup/pack and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2012-10-12 13:56:23 -0400 (Fri, 12 Oct 2012) New Revision: 44492 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/package-info.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/PackageInfoTest.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java Log: JBIDE-12841 https://issues.jboss.org/browse/JBIDE-12841 Test is added. Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/package-info.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/package-info.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/package-info.java 2012-10-12 17:56:23 UTC (rev 44492) @@ -0,0 +1,4 @@ +(a)Target(ElementType.FIELD) +package org.jboss.jsr299.tck.tests.lookup.pack; +import java.lang.annotation.Target; +import java.lang.annotation.ElementType; Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/pack/package-info.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2012-10-12 16:29:50 UTC (rev 44491) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2012-10-12 17:56:23 UTC (rev 44492) @@ -52,6 +52,7 @@ import org.jboss.tools.cdi.core.test.tck.lookup.AmbiguousDependencyTest; import org.jboss.tools.cdi.core.test.tck.lookup.CircularDependencyTest; import org.jboss.tools.cdi.core.test.tck.lookup.DynamicLookupTest; +import org.jboss.tools.cdi.core.test.tck.lookup.PackageInfoTest; import org.jboss.tools.cdi.core.test.tck.lookup.ResolutionByNameTest; import org.jboss.tools.cdi.core.test.tck.lookup.ResolutionByTypeTest; import org.jboss.tools.cdi.core.test.tck.lookup.UnsatisfiedDependencyTest; @@ -96,6 +97,7 @@ // TCK project tests suite.addTestSuite(ELReferenceTest.class); suite.addTestSuite(ResolutionByNameTest.class); + suite.addTestSuite(PackageInfoTest.class); suite.addTestSuite(BeanDefinitionTest.class); suite.addTestSuite(NameDefinitionTest.class); suite.addTestSuite(QualifierDefinitionTest.class); Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/PackageInfoTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/PackageInfoTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/PackageInfoTest.java 2012-10-12 17:56:23 UTC (rev 44492) @@ -0,0 +1,37 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.cdi.core.test.tck.lookup; + +import org.eclipse.core.runtime.CoreException; +import org.jboss.tools.cdi.core.test.tck.TCKTest; +import org.jboss.tools.cdi.internal.core.impl.definition.PackageDefinition; +import org.jboss.tools.common.java.impl.AnnotationDeclaration; + + +/** + * @author Viacheslav Kabanovich + */ +public class PackageInfoTest extends TCKTest { + + /** + +s * @throws CoreException + */ + public void testDeclaration() throws CoreException { + PackageDefinition d = cdiProject.getNature().getDefinitions().getPackageDefinition("org.jboss.jsr299.tck.tests.lookup.pack"); + assertNotNull(d); + AnnotationDeclaration a = d.getAnnotation("java.lang.annotation.Target"); + Object o = a.getMemberValue("value"); + assertEquals("java.lang.annotation.ElementType.FIELD", o); + } + +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/PackageInfoTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain

11 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r44491 - trunk/build/parent.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-10-12 12:29:50 -0400 (Fri, 12 Oct 2012) New Revision: 44491 Modified: trunk/build/parent/pom.xml Log: use newer m2e repo with apt 1.0.1 (JBDS-2290) Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2012-10-12 15:43:10 UTC (rev 44490) +++ trunk/build/parent/pom.xml 2012-10-12 16:29:50 UTC (rev 44491) @@ -81,8 +81,8 @@  <jboss-requirements-composite-extras-mirror>http://download.jboss.org/jbosstools/updates/juno/extras/SR0c/</jboss-requirements-composite-extras-mirror> -  - <m2e>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/20120...</m2e> +  + <m2e>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/20120...</m2e> </properties>

11 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits October 2012