October 2012 - jbosstools-commits

JBoss Tools SVN: r44490 - in trunk/hibernatetools/plugins: org.hibernate.eclipse.libs/META-INF and 10 other directories.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2012-10-12 11:43:10 -0400 (Fri, 12 Oct 2012) New Revision: 44490 Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/lib/tools/hibernate-tools-3.4.0.CR2.jar trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/lib/required/hibernate3.jar trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/lib/tools/hibernate-tools-3.6.0.CR1.jar trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/jpa/hibernate-entitymanager-4.0.0.Final.jar trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/required/hibernate-commons-annotations-4.0.1.Final.jar trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/required/hibernate-core-4.0.0.Final.jar trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/required/jboss-logging-3.1.0.CR2.jar trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/tools/hibernate-tools-4.0.0-CR1.jar Removed: trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/lib/tools/hibernate-tools.jar trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/lib/required/hibernate3.jar trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/lib/tools/hibernate-tools-3.6.0.jar trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/jpa/hibernate-entitymanager-4.0.0.CR6.jar trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/required/hibernate-commons-annotations-4.0.0.Final.jar trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/required/hibernate-core-4.0.0.CR6.jar trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/required/jboss-logging-3.1.0.CR1.jar trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/tools/hibernate-tools-4.0.0.jar Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/.classpath trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/build.properties trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/.classpath trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/build.properties trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/.classpath trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/build.properties Log: JBIDE-12842: Update the Hibernate Tools runtime jars Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/.classpath =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/.classpath 2012-10-12 15:38:54 UTC (rev 44489) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/.classpath 2012-10-12 15:43:10 UTC (rev 44490) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry exported="true" kind="lib" path="lib/tools/hibernate-tools-3.4.0.CR2.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> @@ -20,7 +21,6 @@ <classpathentry exported="true" kind="lib" path="lib/hibernate/oscache-2.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/hibernate/proxool-0.8.3.jar"/> <classpathentry exported="true" kind="lib" path="lib/hibernate/swarmcache-1.0rc2.jar"/> - <classpathentry exported="true" kind="lib" path="lib/tools/hibernate-tools.jar" sourcepath="C:/dev/workspaces/RedHat/_Git/hibernate-tools.core/hibernate-tools"/> <classpathentry exported="true" kind="lib" path="lib/tools/freemarker.jar"/> <classpathentry exported="true" kind="lib" path="lib/bsh-core-2.0b4.jar"/> <classpathentry exported="true" kind="lib" path="lib/hibernate/jgroups-2.2.8.jar"/> Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/META-INF/MANIFEST.MF 2012-10-12 15:38:54 UTC (rev 44489) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/META-INF/MANIFEST.MF 2012-10-12 15:43:10 UTC (rev 44490) @@ -21,7 +21,6 @@ lib/hibernate/oscache-2.1.jar, lib/hibernate/proxool-0.8.3.jar, lib/hibernate/swarmcache-1.0rc2.jar, - lib/tools/hibernate-tools.jar, lib/tools/freemarker.jar, lib/bsh-core-2.0b4.jar, lib/hibernate/jgroups-2.2.8.jar, @@ -37,7 +36,8 @@ lib/hibernate/commons-collections-3.1.jar, lib/hibernate/slf4j-api-1.5.8.jar, lib/hibernate/slf4j-log4j12-1.5.8.jar, - lib/hibernate/commons-collections-3.1.jar + lib/hibernate/commons-collections-3.1.jar, + lib/tools/hibernate-tools-3.4.0.CR2.jar Bundle-Activator: org.hibernate.eclipse.libs.HibernateLibsPlugin Require-Bundle: org.eclipse.core.runtime Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/build.properties =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/build.properties 2012-10-12 15:38:54 UTC (rev 44489) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/build.properties 2012-10-12 15:43:10 UTC (rev 44490) @@ -2,4 +2,5 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ - lib/ + lib/,\ + lib/tools/hibernate-tools-3.4.0.CR2.jar Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/lib/tools/hibernate-tools-3.4.0.CR2.jar =================================================================== (Binary files differ) Property changes on: trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/lib/tools/hibernate-tools-3.4.0.CR2.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/hibernatetools/plugins/org.hibernate.eclipse.libs/lib/tools/hibernate-tools.jar =================================================================== (Binary files differ) Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/.classpath =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/.classpath 2012-10-12 15:38:54 UTC (rev 44489) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/.classpath 2012-10-12 15:43:10 UTC (rev 44490) @@ -1,23 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry exported="true" kind="lib" path="lib/required/slf4j-log4j12-1.6.1.jar"/> - <classpathentry exported="true" kind="lib" path="lib/required/cglib-2.2.jar"/> - <classpathentry exported="true" kind="lib" path="lib/required/commons-logging-1.0.4.jar"/> - <classpathentry exported="true" kind="lib" path="lib/tools/freemarker.jar"/> - <classpathentry exported="true" kind="lib" path="lib/tools/hibernate-tools-3.6.0.jar"/> - <classpathentry exported="true" kind="lib" path="lib/tools/jtidy-r8-20060801.jar"/> - <classpathentry exported="true" kind="lib" path="lib/bsh-core-2.0b4.jar"/> - <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.15.jar"/> - <classpathentry exported="true" kind="lib" path="lib/jpa/hibernate-jpa-2.0-api-1.0.1.Final.jar"/> - <classpathentry exported="true" kind="lib" path="lib/required/antlr-2.7.6.jar"/> - <classpathentry exported="true" kind="lib" path="lib/required/commons-collections-3.1.jar"/> - <classpathentry exported="true" kind="lib" path="lib/required/dom4j-1.6.1.jar"/> - <classpathentry exported="true" kind="lib" path="lib/required/hibernate3.jar"/> - <classpathentry exported="true" kind="lib" path="lib/required/javassist-3.12.0.GA.jar"/> - <classpathentry exported="true" kind="lib" path="lib/required/jta-1.1.jar"/> - <classpathentry exported="true" kind="lib" path="lib/required/slf4j-api-1.6.1.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry exported="true" kind="lib" path="lib/required/hibernate3.jar"/> + <classpathentry exported="true" kind="lib" path="lib/tools/hibernate-tools-3.6.0.CR1.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/slf4j-log4j12-1.6.1.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/cglib-2.2.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/commons-logging-1.0.4.jar"/> + <classpathentry exported="true" kind="lib" path="lib/tools/freemarker.jar"/> + <classpathentry exported="true" kind="lib" path="lib/tools/jtidy-r8-20060801.jar"/> + <classpathentry exported="true" kind="lib" path="lib/bsh-core-2.0b4.jar"/> + <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.15.jar"/> + <classpathentry exported="true" kind="lib" path="lib/jpa/hibernate-jpa-2.0-api-1.0.1.Final.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/antlr-2.7.6.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/commons-collections-3.1.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/dom4j-1.6.1.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/javassist-3.12.0.GA.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/jta-1.1.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/slf4j-api-1.6.1.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/META-INF/MANIFEST.MF 2012-10-12 15:38:54 UTC (rev 44489) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/META-INF/MANIFEST.MF 2012-10-12 15:43:10 UTC (rev 44490) @@ -22,16 +22,16 @@ lib/required/commons-collections-3.1.jar, lib/required/commons-logging-1.0.4.jar, lib/required/dom4j-1.6.1.jar, - lib/required/hibernate3.jar, lib/required/javassist-3.12.0.GA.jar, lib/required/jta-1.1.jar, lib/required/slf4j-api-1.6.1.jar, lib/required/slf4j-log4j12-1.6.1.jar, lib/jpa/hibernate-jpa-2.0-api-1.0.1.Final.jar, + lib/tools/hibernate-tools-3.6.0.CR1.jar, lib/tools/freemarker.jar, - lib/tools/hibernate-tools-3.6.0.jar, lib/tools/jtidy-r8-20060801.jar, lib/bsh-core-2.0b4.jar, lib/log4j-1.2.15.jar, - . + ., + lib/required/hibernate3.jar Bundle-Vendor: JBoss by Red Hat Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/build.properties =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/build.properties 2012-10-12 15:38:54 UTC (rev 44489) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/build.properties 2012-10-12 15:43:10 UTC (rev 44490) @@ -8,16 +8,16 @@ lib/required/antlr-2.7.6.jar,\ lib/required/commons-collections-3.1.jar,\ lib/required/dom4j-1.6.1.jar,\ - lib/required/hibernate3.jar,\ lib/required/javassist-3.12.0.GA.jar,\ lib/required/jta-1.1.jar,\ lib/required/slf4j-api-1.6.1.jar,\ lib/jpa/hibernate-jpa-2.0-api-1.0.1.Final.jar,\ lib/tools/freemarker.jar,\ - lib/tools/hibernate-tools-3.6.0.jar,\ lib/tools/jtidy-r8-20060801.jar,\ lib/bsh-core-2.0b4.jar,\ lib/log4j-1.2.15.jar,\ lib/required/commons-logging-1.0.4.jar,\ lib/required/cglib-2.2.jar,\ - lib/required/slf4j-log4j12-1.6.1.jar + lib/required/slf4j-log4j12-1.6.1.jar,\ + lib/tools/hibernate-tools-3.6.0.CR1.jar,\ + lib/required/hibernate3.jar Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/lib/required/hibernate3.jar =================================================================== (Binary files differ) Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/lib/required/hibernate3.jar =================================================================== (Binary files differ) Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/lib/required/hibernate3.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/lib/tools/hibernate-tools-3.6.0.CR1.jar =================================================================== (Binary files differ) Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/lib/tools/hibernate-tools-3.6.0.CR1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/lib/tools/hibernate-tools-3.6.0.jar =================================================================== (Binary files differ) Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/.classpath =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/.classpath 2012-10-12 15:38:54 UTC (rev 44489) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/.classpath 2012-10-12 15:43:10 UTC (rev 44490) @@ -1,26 +1,26 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry exported="true" kind="lib" path="lib/required/slf4j-api-1.5.8.jar"/> - <classpathentry exported="true" kind="lib" path="lib/jpa/hibernate-entitymanager-4.0.0.CR6.jar" sourcepath="C:/Documents and Settings/dgeraskov/.m2/repository/org/hibernate/hibernate-entitymanager/4.0.0.CR6/hibernate-entitymanager-4.0.0.CR6-sources.jar"/> - <classpathentry exported="true" kind="lib" path="lib/required/antlr-2.7.7.jar"/> - <classpathentry exported="true" kind="lib" path="lib/required/classmate-0.5.4.jar"/> - <classpathentry exported="true" kind="lib" path="lib/required/commons-collections-3.2.1.jar"/> - <classpathentry exported="true" kind="lib" path="lib/required/dom4j-1.6.1.jar"/> - <classpathentry exported="true" kind="lib" path="lib/required/hibernate-commons-annotations-4.0.0.Final.jar"/> - <classpathentry exported="true" kind="lib" path="lib/required/hibernate-core-4.0.0.CR6.jar" sourcepath="C:/dev/Libs/hibernate-release-4.0.0.CR6/project"/> - <classpathentry exported="true" kind="lib" path="lib/required/hibernate-jpa-2.0-api-1.0.1.Final.jar"/> - <classpathentry exported="true" kind="lib" path="lib/required/jandex-1.0.3.Final.jar"/> - <classpathentry exported="true" kind="lib" path="lib/required/javassist-3.12.1.GA.jar"/> - <classpathentry exported="true" kind="lib" path="lib/required/jboss-logging-3.1.0.CR1.jar"/> - <classpathentry exported="true" kind="lib" path="lib/required/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/> - <classpathentry exported="true" kind="lib" path="lib/tools/freemarker.jar"/> - <classpathentry exported="true" kind="lib" path="lib/tools/hibernate-tools-4.0.0.jar" sourcepath="C:/dev/workspaces/RedHat/_Git/dgeraskov/tools4.0/hibernate-tools/src"/> - <classpathentry exported="true" kind="lib" path="lib/tools/jtidy-r8-20060801.jar"/> - <classpathentry exported="true" kind="lib" path="lib/bsh-core-2.0b4.jar"/> - <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.15.jar"/> - <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.5.8.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry exported="true" kind="lib" path="lib/tools/hibernate-tools-4.0.0-CR1.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/hibernate-commons-annotations-4.0.1.Final.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/hibernate-core-4.0.0.Final.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/jboss-logging-3.1.0.CR2.jar"/> + <classpathentry exported="true" kind="lib" path="lib/jpa/hibernate-entitymanager-4.0.0.Final.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/slf4j-api-1.5.8.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/antlr-2.7.7.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/classmate-0.5.4.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/commons-collections-3.2.1.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/dom4j-1.6.1.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/hibernate-jpa-2.0-api-1.0.1.Final.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/jandex-1.0.3.Final.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/javassist-3.12.1.GA.jar"/> + <classpathentry exported="true" kind="lib" path="lib/required/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/> + <classpathentry exported="true" kind="lib" path="lib/tools/freemarker.jar"/> + <classpathentry exported="true" kind="lib" path="lib/tools/jtidy-r8-20060801.jar"/> + <classpathentry exported="true" kind="lib" path="lib/bsh-core-2.0b4.jar"/> + <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.15.jar"/> + <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.5.8.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF 2012-10-12 15:38:54 UTC (rev 44489) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF 2012-10-12 15:43:10 UTC (rev 44490) @@ -17,24 +17,24 @@ org.eclipse.ui.views;bundle-version="3.6.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Bundle-ClassPath: lib/jpa/hibernate-entitymanager-4.0.0.CR6.jar, - lib/required/antlr-2.7.7.jar, +Bundle-ClassPath: lib/required/antlr-2.7.7.jar, lib/required/classmate-0.5.4.jar, lib/required/commons-collections-3.2.1.jar, lib/required/dom4j-1.6.1.jar, - lib/required/hibernate-commons-annotations-4.0.0.Final.jar, - lib/required/hibernate-core-4.0.0.CR6.jar, lib/required/hibernate-jpa-2.0-api-1.0.1.Final.jar, lib/required/jandex-1.0.3.Final.jar, lib/required/javassist-3.12.1.GA.jar, - lib/required/jboss-logging-3.1.0.CR1.jar, lib/required/jboss-transaction-api_1.1_spec-1.0.0.Final.jar, lib/tools/freemarker.jar, - lib/tools/hibernate-tools-4.0.0.jar, lib/tools/jtidy-r8-20060801.jar, lib/bsh-core-2.0b4.jar, lib/required/slf4j-api-1.5.8.jar, lib/log4j-1.2.15.jar, lib/slf4j-log4j12-1.5.8.jar, - . + ., + lib/jpa/hibernate-entitymanager-4.0.0.Final.jar, + lib/required/hibernate-commons-annotations-4.0.1.Final.jar, + lib/required/hibernate-core-4.0.0.Final.jar, + lib/required/jboss-logging-3.1.0.CR2.jar, + lib/tools/hibernate-tools-4.0.0-CR1.jar Bundle-Vendor: JBoss by Red Hat Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/build.properties =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/build.properties 2012-10-12 15:38:54 UTC (rev 44489) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/build.properties 2012-10-12 15:43:10 UTC (rev 44490) @@ -4,4 +4,9 @@ .,\ plugin.xml,\ plugin.properties,\ - lib/ + lib/,\ + lib/jpa/hibernate-entitymanager-4.0.0.Final.jar,\ + lib/required/hibernate-commons-annotations-4.0.1.Final.jar,\ + lib/required/hibernate-core-4.0.0.Final.jar,\ + lib/required/jboss-logging-3.1.0.CR2.jar,\ + lib/tools/hibernate-tools-4.0.0-CR1.jar Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/jpa/hibernate-entitymanager-4.0.0.CR6.jar =================================================================== (Binary files differ) Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/jpa/hibernate-entitymanager-4.0.0.Final.jar =================================================================== (Binary files differ) Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/jpa/hibernate-entitymanager-4.0.0.Final.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/required/hibernate-commons-annotations-4.0.0.Final.jar =================================================================== (Binary files differ) Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/required/hibernate-commons-annotations-4.0.1.Final.jar =================================================================== (Binary files differ) Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/required/hibernate-commons-annotations-4.0.1.Final.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/required/hibernate-core-4.0.0.CR6.jar =================================================================== (Binary files differ) Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/required/hibernate-core-4.0.0.Final.jar =================================================================== (Binary files differ) Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/required/hibernate-core-4.0.0.Final.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/required/jboss-logging-3.1.0.CR1.jar =================================================================== (Binary files differ) Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/required/jboss-logging-3.1.0.CR2.jar =================================================================== (Binary files differ) Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/required/jboss-logging-3.1.0.CR2.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/tools/hibernate-tools-4.0.0-CR1.jar =================================================================== (Binary files differ) Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/tools/hibernate-tools-4.0.0-CR1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/lib/tools/hibernate-tools-4.0.0.jar =================================================================== (Binary files differ)

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r44489 - in trunk/download.jboss.org/jbosstools/examples: 4.0.0.Beta1 and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2012-10-12 11:38:54 -0400 (Fri, 12 Oct 2012) New Revision: 44489 Added: trunk/download.jboss.org/jbosstools/examples/4.0.0.Beta1/ trunk/download.jboss.org/jbosstools/examples/4.0.0.Beta1/readme.txt Log: JBIDE-12554 create empty dir. to store jdf quickstart zip on download.jboss.org Added: trunk/download.jboss.org/jbosstools/examples/4.0.0.Beta1/readme.txt =================================================================== --- trunk/download.jboss.org/jbosstools/examples/4.0.0.Beta1/readme.txt (rev 0) +++ trunk/download.jboss.org/jbosstools/examples/4.0.0.Beta1/readme.txt 2012-10-12 15:38:54 UTC (rev 44489) @@ -0,0 +1 @@ +Keep empty dir so the jenkins jbosstools-jdf-quickstarts-download.jboss.org-rsync-from-git-clone job doesn't puke \ No newline at end of file

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r44488 - in trunk/build/target-platforms: jbdevstudio-JunoSR0c and 19 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-10-12 11:24:48 -0400 (Fri, 12 Oct 2012) New Revision: 44488 Added: trunk/build/target-platforms/jbdevstudio-JunoSR0c/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR1a/pom.xml trunk/build/target-platforms/jbosstools-JunoSR0c/pom.xml trunk/build/target-platforms/jbosstools-JunoSR1a/pom.xml Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0c/jenkins/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR0c/local/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR0c/multiple/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR0c/unified/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR1a/jenkins/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR1a/local/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR1a/multiple/pom.xml trunk/build/target-platforms/jbdevstudio-JunoSR1a/unified/pom.xml trunk/build/target-platforms/jbosstools-JunoSR0c/jenkins/pom.xml trunk/build/target-platforms/jbosstools-JunoSR0c/local/pom.xml trunk/build/target-platforms/jbosstools-JunoSR0c/multiple/pom.xml trunk/build/target-platforms/jbosstools-JunoSR0c/unified/pom.xml trunk/build/target-platforms/jbosstools-JunoSR1a/jenkins/pom.xml trunk/build/target-platforms/jbosstools-JunoSR1a/local/pom.xml trunk/build/target-platforms/jbosstools-JunoSR1a/multiple/pom.xml trunk/build/target-platforms/jbosstools-JunoSR1a/unified/pom.xml trunk/build/target-platforms/pom.xml Log: set up intermediary poms so that root relativePath works automatically Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0c/jenkins/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR0c/jenkins/pom.xml 2012-10-12 15:21:36 UTC (rev 44487) +++ trunk/build/target-platforms/jbdevstudio-JunoSR0c/jenkins/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>target-platforms</artifactId> + <groupId>org.jboss.tools.target-platforms.jbdevstudio-JunoSR0c</groupId> + <artifactId>all</artifactId> <version>4.0.0.Beta1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.target-platforms.jbdevstudio-JunoSR0c</groupId> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0c/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR0c/local/pom.xml 2012-10-12 15:21:36 UTC (rev 44487) +++ trunk/build/target-platforms/jbdevstudio-JunoSR0c/local/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>target-platforms</artifactId> + <groupId>org.jboss.tools.target-platforms.jbdevstudio-JunoSR0c</groupId> + <artifactId>all</artifactId> <version>4.0.0.Beta1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.target-platforms.jbdevstudio-JunoSR0c</groupId> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0c/multiple/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR0c/multiple/pom.xml 2012-10-12 15:21:36 UTC (rev 44487) +++ trunk/build/target-platforms/jbdevstudio-JunoSR0c/multiple/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>target-platforms</artifactId> + <groupId>org.jboss.tools.target-platforms.jbdevstudio-JunoSR0c</groupId> + <artifactId>all</artifactId> <version>4.0.0.Beta1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.target-platforms.jbdevstudio-JunoSR0c</groupId> Added: trunk/build/target-platforms/jbdevstudio-JunoSR0c/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR0c/pom.xml (rev 0) +++ trunk/build/target-platforms/jbdevstudio-JunoSR0c/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools</groupId> + <artifactId>target-platforms</artifactId> + <version>4.0.0.Beta1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.target-platforms.jbdevstudio-JunoSR0c</groupId> + <artifactId>all</artifactId> + <packaging>pom</packaging> + <modules> + <module>multiple</module> + <module>local</module> + <module>unified</module> + <module>jenkins</module> + </modules> +</project> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0c/unified/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR0c/unified/pom.xml 2012-10-12 15:21:36 UTC (rev 44487) +++ trunk/build/target-platforms/jbdevstudio-JunoSR0c/unified/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>target-platforms</artifactId> + <groupId>org.jboss.tools.target-platforms.jbdevstudio-JunoSR0c</groupId> + <artifactId>all</artifactId> <version>4.0.0.Beta1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.target-platforms.jbdevstudio-JunoSR0c</groupId> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR1a/jenkins/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR1a/jenkins/pom.xml 2012-10-12 15:21:36 UTC (rev 44487) +++ trunk/build/target-platforms/jbdevstudio-JunoSR1a/jenkins/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>target-platforms</artifactId> + <groupId>org.jboss.tools.target-platforms.jbdevstudio-JunoSR1a</groupId> + <artifactId>all</artifactId> <version>4.0.0.Beta1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.target-platforms.jbdevstudio-JunoSR1a</groupId> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR1a/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR1a/local/pom.xml 2012-10-12 15:21:36 UTC (rev 44487) +++ trunk/build/target-platforms/jbdevstudio-JunoSR1a/local/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>target-platforms</artifactId> + <groupId>org.jboss.tools.target-platforms.jbdevstudio-JunoSR1a</groupId> + <artifactId>all</artifactId> <version>4.0.0.Beta1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.target-platforms.jbdevstudio-JunoSR1a</groupId> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR1a/multiple/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR1a/multiple/pom.xml 2012-10-12 15:21:36 UTC (rev 44487) +++ trunk/build/target-platforms/jbdevstudio-JunoSR1a/multiple/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>target-platforms</artifactId> + <groupId>org.jboss.tools.target-platforms.jbdevstudio-JunoSR1a</groupId> + <artifactId>all</artifactId> <version>4.0.0.Beta1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.target-platforms.jbdevstudio-JunoSR1a</groupId> Added: trunk/build/target-platforms/jbdevstudio-JunoSR1a/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR1a/pom.xml (rev 0) +++ trunk/build/target-platforms/jbdevstudio-JunoSR1a/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools</groupId> + <artifactId>target-platforms</artifactId> + <version>4.0.0.Beta1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.target-platforms.jbdevstudio-JunoSR1a</groupId> + <artifactId>all</artifactId> + <packaging>pom</packaging> + <modules> + <module>multiple</module> + <module>local</module> + <module>unified</module> + <module>jenkins</module> + </modules> +</project> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR1a/unified/pom.xml =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR1a/unified/pom.xml 2012-10-12 15:21:36 UTC (rev 44487) +++ trunk/build/target-platforms/jbdevstudio-JunoSR1a/unified/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>target-platforms</artifactId> + <groupId>org.jboss.tools.target-platforms.jbdevstudio-JunoSR1a</groupId> + <artifactId>all</artifactId> <version>4.0.0.Beta1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.target-platforms.jbdevstudio-JunoSR1a</groupId> Modified: trunk/build/target-platforms/jbosstools-JunoSR0c/jenkins/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR0c/jenkins/pom.xml 2012-10-12 15:21:36 UTC (rev 44487) +++ trunk/build/target-platforms/jbosstools-JunoSR0c/jenkins/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>target-platforms</artifactId> + <groupId>org.jboss.tools.target-platforms.jbosstools-JunoSR0c</groupId> + <artifactId>all</artifactId> <version>4.0.0.Beta1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.target-platforms.jbosstools-JunoSR0c</groupId> Modified: trunk/build/target-platforms/jbosstools-JunoSR0c/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR0c/local/pom.xml 2012-10-12 15:21:36 UTC (rev 44487) +++ trunk/build/target-platforms/jbosstools-JunoSR0c/local/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -3,10 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>target-platforms</artifactId> + <groupId>org.jboss.tools.target-platforms.jbosstools-JunoSR0c</groupId> + <artifactId>all</artifactId> <version>4.0.0.Beta1-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.jboss.tools.target-platforms.jbosstools-JunoSR0c</groupId> <artifactId>local</artifactId> Modified: trunk/build/target-platforms/jbosstools-JunoSR0c/multiple/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR0c/multiple/pom.xml 2012-10-12 15:21:36 UTC (rev 44487) +++ trunk/build/target-platforms/jbosstools-JunoSR0c/multiple/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -3,10 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>target-platforms</artifactId> + <groupId>org.jboss.tools.target-platforms.jbosstools-JunoSR0c</groupId> + <artifactId>all</artifactId> <version>4.0.0.Beta1-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.jboss.tools.target-platforms.jbosstools-JunoSR0c</groupId> <artifactId>multiple</artifactId> Added: trunk/build/target-platforms/jbosstools-JunoSR0c/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR0c/pom.xml (rev 0) +++ trunk/build/target-platforms/jbosstools-JunoSR0c/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools</groupId> + <artifactId>target-platforms</artifactId> + <version>4.0.0.Beta1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.target-platforms.jbosstools-JunoSR0c</groupId> + <artifactId>all</artifactId> + <packaging>pom</packaging> + <modules> + <module>multiple</module> + <module>local</module> + <module>unified</module> + <module>jenkins</module> + </modules> +</project> Modified: trunk/build/target-platforms/jbosstools-JunoSR0c/unified/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR0c/unified/pom.xml 2012-10-12 15:21:36 UTC (rev 44487) +++ trunk/build/target-platforms/jbosstools-JunoSR0c/unified/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>target-platforms</artifactId> + <groupId>org.jboss.tools.target-platforms.jbosstools-JunoSR0c</groupId> + <artifactId>all</artifactId> <version>4.0.0.Beta1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.target-platforms.jbosstools-JunoSR0c</groupId> Modified: trunk/build/target-platforms/jbosstools-JunoSR1a/jenkins/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR1a/jenkins/pom.xml 2012-10-12 15:21:36 UTC (rev 44487) +++ trunk/build/target-platforms/jbosstools-JunoSR1a/jenkins/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>target-platforms</artifactId> + <groupId>org.jboss.tools.target-platforms.jbosstools-JunoSR1a</groupId> + <artifactId>all</artifactId> <version>4.0.0.Beta1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.target-platforms.jbosstools-JunoSR1a</groupId> Modified: trunk/build/target-platforms/jbosstools-JunoSR1a/local/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR1a/local/pom.xml 2012-10-12 15:21:36 UTC (rev 44487) +++ trunk/build/target-platforms/jbosstools-JunoSR1a/local/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>target-platforms</artifactId> + <groupId>org.jboss.tools.target-platforms.jbosstools-JunoSR1a</groupId> + <artifactId>all</artifactId> <version>4.0.0.Beta1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.target-platforms.jbosstools-JunoSR1a</groupId> Modified: trunk/build/target-platforms/jbosstools-JunoSR1a/multiple/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR1a/multiple/pom.xml 2012-10-12 15:21:36 UTC (rev 44487) +++ trunk/build/target-platforms/jbosstools-JunoSR1a/multiple/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>target-platforms</artifactId> + <groupId>org.jboss.tools.target-platforms.jbosstools-JunoSR1a</groupId> + <artifactId>all</artifactId> <version>4.0.0.Beta1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.target-platforms.jbosstools-JunoSR1a</groupId> Added: trunk/build/target-platforms/jbosstools-JunoSR1a/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR1a/pom.xml (rev 0) +++ trunk/build/target-platforms/jbosstools-JunoSR1a/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools</groupId> + <artifactId>target-platforms</artifactId> + <version>4.0.0.Beta1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.target-platforms.jbosstools-JunoSR1a</groupId> + <artifactId>all</artifactId> + <packaging>pom</packaging> + <modules> + <module>multiple</module> + <module>local</module> + <module>unified</module> + <module>jenkins</module> + </modules> +</project> Modified: trunk/build/target-platforms/jbosstools-JunoSR1a/unified/pom.xml =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR1a/unified/pom.xml 2012-10-12 15:21:36 UTC (rev 44487) +++ trunk/build/target-platforms/jbosstools-JunoSR1a/unified/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>target-platforms</artifactId> + <groupId>org.jboss.tools.target-platforms.jbosstools-JunoSR1a</groupId> + <artifactId>all</artifactId> <version>4.0.0.Beta1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.target-platforms.jbosstools-JunoSR1a</groupId> Modified: trunk/build/target-platforms/pom.xml =================================================================== --- trunk/build/target-platforms/pom.xml 2012-10-12 15:21:36 UTC (rev 44487) +++ trunk/build/target-platforms/pom.xml 2012-10-12 15:24:48 UTC (rev 44488) @@ -10,6 +10,9 @@ <name>JBoss Tools + JBDS Target Platform Parent</name> <packaging>pom</packaging> +  <properties>

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r44487 - in trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel: validation and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: xcoulon Date: 2012-10-12 11:21:36 -0400 (Fri, 12 Oct 2012) New Revision: 44487 Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementChangedBuildJob.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JaxrsMetamodelBuilder.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/ResourceChangedBuildJob.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java Log: Fixed - JBIDE-12808 - JAX-RS builder and validator called twice when a changed file is saved https://issues.jboss.org/browse/JBIDE-12808 Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementChangedBuildJob.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementChangedBuildJob.java 2012-10-12 14:59:10 UTC (rev 44486) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementChangedBuildJob.java 2012-10-12 15:21:36 UTC (rev 44487) @@ -48,7 +48,7 @@ try { progressMonitor.beginTask("Building JAX-RS Metamodel", 4 * SCALE); progressMonitor.worked(SCALE); - Logger.debug("Building JAX-RS Metamodel..."); + Logger.debug("Building JAX-RS Metamodel after Java element changed..."); if (progressMonitor.isCanceled()) { return Status.CANCEL_STATUS; } Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JaxrsMetamodelBuilder.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JaxrsMetamodelBuilder.java 2012-10-12 14:59:10 UTC (rev 44486) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JaxrsMetamodelBuilder.java 2012-10-12 15:21:36 UTC (rev 44487) @@ -93,6 +93,7 @@ * the progress monitor */ private void build(final int buildKind, final IProject project, final IProgressMonitor progressMonitor) { + Logger.info("Building JAX-RS metamodel for project " + project.getName()); ResourceChangedBuildJob job = new ResourceChangedBuildJob(project, getResourceChangeEvent(project, buildKind)); job.setRule(MutexJobSchedulingRule.getInstance()); job.schedule(); Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/ResourceChangedBuildJob.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/ResourceChangedBuildJob.java 2012-10-12 14:59:10 UTC (rev 44486) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/ResourceChangedBuildJob.java 2012-10-12 15:21:36 UTC (rev 44487) @@ -51,7 +51,7 @@ long startTime = new Date().getTime(); try { progressMonitor.beginTask("Building JAX-RS Metamodel", 4 * SCALE); - Logger.debug("Building JAX-RS Metamodel..."); + Logger.debug("Building JAX-RS Metamodel after resource changed..."); if (progressMonitor.isCanceled()) { return Status.CANCEL_STATUS; } Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java 2012-10-12 14:59:10 UTC (rev 44486) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java 2012-10-12 15:21:36 UTC (rev 44487) @@ -106,12 +106,12 @@ */ public IStatus validate(Set<IFile> changedFiles, IProject project, ContextValidationHelper validationHelper, IProjectValidationContext context, ValidatorManager manager, IReporter reporter) throws ValidationException { - Logger.debug("*** Validating project {} after files {} changed... ***", project.getName(), - changedFiles.toString()); init(project, validationHelper, context, manager, reporter); setAsYouTypeValidation(false); try { if (!changedFiles.isEmpty()) { + Logger.debug("*** Validating project {} after files {} changed... ***", project.getName(), + changedFiles.toString()); final JaxrsMetamodel jaxrsMetamodel = JaxrsMetamodelLocator.get(project); final Set<IResource> allResources = completeValidationSet(jaxrsMetamodel, changedFiles.toArray(new IFile[changedFiles.size()])); for (IResource changedResource : allResources) { @@ -120,7 +120,7 @@ } // trigger a full validation instead else { - validateAll(project, validationHelper, context, manager, reporter); + //validateAll(project, validationHelper, context, manager, reporter); } } catch (CoreException e) { Logger.error("Failed to validate changed files " + changedFiles + " in project " + project, e);

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r44486 - in trunk/build/target-platforms: jbdevstudio-JunoSR1a/multiple and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-10-12 10:59:10 -0400 (Fri, 12 Oct 2012) New Revision: 44486 Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0c/multiple/multiple.target trunk/build/target-platforms/jbdevstudio-JunoSR1a/multiple/multiple.target trunk/build/target-platforms/jbosstools-JunoSR0c/multiple/multiple.target trunk/build/target-platforms/jbosstools-JunoSR1a/multiple/multiple.target Log: bump to latest m2e, including addition of m2e-adt, m2e-wro4j, m2e-jdt and buildhelper (JBIDE-12654, JBIDE-12649, JBDS-2290) Modified: trunk/build/target-platforms/jbdevstudio-JunoSR0c/multiple/multiple.target =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR0c/multiple/multiple.target 2012-10-12 14:43:28 UTC (rev 44485) +++ trunk/build/target-platforms/jbdevstudio-JunoSR0c/multiple/multiple.target 2012-10-12 14:59:10 UTC (rev 44486) @@ -72,13 +72,18 @@ </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true"> - <repository location="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/20120..."/> + <repository location="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/20120..."/> -  +  <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/> <unit id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/> <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120914-0945"/> <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125-signed-201209140800"/> + <unit id="org.jboss.tools.maven.apt.feature.feature.group" version="1.0.1.201209200721"/> + <unit id="org.jboss.tools.m2e.jdt.feature.feature.group" version="1.0.1.201209200903"/> + <unit id="org.jboss.tools.m2e.wro4j.feature.feature.group" version="1.0.1.201209200854"/> + <unit id="org.sonatype.m2e.buildhelper.feature.feature.group" version="0.15.0.201207090124"/> + <unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/> <unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/> <unit id="ch.qos.logback.slf4j" version="1.0.0.v20120123-1500"/> Modified: trunk/build/target-platforms/jbdevstudio-JunoSR1a/multiple/multiple.target =================================================================== --- trunk/build/target-platforms/jbdevstudio-JunoSR1a/multiple/multiple.target 2012-10-12 14:43:28 UTC (rev 44485) +++ trunk/build/target-platforms/jbdevstudio-JunoSR1a/multiple/multiple.target 2012-10-12 14:59:10 UTC (rev 44486) @@ -72,19 +72,24 @@ </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true"> - <repository location="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/20120..."/> + <repository location="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/20120..."/> -  +  <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/> <unit id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/> + <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120914-0945"/> + <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125-signed-201209140800"/> + <unit id="org.jboss.tools.maven.apt.feature.feature.group" version="1.0.1.201209200721"/> + <unit id="org.jboss.tools.m2e.jdt.feature.feature.group" version="1.0.1.201209200903"/> + <unit id="org.jboss.tools.m2e.wro4j.feature.feature.group" version="1.0.1.201209200854"/> + <unit id="org.sonatype.m2e.buildhelper.feature.feature.group" version="0.15.0.201207090124"/> + <unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/> <unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/> <unit id="ch.qos.logback.slf4j" version="1.0.0.v20120123-1500"/> <unit id="org.slf4j.api" version="1.6.4.v20120130-2120"/> <unit id="com.ning.async-http-client" version="1.6.5.20120903-0645"/> <unit id="org.jboss.netty" version="3.2.5.Final-20120903-0645"/> - <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120914-0945"/> - <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125-signed-201209140800"/> </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true"> Modified: trunk/build/target-platforms/jbosstools-JunoSR0c/multiple/multiple.target =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR0c/multiple/multiple.target 2012-10-12 14:43:28 UTC (rev 44485) +++ trunk/build/target-platforms/jbosstools-JunoSR0c/multiple/multiple.target 2012-10-12 14:59:10 UTC (rev 44486) @@ -72,13 +72,18 @@ </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true"> - <repository location="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/20120..."/> + <repository location="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/20120..."/> -  +  <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/> <unit id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/> <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120914-0945"/> <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125-signed-201209140800"/> + <unit id="org.jboss.tools.maven.apt.feature.feature.group" version="1.0.1.201209200721"/> + <unit id="org.jboss.tools.m2e.jdt.feature.feature.group" version="1.0.1.201209200903"/> + <unit id="org.jboss.tools.m2e.wro4j.feature.feature.group" version="1.0.1.201209200854"/> + <unit id="org.sonatype.m2e.buildhelper.feature.feature.group" version="0.15.0.201207090124"/> + <unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/> <unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/> <unit id="ch.qos.logback.slf4j" version="1.0.0.v20120123-1500"/> Modified: trunk/build/target-platforms/jbosstools-JunoSR1a/multiple/multiple.target =================================================================== --- trunk/build/target-platforms/jbosstools-JunoSR1a/multiple/multiple.target 2012-10-12 14:43:28 UTC (rev 44485) +++ trunk/build/target-platforms/jbosstools-JunoSR1a/multiple/multiple.target 2012-10-12 14:59:10 UTC (rev 44486) @@ -72,19 +72,24 @@ </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true"> - <repository location="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/20120..."/> + <repository location="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/20120..."/> -  +  <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/> <unit id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/> + <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120914-0945"/> + <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125-signed-201209140800"/> + <unit id="org.jboss.tools.maven.apt.feature.feature.group" version="1.0.1.201209200721"/> + <unit id="org.jboss.tools.m2e.jdt.feature.feature.group" version="1.0.1.201209200903"/> + <unit id="org.jboss.tools.m2e.wro4j.feature.feature.group" version="1.0.1.201209200854"/> + <unit id="org.sonatype.m2e.buildhelper.feature.feature.group" version="0.15.0.201207090124"/> + <unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/> <unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/> <unit id="ch.qos.logback.slf4j" version="1.0.0.v20120123-1500"/> <unit id="org.slf4j.api" version="1.6.4.v20120130-2120"/> <unit id="com.ning.async-http-client" version="1.6.5.20120903-0645"/> <unit id="org.jboss.netty" version="3.2.5.Final-20120903-0645"/> - <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120914-0945"/> - <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125-signed-201209140800"/> </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true">

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r44485 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2012-10-12 10:43:28 -0400 (Fri, 12 Oct 2012) New Revision: 44485 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java Log: JBIDE-12840 npe plus link enablement fail Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-10-12 14:18:53 UTC (rev 44484) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-10-12 14:43:28 UTC (rev 44485) @@ -71,7 +71,6 @@ 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.explorer.ConnectToOpenShiftWizard; -import org.jboss.tools.openshift.express.internal.ui.utils.UIUpdatingJob; import org.jboss.tools.openshift.express.internal.ui.utils.UIUtils; import org.jboss.tools.openshift.express.internal.ui.viewer.ConnectionColumLabelProvider; import org.jboss.tools.openshift.express.internal.ui.wizard.application.ImportOpenShiftExpressApplicationWizard; @@ -164,9 +163,9 @@ showImportLink = p == null || p.length == 0; } else { // we may or may not have a user, clearly no app - this.connection = tmpConnection == null ? ConnectionsModel.getDefault().getRecentConnection() - : tmpConnection; - updateModel(connection); + if( tmpConnection == null ) + tmpConnection = ConnectionsModel.getDefault().getRecentConnection(); + updateModel(tmpConnection); } this.deployFolder = ExpressServerUtils.getExpressDeployFolder(server); @@ -324,22 +323,17 @@ public void selectionChanged(SelectionChangedEvent event) { final Connection connection = UIUtils.getFirstElement(event.getSelection(), Connection.class); if (connection != null) { - Job j = new UIUpdatingJob("Verifying connection...") { + Job j = new Job("Verifying connection...") { @Override protected IStatus run(IProgressMonitor monitor) { updateModel(connection); return Status.OK_STATUS; } - - @Override - protected IStatus updateUI(IProgressMonitor monitor) { - updateWidgets(); - updateErrorMessage(); - return Status.OK_STATUS; - } }; callback.executeLongRunning(j); + updateWidgets(); + updateErrorMessage(); } } }; @@ -476,6 +470,7 @@ } private void updateWidgets() { + System.out.println(importLink.getClass().getName()); importLink.setEnabled(false); if (connection == null || !connection.isConnected()) { @@ -535,6 +530,9 @@ } private void updateModel(Connection connection) { + if( connection == null ) + return; + try { // IF we load the applications first, domain gets loaded // automatically

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r44484 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2012-10-12 10:18:53 -0400 (Fri, 12 Oct 2012) New Revision: 44484 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ServerAdapterFactory.java Log: JBIDE-12839 to beta1 trunk Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ServerAdapterFactory.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ServerAdapterFactory.java 2012-10-12 14:03:58 UTC (rev 44483) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ServerAdapterFactory.java 2012-10-12 14:18:53 UTC (rev 44484) @@ -100,12 +100,12 @@ Assert.isLegal(application != null); Assert.isLegal(user != null); - String serverNameBase = application.getName() + " OpenShift Server"; + String serverNameBase = application.getName() + " at Openshift"; String serverName = org.jboss.ide.eclipse.as.core.util.ServerUtil.getDefaultServerName(serverNameBase); IServer server = ExpressServerUtils.createServer(rt, serverType, serverName); ExpressServerUtils.fillServerWithOpenShiftDetails(server, - application.getApplicationUrl(), deployProject, remoteName); + application.getApplicationUrl(), deployProject, remoteName, serverName); return server; }

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r44483 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test: editor/preferences and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vpakan(a)redhat.com Date: 2012-10-12 10:03:58 -0400 (Fri, 12 Oct 2012) New Revision: 44483 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEStableSubsetBotTests.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/CodeCompletionTest.java Log: Fixes for JBT 4.0.0.Alpha2 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEStableSubsetBotTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEStableSubsetBotTests.java 2012-10-12 14:03:18 UTC (rev 44482) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEStableSubsetBotTests.java 2012-10-12 14:03:58 UTC (rev 44483) @@ -39,7 +39,6 @@ import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowSelectionTagBarTest; import org.jboss.tools.vpe.ui.bot.test.editor.selectionbar.SelectionBarTest; import org.jboss.tools.vpe.ui.bot.test.editor.tags.CalendarTagTest; -import org.jboss.tools.vpe.ui.bot.test.editor.tags.ColumnsTagTest; import org.jboss.tools.vpe.ui.bot.test.editor.tags.CoreHTMLTagsTest; import org.jboss.tools.vpe.ui.bot.test.editor.tags.JSFTagsTest; import org.jboss.tools.vpe.ui.bot.test.jbide.JBIDE4556Test; @@ -118,7 +117,6 @@ TextSelectionTest.class, CoreHTMLTagsTest.class, JSFTagsTest.class, - ColumnsTagTest.class, CalendarTagTest.class, OpenOnTest.class, XhtmlFilePerformanceTest.class, Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2012-10-12 14:03:18 UTC (rev 44482) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2012-10-12 14:03:58 UTC (rev 44483) @@ -14,6 +14,7 @@ import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.widgets.TimeoutException; import org.jboss.tools.ui.bot.ext.SWTBotExt; +import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.jboss.tools.ui.bot.test.WidgetVariables; @@ -66,6 +67,7 @@ bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ bot.shell("Confirm Delete").activate(); //$NON-NLS-1$ bot.button(IDELabel.Button.OK).click(); //$NON-NLS-1$ + util.waitForNonIgnoredJobs(Timing.time3S()); bot.toolbarButtonWithTooltip(PREF_TOOLTIP).click(); bot.shell(PREF_FILTER_SHELL_TITLE).activate(); bot.comboBoxWithLabel(SELECT_DEFAULT_TAB).setSelection(IDELabel.VisualPageEditor.VISUAL_SOURCE_TAB_LABEL); //$NON-NLS-1$ Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/CodeCompletionTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/CodeCompletionTest.java 2012-10-12 14:03:18 UTC (rev 44482) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/CodeCompletionTest.java 2012-10-12 14:03:58 UTC (rev 44483) @@ -78,6 +78,7 @@ // close Content Assist window which is automatically opened after previous // Content Assist choice were applied KeyboardHelper.pressKeyCode(editor.bot().getDisplay(), KeyEvent.VK_ESCAPE); + bot.sleep(Timing.time3S()); editor.save(); String expectedInsertedText = textForSelection + "<" + contentAssistToUse + " action=\"\" value=\"\" />"; if (!editor.getText().contains(expectedInsertedText)){

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r44482 - in trunk/ws: plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/configuration and 6 other directories.

by jbosstools-commits＠lists.jboss.org

Author: xcoulon Date: 2012-10-12 10:03:18 -0400 (Fri, 12 Oct 2012) New Revision: 44482 Added: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/validation/ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/validation/JaxrsMetamodelValidationConstants.java Removed: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/IMarkerResolutionDelegate.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/quickfix/ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/validation/JaxrsValidationQuickFixes.java Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/configuration/ProjectBuilderConfigurer.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsHttpMethodValidatorDelegate.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsJavaApplicationValidatorDelegate.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/facet/JaxrsFacetedProjectListener.java trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/quickfix/JaxrsMarkerResolutionGenerator.java trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/MarkerUtils.java Log: Fixed - JBIDE-12835 - JAX-RS problem markers are not removed when JAX-RS support is removed on project https://issues.jboss.org/browse/JBIDE-12835 Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF 2012-10-12 13:44:36 UTC (rev 44481) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF 2012-10-12 14:03:18 UTC (rev 44482) @@ -40,7 +40,7 @@ org.jboss.tools.ws.jaxrs.core.internal.utils;x-friends:="org.jboss.tools.ws.jaxrs.core.test", org.jboss.tools.ws.jaxrs.core.jdt, org.jboss.tools.ws.jaxrs.core.metamodel, - org.jboss.tools.ws.jaxrs.core.metamodel.quickfix, + org.jboss.tools.ws.jaxrs.core.metamodel.validation, org.jboss.tools.ws.jaxrs.core.preferences, org.jboss.tools.ws.jaxrs.core.pubsub Bundle-ClassPath: . Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/configuration/ProjectBuilderConfigurer.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/configuration/ProjectBuilderConfigurer.java 2012-10-12 13:44:36 UTC (rev 44481) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/configuration/ProjectBuilderConfigurer.java 2012-10-12 14:03:18 UTC (rev 44482) @@ -13,9 +13,11 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectNature; +import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.JaxrsMetamodelBuilder; import org.jboss.tools.ws.jaxrs.core.internal.utils.Logger; +import org.jboss.tools.ws.jaxrs.core.metamodel.validation.JaxrsMetamodelValidationConstants; /** * Class to configure (add/remove) the JAX-RS Metamodel Builder on a project. @@ -51,6 +53,8 @@ } else { Logger.debug("JAX-RS Metamodel Builder was not installed."); } + project.deleteMarkers(JaxrsMetamodelValidationConstants.JAXRS_PROBLEM_TYPE, true, IResource.DEPTH_INFINITE); + Logger.debug("JAX-RS Problem markers removed."); } /** {@inheritDoc} */ Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsHttpMethodValidatorDelegate.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsHttpMethodValidatorDelegate.java 2012-10-12 13:44:36 UTC (rev 44481) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsHttpMethodValidatorDelegate.java 2012-10-12 14:03:18 UTC (rev 44482) @@ -21,7 +21,7 @@ import org.jboss.tools.ws.jaxrs.core.internal.utils.Logger; import org.jboss.tools.ws.jaxrs.core.jdt.Annotation; import org.jboss.tools.ws.jaxrs.core.jdt.JdtUtils; -import org.jboss.tools.ws.jaxrs.core.metamodel.quickfix.JaxrsValidationQuickFixes; +import org.jboss.tools.ws.jaxrs.core.metamodel.validation.JaxrsMetamodelValidationConstants; import org.jboss.tools.ws.jaxrs.core.preferences.JaxrsPreferences; /** @@ -81,7 +81,7 @@ addProblem(JaxrsValidationMessages.HTTP_METHOD_MISSING_TARGET_ANNOTATION, JaxrsPreferences.HTTP_METHOD_MISSING_TARGET_ANNOTATION, new String[0], range.getLength(), range.getOffset(), httpMethod.getResource(), - JaxrsValidationQuickFixes.HTTP_METHOD_MISSING_TARGET_ANNOTATION_ID); + JaxrsMetamodelValidationConstants.HTTP_METHOD_MISSING_TARGET_ANNOTATION_ID); } else { final String annotationValue = targetAnnotation.getValue("value"); if (annotationValue == null) { @@ -89,14 +89,14 @@ addProblem(JaxrsValidationMessages.HTTP_METHOD_INVALID_TARGET_ANNOTATION_VALUE, JaxrsPreferences.HTTP_METHOD_INVALID_TARGET_ANNOTATION_VALUE, new String[0], range.getLength(), range.getOffset(), httpMethod.getResource(), - JaxrsValidationQuickFixes.HTTP_METHOD_INVALID_TARGET_ANNOTATION_VALUE_ID); + JaxrsMetamodelValidationConstants.HTTP_METHOD_INVALID_TARGET_ANNOTATION_VALUE_ID); } else if (!annotationValue.equals(ElementType.METHOD.name())) { final ISourceRange range = JdtUtils.resolveMemberPairValueRange(targetAnnotation.getJavaAnnotation(), targetAnnotation.getFullyQualifiedName(), "value"); addProblem(JaxrsValidationMessages.HTTP_METHOD_INVALID_TARGET_ANNOTATION_VALUE, JaxrsPreferences.HTTP_METHOD_INVALID_TARGET_ANNOTATION_VALUE, new String[0], range.getLength(), range.getOffset(), httpMethod.getResource(), - JaxrsValidationQuickFixes.HTTP_METHOD_INVALID_TARGET_ANNOTATION_VALUE_ID); + JaxrsMetamodelValidationConstants.HTTP_METHOD_INVALID_TARGET_ANNOTATION_VALUE_ID); } } @@ -115,7 +115,7 @@ addProblem(JaxrsValidationMessages.HTTP_METHOD_MISSING_RETENTION_ANNOTATION, JaxrsPreferences.HTTP_METHOD_MISSING_RETENTION_ANNOTATION, new String[0], range.getLength(), range.getOffset(), httpMethod.getResource(), - JaxrsValidationQuickFixes.HTTP_METHOD_MISSING_RETENTION_ANNOTATION_ID); + JaxrsMetamodelValidationConstants.HTTP_METHOD_MISSING_RETENTION_ANNOTATION_ID); } else { final String annotationValue = retentionAnnotation.getValue("value"); if (annotationValue == null) { @@ -123,14 +123,14 @@ addProblem(JaxrsValidationMessages.HTTP_METHOD_INVALID_RETENTION_ANNOTATION_VALUE, JaxrsPreferences.HTTP_METHOD_INVALID_RETENTION_ANNOTATION_VALUE, new String[0], range.getLength(), range.getOffset(), httpMethod.getResource(), - JaxrsValidationQuickFixes.HTTP_METHOD_INVALID_RETENTION_ANNOTATION_VALUE_ID); + JaxrsMetamodelValidationConstants.HTTP_METHOD_INVALID_RETENTION_ANNOTATION_VALUE_ID); } else if (!annotationValue.equals(RetentionPolicy.RUNTIME.name())) { final ISourceRange range = JdtUtils.resolveMemberPairValueRange(retentionAnnotation.getJavaAnnotation(), retentionAnnotation.getFullyQualifiedName(), "value"); addProblem(JaxrsValidationMessages.HTTP_METHOD_INVALID_RETENTION_ANNOTATION_VALUE, JaxrsPreferences.HTTP_METHOD_INVALID_RETENTION_ANNOTATION_VALUE, new String[0], range.getLength(), range.getOffset(), httpMethod.getResource(), - JaxrsValidationQuickFixes.HTTP_METHOD_INVALID_RETENTION_ANNOTATION_VALUE_ID); + JaxrsMetamodelValidationConstants.HTTP_METHOD_INVALID_RETENTION_ANNOTATION_VALUE_ID); } } Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsJavaApplicationValidatorDelegate.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsJavaApplicationValidatorDelegate.java 2012-10-12 13:44:36 UTC (rev 44481) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsJavaApplicationValidatorDelegate.java 2012-10-12 14:03:18 UTC (rev 44482) @@ -19,7 +19,7 @@ import org.jboss.tools.ws.jaxrs.core.internal.utils.Logger; import org.jboss.tools.ws.jaxrs.core.jdt.Annotation; import org.jboss.tools.ws.jaxrs.core.jdt.EnumJaxrsClassname; -import org.jboss.tools.ws.jaxrs.core.metamodel.quickfix.JaxrsValidationQuickFixes; +import org.jboss.tools.ws.jaxrs.core.metamodel.validation.JaxrsMetamodelValidationConstants; import org.jboss.tools.ws.jaxrs.core.preferences.JaxrsPreferences; /** @@ -52,14 +52,14 @@ JaxrsPreferences.JAVA_APPLICATION_MISSING_APPLICATION_PATH_ANNOTATION, new String[0], appJavaElement.getNameRange().getLength(), appJavaElement.getNameRange().getOffset(), application.getResource(), - JaxrsValidationQuickFixes.JAVA_APPLICATION_MISSING_APPLICATION_PATH_ANNOTATION_ID); + JaxrsMetamodelValidationConstants.JAVA_APPLICATION_MISSING_APPLICATION_PATH_ANNOTATION_ID); } if (!application.isJaxrsCoreApplicationSubclass()) { addProblem(JaxrsValidationMessages.JAVA_APPLICATION_INVALID_TYPE_HIERARCHY, JaxrsPreferences.JAVA_APPLICATION_INVALID_TYPE_HIERARCHY, new String[] { appJavaElement.getFullyQualifiedName() }, application.getJavaElement() .getSourceRange().getLength(), appJavaElement.getSourceRange().getOffset(), - application.getResource(), JaxrsValidationQuickFixes.JAVA_APPLICATION_INVALID_TYPE_HIERARCHY_ID); + application.getResource(), JaxrsMetamodelValidationConstants.JAVA_APPLICATION_INVALID_TYPE_HIERARCHY_ID); } if (application.getMetamodel().hasMultipleApplications()) { Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java 2012-10-12 13:44:36 UTC (rev 44481) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java 2012-10-12 14:03:18 UTC (rev 44482) @@ -49,6 +49,7 @@ import org.jboss.tools.ws.jaxrs.core.metamodel.IJaxrsApplication; import org.jboss.tools.ws.jaxrs.core.metamodel.IJaxrsElement; import org.jboss.tools.ws.jaxrs.core.metamodel.JaxrsMetamodelLocator; +import org.jboss.tools.ws.jaxrs.core.metamodel.validation.JaxrsMetamodelValidationConstants; import org.jboss.tools.ws.jaxrs.core.preferences.JaxrsPreferences; /** @@ -67,13 +68,10 @@ /** The JAX-RS Validator ID. */ public static final String ID = "org.jboss.tools.ws.jaxrs.JaxrsMetamodelValidator"; //$NON-NLS-1$ - /** The custom 'JAX-RS Problem' marker type. */ - public static final String JAXRS_PROBLEM_TYPE = "org.jboss.tools.ws.jaxrs.metamodelMarker"; - private static final String BUNDLE_NAME = JaxrsMetamodelValidator.class.getPackage().getName() + ".messages"; public JaxrsMetamodelValidator() { - super.setProblemType(JAXRS_PROBLEM_TYPE); + super.setProblemType(JaxrsMetamodelValidationConstants.JAXRS_PROBLEM_TYPE); } /* @@ -312,7 +310,7 @@ return; } Logger.debug("Clearing JAX-RS markers for resource " + resource.getName()); - resource.deleteMarkers(JAXRS_PROBLEM_TYPE, true, IResource.DEPTH_ONE); + resource.deleteMarkers(JaxrsMetamodelValidationConstants.JAXRS_PROBLEM_TYPE, true, IResource.DEPTH_ONE); } class JaxrsPreferenceInfo implements IPreferenceInfo{ Deleted: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/IMarkerResolutionDelegate.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/IMarkerResolutionDelegate.java 2012-10-12 13:44:36 UTC (rev 44481) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/IMarkerResolutionDelegate.java 2012-10-12 14:03:18 UTC (rev 44482) @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012 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.ws.jaxrs.core.metamodel; - -import org.eclipse.core.runtime.CoreException; - - -/** - * @author Xavier Coulon - * - */ -public interface IMarkerResolutionDelegate { - - public static final String MARKER_RESOLUTION = "MARKER_RESOLUTION"; - - public abstract void applyQuickFix() throws CoreException; - -} Added: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/validation/JaxrsMetamodelValidationConstants.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/validation/JaxrsMetamodelValidationConstants.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/validation/JaxrsMetamodelValidationConstants.java 2012-10-12 14:03:18 UTC (rev 44482) @@ -0,0 +1,26 @@ +package org.jboss.tools.ws.jaxrs.core.metamodel.validation; + +public class JaxrsMetamodelValidationConstants { + + /** The custom 'JAX-RS Problem' marker type. */ + public static final String JAXRS_PROBLEM_TYPE = "org.jboss.tools.ws.jaxrs.metamodelMarker"; + + /** QuickFix for missing <code>@Retention</code> annotation.*/ + public static final int HTTP_METHOD_MISSING_RETENTION_ANNOTATION_ID = 1; + + /** QuickFix for invalid <code>@Retention</code> annotation value.*/ + public static final int HTTP_METHOD_INVALID_RETENTION_ANNOTATION_VALUE_ID = 2; + + /** QuickFix for missing <code>@Target</code> annotation.*/ + public static final int HTTP_METHOD_MISSING_TARGET_ANNOTATION_ID = 3; + + /** QuickFix for invalid <code>@Target</code> annotation value.*/ + public static final int HTTP_METHOD_INVALID_TARGET_ANNOTATION_VALUE_ID = 4; + + /** QuickFix for missing <code>@ApplicationPath</code> annotation.*/ + public static final int JAVA_APPLICATION_MISSING_APPLICATION_PATH_ANNOTATION_ID = 5; + + /** QuickFix for invalid <code>javax.ws.rs.core.Application</code> subclass hierarchy .*/ + public static final int JAVA_APPLICATION_INVALID_TYPE_HIERARCHY_ID = 6; + +} Property changes on: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/validation/JaxrsMetamodelValidationConstants.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/validation/JaxrsValidationQuickFixes.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/quickfix/JaxrsValidationQuickFixes.java 2012-09-28 04:35:59 UTC (rev 44111) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/validation/JaxrsValidationQuickFixes.java 2012-10-12 14:03:18 UTC (rev 44482) @@ -1,12 +0,0 @@ -package org.jboss.tools.ws.jaxrs.core.metamodel.quickfix; - -public class JaxrsValidationQuickFixes { - - public static final int HTTP_METHOD_MISSING_RETENTION_ANNOTATION_ID = 1; - public static final int HTTP_METHOD_INVALID_RETENTION_ANNOTATION_VALUE_ID = 2; - public static final int HTTP_METHOD_MISSING_TARGET_ANNOTATION_ID = 3; - public static final int HTTP_METHOD_INVALID_TARGET_ANNOTATION_VALUE_ID = 4; - public static final int JAVA_APPLICATION_MISSING_APPLICATION_PATH_ANNOTATION_ID = 5; - public static final int JAVA_APPLICATION_INVALID_TYPE_HIERARCHY_ID = 6; - -} Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/facet/JaxrsFacetedProjectListener.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/facet/JaxrsFacetedProjectListener.java 2012-10-12 13:44:36 UTC (rev 44481) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/facet/JaxrsFacetedProjectListener.java 2012-10-12 14:03:18 UTC (rev 44482) @@ -12,11 +12,13 @@ package org.jboss.tools.ws.jaxrs.ui.facet; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent; import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener; import org.eclipse.wst.common.project.facet.core.events.IProjectFacetActionEvent; import org.jboss.tools.ws.jaxrs.core.configuration.ProjectNatureUtils; +import org.jboss.tools.ws.jaxrs.core.metamodel.validation.JaxrsMetamodelValidationConstants; import org.jboss.tools.ws.jaxrs.ui.internal.utils.Logger; /** @@ -56,6 +58,9 @@ if (ProjectNatureUtils.isProjectNatureInstalled(project, ProjectNatureUtils.JAXRS_NATURE_ID)) { ProjectNatureUtils.uninstallProjectNature(project, ProjectNatureUtils.JAXRS_NATURE_ID); } + project.deleteMarkers(JaxrsMetamodelValidationConstants.JAXRS_PROBLEM_TYPE, true, IResource.DEPTH_INFINITE); + Logger.debug("JAX-RS Problem markers removed."); + break; default: break; Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/quickfix/JaxrsMarkerResolutionGenerator.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/quickfix/JaxrsMarkerResolutionGenerator.java 2012-10-12 13:44:36 UTC (rev 44481) +++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/quickfix/JaxrsMarkerResolutionGenerator.java 2012-10-12 14:03:18 UTC (rev 44482) @@ -9,7 +9,7 @@ import org.eclipse.ui.IMarkerResolutionGenerator2; import org.jboss.tools.common.validation.ValidationErrorManager; import org.jboss.tools.ws.jaxrs.core.jdt.JdtUtils; -import org.jboss.tools.ws.jaxrs.core.metamodel.quickfix.JaxrsValidationQuickFixes; +import org.jboss.tools.ws.jaxrs.core.metamodel.validation.JaxrsMetamodelValidationConstants; import org.jboss.tools.ws.jaxrs.ui.internal.utils.Logger; public class JaxrsMarkerResolutionGenerator implements IMarkerResolutionGenerator2 { @@ -40,13 +40,13 @@ marker.getAttribute(IMarker.CHAR_START, 0), IJavaElement.TYPE); if (type != null) { switch (quickfixId) { - case JaxrsValidationQuickFixes.HTTP_METHOD_MISSING_TARGET_ANNOTATION_ID: + case JaxrsMetamodelValidationConstants.HTTP_METHOD_MISSING_TARGET_ANNOTATION_ID: return new IMarkerResolution[] { new AddTargetAnnotationMarkerResolution(type) }; - case JaxrsValidationQuickFixes.HTTP_METHOD_MISSING_RETENTION_ANNOTATION_ID: + case JaxrsMetamodelValidationConstants.HTTP_METHOD_MISSING_RETENTION_ANNOTATION_ID: return new IMarkerResolution[] { new AddRetentionAnnotationMarkerResolution(type) }; - case JaxrsValidationQuickFixes.HTTP_METHOD_INVALID_TARGET_ANNOTATION_VALUE_ID: + case JaxrsMetamodelValidationConstants.HTTP_METHOD_INVALID_TARGET_ANNOTATION_VALUE_ID: return new IMarkerResolution[] { new UpdateTargetAnnotationValueMarkerResolution(type) }; - case JaxrsValidationQuickFixes.HTTP_METHOD_INVALID_RETENTION_ANNOTATION_VALUE_ID: + case JaxrsMetamodelValidationConstants.HTTP_METHOD_INVALID_RETENTION_ANNOTATION_VALUE_ID: return new IMarkerResolution[] { new UpdateRetentionAnnotationValueMarkerResolution(type) }; } } Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/MarkerUtils.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/MarkerUtils.java 2012-10-12 13:44:36 UTC (rev 44481) +++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/MarkerUtils.java 2012-10-12 14:03:18 UTC (rev 44482) @@ -15,6 +15,7 @@ import org.jboss.tools.ws.jaxrs.core.internal.metamodel.domain.JaxrsBaseElement; import org.jboss.tools.ws.jaxrs.core.internal.metamodel.domain.JaxrsResourceMethod; import org.jboss.tools.ws.jaxrs.core.metamodel.IJaxrsElement; +import org.jboss.tools.ws.jaxrs.core.metamodel.validation.JaxrsMetamodelValidationConstants; /** * @author Xavier Coulon @@ -32,10 +33,10 @@ case APPLICATION: case HTTP_METHOD: case RESOURCE: - return element.getResource().findMarkers(JaxrsMetamodelValidator.JAXRS_PROBLEM_TYPE, true, + return element.getResource().findMarkers(JaxrsMetamodelValidationConstants.JAXRS_PROBLEM_TYPE, true, IResource.DEPTH_INFINITE); case RESOURCE_METHOD: - final IMarker[] markers = element.getResource().findMarkers(JaxrsMetamodelValidator.JAXRS_PROBLEM_TYPE, + final IMarker[] markers = element.getResource().findMarkers(JaxrsMetamodelValidationConstants.JAXRS_PROBLEM_TYPE, true, IResource.DEPTH_INFINITE); final List<IMarker> resourceMethodMarkers = new ArrayList<IMarker>(); final ISourceRange methodSourceRange = ((JaxrsResourceMethod) element).getJavaElement().getSourceRange(); @@ -54,7 +55,7 @@ } public static IMarker[] findJaxrsMarkers(IProject project) throws CoreException { - return project.findMarkers(JaxrsMetamodelValidator.JAXRS_PROBLEM_TYPE, false, 0); + return project.findMarkers(JaxrsMetamodelValidationConstants.JAXRS_PROBLEM_TYPE, false, 0); } /** @@ -63,7 +64,7 @@ */ public static void deleteJaxrsMarkers(final JaxrsBaseElement element) throws CoreException { element.getResource() - .deleteMarkers(JaxrsMetamodelValidator.JAXRS_PROBLEM_TYPE, false, IResource.DEPTH_INFINITE); + .deleteMarkers(JaxrsMetamodelValidationConstants.JAXRS_PROBLEM_TYPE, false, IResource.DEPTH_INFINITE); } /** @@ -71,7 +72,7 @@ * @throws CoreException */ public static void deleteJaxrsMarkers(final IProject project) throws CoreException { - project.deleteMarkers(JaxrsMetamodelValidator.JAXRS_PROBLEM_TYPE, false, IResource.DEPTH_INFINITE); + project.deleteMarkers(JaxrsMetamodelValidationConstants.JAXRS_PROBLEM_TYPE, false, IResource.DEPTH_INFINITE); } public static Matcher<IMarker[]> hasPreferenceKey(String javaApplicationInvalidTypeHierarchy) {

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r44481 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal: ui/behaviour and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2012-10-12 09:44:36 -0400 (Fri, 12 Oct 2012) New Revision: 44481 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java Log: JBIDE-12839 to beta1 trunk Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java 2012-10-12 13:33:43 UTC (rev 44480) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java 2012-10-12 13:44:36 UTC (rev 44481) @@ -27,14 +27,18 @@ import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties; import org.jboss.ide.eclipse.as.core.util.ServerUtil; import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities; +import org.jboss.tools.openshift.express.internal.core.connection.ConnectionUtils; +import org.jboss.tools.openshift.express.internal.core.util.UrlUtils; /** * @author Rob Stryker */ public class ExpressServer extends DeployableServer implements IURLProvider, IExtendedPropertiesProvider { + public static final String DEFAULT_SERVER_NAME_BASE = "ApplicationName at Openshift"; + public void setDefaults(IProgressMonitor monitor) { + getServerWorkingCopy().setHost(UrlUtils.cutScheme(ConnectionUtils.getDefaultHostUrl())); - public void setDefaults(IProgressMonitor monitor) { - getServerWorkingCopy().setName(ServerUtil.getDefaultServerName(getServer().getServerType().getName())); + getServerWorkingCopy().setName(ServerUtil.getDefaultServerName(DEFAULT_SERVER_NAME_BASE)); setAttribute(IDeployableServer.SERVER_MODE, ExpressBehaviourDelegate.OPENSHIFT_ID); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-10-12 13:33:43 UTC (rev 44480) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-10-12 13:44:36 UTC (rev 44481) @@ -39,6 +39,7 @@ import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.jboss.ide.eclipse.as.core.util.RuntimeUtils; import org.jboss.ide.eclipse.as.core.util.ServerConverter; +import org.jboss.ide.eclipse.as.core.util.ServerUtil; import org.jboss.tools.openshift.egit.core.EGitUtils; import org.jboss.tools.openshift.express.internal.core.connection.Connection; import org.jboss.tools.openshift.express.internal.core.connection.ConnectionUtils; @@ -257,15 +258,15 @@ * @throws CoreException */ public static IServer fillServerWithOpenShiftDetails(IServer server, String host, - String deployProject, String remote) throws CoreException { + String deployProject, String remote, String appName) throws CoreException { ServerWorkingCopy wc = (ServerWorkingCopy) server.createWorkingCopy(); - fillServerWithOpenShiftDetails((IServerWorkingCopy) wc, host, deployProject, remote); + fillServerWithOpenShiftDetails((IServerWorkingCopy) wc, host, deployProject, remote, appName); IServer saved = wc.save(true, new NullProgressMonitor()); return saved; } public static void fillServerWithOpenShiftDetails(IServerWorkingCopy wc, String host, - String deployProject, String remote) { + String deployProject, String remote, String appName) { if (host != null) { if (host.indexOf("://") != -1) @@ -289,6 +290,10 @@ wc.setAttribute(IJBossToolingConstants.WEB_PORT_DETECT, "false"); wc.setAttribute(IDeployableServer.DEPLOY_DIRECTORY_TYPE, IDeployableServer.DEPLOY_CUSTOM); wc.setAttribute(IDeployableServer.ZIP_DEPLOYMENTS_PREF, true); + if( appName != null && ( wc.getName() == null || wc.getName().length() == 0 || wc.getName().startsWith(ExpressServer.DEFAULT_SERVER_NAME_BASE))) { + String newBase = appName + " at Openshift"; + wc.setName(ServerUtil.getDefaultServerName(newBase)); + } } public static IServer createServerAndRuntime(String runtimeID, String serverID, Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-10-12 13:33:43 UTC (rev 44480) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-10-12 13:44:36 UTC (rev 44481) @@ -601,7 +601,7 @@ // update the values IServerWorkingCopy wc = callback.getServer(); String host = fapplication == null ? null : fapplication.getApplicationUrl(); - ExpressServerUtils.fillServerWithOpenShiftDetails(wc, host, deployProject, remote); + ExpressServerUtils.fillServerWithOpenShiftDetails(wc, host, deployProject, remote, app); } private void updateProjectSettings() {

12 years, 3 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits October 2012