JBoss Tools SVN: r36388 - trunk/documentation/guides/GettingStartedGuide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-11-16 18:21:56 -0500 (Wed, 16 Nov 2011)
New Revision: 36388
Modified:
trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
Log:
updated for brew
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2011-11-16 23:07:19 UTC (rev 36387)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2011-11-16 23:21:56 UTC (rev 36388)
@@ -8,7 +8,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
<edition>5.0.0</edition>
-<pubsnumber>1</pubsnumber>
+<pubsnumber>2</pubsnumber>
<abstract>
<para>The Getting Started Guide explains the JBoss Developer Studio.</para>
</abstract>
13 years, 1 month
JBoss Tools SVN: r36387 - in branches/hibernatetools-multiversion2/plugins: org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2011-11-16 18:07:19 -0500 (Wed, 16 Nov 2011)
New Revision: 36387
Added:
branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/lib/log4j-1.2.15.jar
branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/lib/slf4j-api-1.5.8.jar
branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/lib/slf4j-log4j12-1.5.8.jar
branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/lib/tools/freemarker.jar
branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/lib/tools/jtidy-r8-20060801.jar
Modified:
branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java
branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ext/HibernateExtension.java
branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/.classpath
branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF
branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/build.properties
branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java
branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/ConsoleExtension4_0.java
Log:
Fix Query exporter problem
Modified: branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ext/HibernateExtension.java
===================================================================
--- branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ext/HibernateExtension.java 2011-11-16 22:35:21 UTC (rev 36386)
+++ branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/src/org/hibernate/console/ext/HibernateExtension.java 2011-11-16 23:07:19 UTC (rev 36387)
@@ -11,6 +11,7 @@
package org.hibernate.console.ext;
import org.hibernate.console.QueryInputModel;
+import org.hibernate.console.execution.ExecutionContext.Command;
import org.hibernate.console.preferences.ConsoleConfigurationPreferences;
/**
@@ -44,6 +45,8 @@
public Object getSessionFactory();
//FIXME remove this method
*/
+
+ public Object execute(Command command);
Modified: branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java
===================================================================
--- branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java 2011-11-16 22:35:21 UTC (rev 36386)
+++ branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java 2011-11-16 23:07:19 UTC (rev 36387)
@@ -27,9 +27,6 @@
import java.io.UnsupportedEncodingException;
import java.lang.reflect.Constructor;
import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -58,10 +55,8 @@
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.model.IProcess;
import org.eclipse.debug.internal.core.LaunchConfiguration;
import org.eclipse.debug.internal.core.LaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.RefreshTab;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.ToolFactory;
@@ -84,6 +79,8 @@
import org.hibernate.console.execution.ExecutionContext.Command;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
+import org.hibernate.eclipse.console.ext.ConsoleExtension;
+import org.hibernate.eclipse.console.ext.ConsoleExtensionManager;
import org.hibernate.eclipse.console.model.impl.ExporterFactory;
import org.hibernate.tool.hbm2x.ArtifactCollector;
import org.hibernate.tool.hbm2x.Exporter;
@@ -266,6 +263,12 @@
Assert.isNotNull(configuration);
Assert.isNotNull(monitor);
ExporterAttributes attributes = new ExporterAttributes(configuration);
+ ConsoleConfiguration cc = KnownConfigurations.getInstance().find(attributes.getConsoleConfigurationName());
+ ConsoleExtension consoleExtension = ConsoleExtensionManager.getConsoleExtension(cc.getHibernateExtension());
+ consoleExtension.launchExporters(configuration, mode, launch, monitor);
+
+ /* The code is moved to consoleExtension and delegated method is called instead.
+
List<ExporterFactory> exporterFactories = attributes.getExporterFactories();
for (Iterator<ExporterFactory> iter = exporterFactories.iterator(); iter.hasNext();) {
ExporterFactory exFactory = iter.next();
@@ -327,7 +330,7 @@
throw new CoreException(HibernateConsolePlugin.throwableToStatus(new HibernateConsoleRuntimeException(HibernateConsoleMessages.CodeGenerationLaunchDelegate_received_noclassdeffounderror,e), 666));
} finally {
monitor.done();
- }
+ }*/
}
Modified: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/.classpath
===================================================================
--- branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/.classpath 2011-11-16 22:35:21 UTC (rev 36386)
+++ branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/.classpath 2011-11-16 23:07:19 UTC (rev 36387)
@@ -1,35 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry exported="true" kind="lib" path="lib/bsh-core-2.0b4.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/optional/ehcache/ehcache-core-2.4.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/optional/ehcache/hibernate-ehcache-4.0.0.CR3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/optional/infinispan/hibernate-infinispan-4.0.0.CR3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/optional/infinispan/i18nlog-1.0.10.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/optional/infinispan/infinispan-core-5.0.0.CR4.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/optional/infinispan/jboss-marshalling-1.3.0.CR9.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/optional/infinispan/jboss-marshalling-river-1.3.0.CR9.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/optional/infinispan/jboss-transaction-api-1.0.1.GA.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/optional/infinispan/jgroups-2.12.0.Final.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/optional/infinispan/rhq-pluginAnnotations-3.0.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/optional/proxool/hibernate-proxool-4.0.0.CR3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/optional/proxool/proxool-0.8.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jpa/hibernate-entitymanager-4.0.0.CR3.jar" sourcepath="C:/Documents and Settings/dgeraskov/.m2/repository/org/hibernate/hibernate-entitymanager/4.0.0.CR3/hibernate-entitymanager-4.0.0.CR3-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/optional/c3p0/c3p0-0.9.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/optional/c3p0/hibernate-c3p0-4.0.0.CR3.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.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.CR2.jar" sourcepath="C:/Documents and Settings/dgeraskov/.m2/repository/org/hibernate/common/hibernate-commons-annotations/4.0.0.CR2/hibernate-commons-annotations-4.0.0.CR2-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/required/hibernate-core-4.0.0.CR3.jar" sourcepath="C:/Documents and Settings/dgeraskov/.m2/repository/org/hibernate/hibernate-core/4.0.0.CR3/hibernate-core-4.0.0.CR3-sources.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.0.GA.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/required/jboss-logging-3.0.0.GA.jar" sourcepath="C:/Documents and Settings/dgeraskov/.m2/repository/org/jboss/logging/jboss-logging/3.0.0.GA/jboss-logging-3.0.0.GA-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/required/jta-1.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="lib" path="lib/tools/hibernate-tools-3.5.0.Alpha.jar" sourcepath="C:/dev/workspaces/RedHat/_Git/dgeraskov/hibernate-tools/target/hibernate-tools-3.5.0.Alpha-SNAPSHOT-sources.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <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/log4j-1.2.15.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.5.8.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.5.8.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/bsh-core-2.0b4.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/optional/ehcache/ehcache-core-2.4.3.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/optional/ehcache/hibernate-ehcache-4.0.0.CR3.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/optional/infinispan/hibernate-infinispan-4.0.0.CR3.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/optional/infinispan/i18nlog-1.0.10.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/optional/infinispan/infinispan-core-5.0.0.CR4.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/optional/infinispan/jboss-marshalling-1.3.0.CR9.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/optional/infinispan/jboss-marshalling-river-1.3.0.CR9.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/optional/infinispan/jboss-transaction-api-1.0.1.GA.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/optional/infinispan/jgroups-2.12.0.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/optional/infinispan/rhq-pluginAnnotations-3.0.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/optional/proxool/hibernate-proxool-4.0.0.CR3.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/optional/proxool/proxool-0.8.3.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jpa/hibernate-entitymanager-4.0.0.CR3.jar" sourcepath="C:/Documents and Settings/dgeraskov/.m2/repository/org/hibernate/hibernate-entitymanager/4.0.0.CR3/hibernate-entitymanager-4.0.0.CR3-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/optional/c3p0/c3p0-0.9.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/optional/c3p0/hibernate-c3p0-4.0.0.CR3.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.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.CR2.jar" sourcepath="C:/Documents and Settings/dgeraskov/.m2/repository/org/hibernate/common/hibernate-commons-annotations/4.0.0.CR2/hibernate-commons-annotations-4.0.0.CR2-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/required/hibernate-core-4.0.0.CR3.jar" sourcepath="C:/Documents and Settings/dgeraskov/.m2/repository/org/hibernate/hibernate-core/4.0.0.CR3/hibernate-core-4.0.0.CR3-sources.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.0.GA.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/required/jboss-logging-3.0.0.GA.jar" sourcepath="C:/Documents and Settings/dgeraskov/.m2/repository/org/jboss/logging/jboss-logging/3.0.0.GA/jboss-logging-3.0.0.GA-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/required/jta-1.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="lib" path="lib/tools/hibernate-tools-3.5.0.Alpha.jar" sourcepath="C:/dev/workspaces/RedHat/_Git/dgeraskov/hibernate-tools/target/hibernate-tools-3.5.0.Alpha-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF
===================================================================
--- branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF 2011-11-16 22:35:21 UTC (rev 36386)
+++ branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF 2011-11-16 23:07:19 UTC (rev 36387)
@@ -32,4 +32,9 @@
lib/jpa/hibernate-entitymanager-4.0.0.CR3.jar,
lib/bsh-core-2.0b4.jar,
lib/tools/hibernate-tools-3.5.0.Alpha.jar,
+ lib/tools/freemarker.jar,
+ lib/tools/jtidy-r8-20060801.jar,
+ lib/log4j-1.2.15.jar,
+ lib/slf4j-api-1.5.8.jar,
+ lib/slf4j-log4j12-1.5.8.jar,
.
Modified: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/build.properties
===================================================================
--- branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/build.properties 2011-11-16 22:35:21 UTC (rev 36386)
+++ branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/build.properties 2011-11-16 23:07:19 UTC (rev 36387)
@@ -31,4 +31,9 @@
lib/optional/proxool/proxool-0.8.3.jar,\
lib/bsh-core-2.0b4.jar,\
lib/tools/hibernate-tools-3.5.0.Alpha.jar,\
- plugin.properties
+ plugin.properties,\
+ lib/tools/freemarker.jar,\
+ lib/tools/jtidy-r8-20060801.jar,\
+ lib/log4j-1.2.15.jar,\
+ lib/slf4j-api-1.5.8.jar,\
+ lib/slf4j-log4j12-1.5.8.jar
Added: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/lib/log4j-1.2.15.jar
===================================================================
(Binary files differ)
Property changes on: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/lib/log4j-1.2.15.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/lib/slf4j-api-1.5.8.jar
===================================================================
(Binary files differ)
Property changes on: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/lib/slf4j-api-1.5.8.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/lib/slf4j-log4j12-1.5.8.jar
===================================================================
(Binary files differ)
Property changes on: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/lib/slf4j-log4j12-1.5.8.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/lib/tools/freemarker.jar
===================================================================
(Binary files differ)
Property changes on: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/lib/tools/freemarker.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/lib/tools/jtidy-r8-20060801.jar
===================================================================
(Binary files differ)
Property changes on: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/lib/tools/jtidy-r8-20060801.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java
===================================================================
--- branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java 2011-11-16 22:35:21 UTC (rev 36386)
+++ branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java 2011-11-16 23:07:19 UTC (rev 36387)
@@ -35,12 +35,9 @@
import org.hibernate.console.ext.QueryResultImpl;
import org.hibernate.console.preferences.ConsoleConfigurationPreferences;
import org.hibernate.console.preferences.PreferencesClassPathUtils;
-import org.hibernate.eclipse.console.ext.CompletionProposalsResult;
import org.hibernate.service.BasicServiceRegistry;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.internal.BasicServiceRegistryImpl;
-import org.hibernate.tool.ide.completion.HQLCodeAssist;
-import org.hibernate.tool.ide.completion.IHQLCodeAssist;
/**
*
@@ -72,8 +69,8 @@
}
@Override
- public QueryResult executeHQLQuery(String hql,
- QueryInputModel queryParameters) {
+ public QueryResult executeHQLQuery(final String hql,
+ final QueryInputModel queryParameters) {
Session session = null;
try {
try {
Modified: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/ConsoleExtension4_0.java
===================================================================
--- branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/ConsoleExtension4_0.java 2011-11-16 22:35:21 UTC (rev 36386)
+++ branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/ConsoleExtension4_0.java 2011-11-16 23:07:19 UTC (rev 36387)
@@ -151,14 +151,14 @@
if (attributes.isReverseEngineer()) {
monitor.subTask(HibernateConsoleMessages.CodeGenerationLaunchDelegate_reading_jdbc_metadata);
}
- final Configuration cfg = buildConfiguration(attributes, cc, ResourcesPlugin.getWorkspace().getRoot());
+ final Configuration cfg = buildConfiguration(attributes, (HibernateExtension4_0) cc.getHibernateExtension(), ResourcesPlugin.getWorkspace().getRoot());
monitor.worked(1);
if (monitor.isCanceled())
return null;
- return (ArtifactCollector) cc.execute(new Command() {
+ return (ArtifactCollector) hibernateExtension.execute(new Command() {
public Object execute() {
ArtifactCollector artifactCollector = new ArtifactCollector();
@@ -200,7 +200,7 @@
}
- private Configuration buildConfiguration(final ExporterAttributes attributes, ConsoleConfiguration cc, IWorkspaceRoot root) {
+ private Configuration buildConfiguration(final ExporterAttributes attributes, HibernateExtension4_0 cc, IWorkspaceRoot root) {
final boolean reveng = attributes.isReverseEngineer();
final String reverseEngineeringStrategy = attributes.getRevengStrategy();
final boolean preferBasicCompositeids = attributes.isPreferBasicCompositeIds();
@@ -262,7 +262,7 @@
return cfg;
} else {
cc.build();
- final Configuration configuration = ((HibernateExtension4_0)cc.getHibernateExtension()).getConfiguration();
+ final Configuration configuration = cc.getConfiguration();
cc.execute(new Command() {
public Object execute() {
13 years, 1 month
JBoss Tools SVN: r36386 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-11-16 17:35:21 -0500 (Wed, 16 Nov 2011)
New Revision: 36386
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/richfaces-palette.xml
Log:
https://issues.jboss.org/browse/JBIDE-10149
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/richfaces-palette.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/richfaces-palette.xml 2011-11-16 22:23:55 UTC (rev 36385)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/richfaces-palette.xml 2011-11-16 22:35:21 UTC (rev 36386)
@@ -8,26 +8,12 @@
SCOPE="project" URI="http://richfaces.org/rich" add_taglib="true"
library-version="" model-entity="SharableGroupHTML">
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:editor&gt;</code><br><code>&lt;/rich:editor&gt;</code><br><b>Attributes:</b><br><code></code>"
- ENDTEXT="</editor>" ICON="" NAME="editor" REFORMAT="yes"
- SCOPE="project" STARTTEXT="<editor>" large-icon="" model-entity="SharableMacroHTML"/>
- <MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:notifyMessages&gt;</code><br><code>&lt;/rich:notifyMessages&gt;</code><br><b>Attributes:</b><br><code></code>"
- ENDTEXT="</notifyMessages>" ICON="" NAME="notifyMessages"
- REFORMAT="yes" SCOPE="project" STARTTEXT="<notifyMessages>"
- large-icon="" model-entity="SharableMacroHTML"/>
- <MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:orderingList&gt;</code><br><code>&lt;/rich:orderingList&gt;</code><br><b>Attributes:</b><br><code>activeItem, ajaxKeys, binding, bottomControlLabel, captionLabel, columnClasses, componentState, controlsHorizontalAlign, controlsType, controlsVerticalAlign, converter, downControlLabel, fastOrderControlsVisible, id, immediate, listHeight, listWidth, onbottomclick, onclick, ondblclick, ondownclick, onheaderclick, onmousemove, onmouseout, onmouseover, onorderchanged, ontopclick, onupclick, orderControlsVisible, rendered, required, rowClasses, rowKeyConverter, rowKeyVar, rows, selection, showButtonLabels, style, styleClass, topControlLabel, upControlLabel, validator, value, valueChangeListener, var</code>"
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:orderingList&gt;</code><br><code>&lt;/rich:orderingList&gt;</code><br><b>Attributes:</b><br><code></code>"
ENDTEXT="</orderingList>"
ICON="%Icons%/JBoss RichFaces/orderingList" NAME="orderingList"
REFORMAT="yes" SCOPE="project" STARTTEXT="<orderingList>"
large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:pickList&gt;</code><br><code>&lt;/rich:pickList&gt;</code><br><b>Attributes:</b><br><code>binding, controlClass, converter, converterMessage, copyAllControlLabel, copyControlLabel, disabled, disabledStyle, disabledStyleClass, enabledStyle, enabledStyleClass, id, immediate, listClass, listsHeight, moveControlsVerticalAlign, onblur, onclick, ondblclick, onfocus, onkeydown, onkeypress, onkeyup, onlistchanged, onmousedown, onmousemove, onmouseout, onmouseover, onmouseup, removeAllControlLabel, removeControlLabel, rendered, required, requiredMessage, showButtonsLabel, sourceListWidth, style, styleClass, switchByClick, targetListWidth, title, validator, validatorMessage, value, valueChangeListener</code>"
- ENDTEXT="</pickList>" ICON="%Icons%/JBoss RichFaces/pickList"
- NAME="pickList" REFORMAT="yes" SCOPE="project"
- STARTTEXT="<pickList>" large-icon="" model-entity="SharableMacroHTML"/>
- <MacroHTML
DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:treeModelAdaptor&gt;</code><br><code>&lt;/rich:treeModelAdaptor&gt;</code><br><b>Attributes:</b><br><code></code>"
ENDTEXT="</treeModelAdaptor>" ICON="" NAME="treeModelAdaptor"
REFORMAT="yes" SCOPE="project" STARTTEXT="<treeModelAdaptor>"
@@ -38,6 +24,11 @@
NAME="toolbar" REFORMAT="yes" SCOPE="project"
STARTTEXT="<toolbar>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:notifyMessage&gt;</code><br><code>&lt;/rich:notifyMessage&gt;</code><br><b>Attributes:</b><br><code></code>"
+ ENDTEXT="</notifyMessage>" ICON="" NAME="notifyMessage"
+ REFORMAT="yes" SCOPE="project" STARTTEXT="<notifyMessage>"
+ large-icon="" model-entity="SharableMacroHTML"/>
+ <MacroHTML
DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:tab&gt;</code><br><code>&lt;/rich:tab&gt;</code><br><b>Attributes:</b><br><code></code>"
ENDTEXT="</tab>" ICON="%Icons%/JBoss RichFaces/tab" NAME="tab"
REFORMAT="yes" SCOPE="project" STARTTEXT="<tab>" large-icon="" model-entity="SharableMacroHTML"/>
@@ -64,6 +55,11 @@
STARTTEXT="<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>\\n|"
large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:notifyStack&gt;</code><br><code>&lt;/rich:notifyStack&gt;</code><br><b>Attributes:</b><br><code></code>"
+ ENDTEXT="</notifyStack>" ICON="" NAME="notifyStack"
+ REFORMAT="yes" SCOPE="project" STARTTEXT="<notifyStack>"
+ large-icon="" model-entity="SharableMacroHTML"/>
+ <MacroHTML
DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:extendedDataTable&gt;</code><br><code>&lt;/rich:extendedDataTable&gt;</code><br><b>Attributes:</b><br><code></code>"
ENDTEXT="</extendedDataTable>"
ICON="%Icons%/JBoss RichFaces/dataTable" NAME="extendedDataTable"
@@ -103,6 +99,11 @@
NAME="menuItem" REFORMAT="yes" SCOPE="project"
STARTTEXT="<menuItem>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:togglePanelItem&gt;</code><br><code>&lt;/rich:togglePanelItem&gt;</code><br><b>Attributes:</b><br><code></code>"
+ ENDTEXT="</togglePanelItem>" ICON="" NAME="togglePanelItem"
+ REFORMAT="yes" SCOPE="project" STARTTEXT="<togglePanelItem>"
+ large-icon="" model-entity="SharableMacroHTML"/>
+ <MacroHTML
DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:fileUpload&gt;</code><br><code>&lt;/rich:fileUpload&gt;</code><br><b>Attributes:</b><br><code></code>"
ENDTEXT="</fileUpload>" ICON="" NAME="fileUpload" REFORMAT="yes"
SCOPE="project" STARTTEXT="<fileUpload>" large-icon="" model-entity="SharableMacroHTML"/>
@@ -111,11 +112,6 @@
ENDTEXT="</select>" ICON="" NAME="select" REFORMAT="yes"
SCOPE="project" STARTTEXT="<select>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
- DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:togglePanelItem&gt;</code><br><code>&lt;/rich:togglePanelItem&gt;</code><br><b>Attributes:</b><br><code></code>"
- ENDTEXT="</togglePanelItem>" ICON="" NAME="togglePanelItem"
- REFORMAT="yes" SCOPE="project" STARTTEXT="<togglePanelItem>"
- large-icon="" model-entity="SharableMacroHTML"/>
- <MacroHTML
DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:inputNumberSpinner&gt;</code><br><code>&lt;/rich:inputNumberSpinner&gt;</code><br><b>Attributes:</b><br><code></code>"
ENDTEXT="</inputNumberSpinner>"
ICON="%Icons%/JBoss RichFaces/inputNumberSpinner"
@@ -150,6 +146,10 @@
REFORMAT="yes" SCOPE="project" STARTTEXT="<popupPanel>"
large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:editor&gt;</code><br><code>&lt;/rich:editor&gt;</code><br><b>Attributes:</b><br><code></code>"
+ ENDTEXT="</editor>" ICON="" NAME="editor" REFORMAT="yes"
+ SCOPE="project" STARTTEXT="<editor>" large-icon="" model-entity="SharableMacroHTML"/>
+ <MacroHTML
DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:componentControl&gt;</code><br><code>&lt;/rich:componentControl&gt;</code><br><b>Attributes:</b><br><code></code>"
ENDTEXT="</componentControl>" ICON="" NAME="componentControl"
REFORMAT="yes" SCOPE="project" STARTTEXT="<componentControl>"
@@ -176,6 +176,11 @@
ENDTEXT="</jQuery>" ICON="" NAME="jQuery" REFORMAT="yes"
SCOPE="project" STARTTEXT="<jQuery>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:pickList&gt;</code><br><code>&lt;/rich:pickList&gt;</code><br><b>Attributes:</b><br><code></code>"
+ ENDTEXT="</pickList>" ICON="%Icons%/JBoss RichFaces/pickList"
+ NAME="pickList" REFORMAT="yes" SCOPE="project"
+ STARTTEXT="<pickList>" large-icon="" model-entity="SharableMacroHTML"/>
+ <MacroHTML
DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:tabPanel&gt;</code><br><code>&lt;/rich:tabPanel&gt;</code><br><b>Attributes:</b><br><code></code>"
ENDTEXT="</tabPanel>" ICON="%Icons%/JBoss RichFaces/tabPanel"
NAME="tabPanel" REFORMAT="yes" SCOPE="project"
@@ -235,6 +240,10 @@
REFORMAT="yes" SCOPE="project" STARTTEXT="<progressBar>"
large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:notify&gt;</code><br><code>&lt;/rich:notify&gt;</code><br><b>Attributes:</b><br><code></code>"
+ ENDTEXT="</notify>" ICON="" NAME="notify" REFORMAT="yes"
+ SCOPE="project" STARTTEXT="<notify>" large-icon="" model-entity="SharableMacroHTML"/>
+ <MacroHTML
DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:inplaceSelect&gt;</code><br><code>&lt;/rich:inplaceSelect&gt;</code><br><b>Attributes:</b><br><code></code>"
ENDTEXT="</inplaceSelect>" ICON="" NAME="inplaceSelect"
REFORMAT="yes" SCOPE="project" STARTTEXT="<inplaceSelect>"
@@ -313,6 +322,11 @@
NAME="treeNode" REFORMAT="yes" SCOPE="project"
STARTTEXT="<treeNode>" large-icon="" model-entity="SharableMacroHTML"/>
<MacroHTML
+ DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:notifyMessages&gt;</code><br><code>&lt;/rich:notifyMessages&gt;</code><br><b>Attributes:</b><br><code></code>"
+ ENDTEXT="</notifyMessages>" ICON="" NAME="notifyMessages"
+ REFORMAT="yes" SCOPE="project" STARTTEXT="<notifyMessages>"
+ large-icon="" model-entity="SharableMacroHTML"/>
+ <MacroHTML
DESCRIPTION="<b>Syntax:</b><br><code>&lt;rich:tooltip&gt;</code><br><code>&lt;/rich:tooltip&gt;</code><br><b>Attributes:</b><br><code></code>"
ENDTEXT="</tooltip>" ICON="%Icons%/JBoss RichFaces/toolTip"
NAME="tooltip" REFORMAT="yes" SCOPE="project"
13 years, 1 month
JBoss Tools SVN: r36384 - in trunk/common/plugins/org.jboss.tools.common.model: src/org/jboss/tools/common/model/project and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-11-16 17:15:50 -0500 (Wed, 16 Nov 2011)
New Revision: 36384
Modified:
trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ProjectHome.java
Log:
JBIDE-10177
https://issues.jboss.org/browse/JBIDE-10177
Fix for default web content folder for XModel.
Modified: trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF 2011-11-16 21:29:02 UTC (rev 36383)
+++ trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF 2011-11-16 22:15:50 UTC (rev 36384)
@@ -79,6 +79,9 @@
org.eclipse.ltk.ui.refactoring;visibility:=reexport;bundle-version="3.5.100",
org.eclipse.wst.common.uriresolver;bundle-version="1.1.401",
org.eclipse.wst.common.modulecore;bundle-version="1.2.100",
+ org.eclipse.jst.j2ee;bundle-version="1.1.500",
+ org.eclipse.jst.j2ee.core;bundle-version="1.2.100",
+ org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200",
org.eclipse.jem.util;bundle-version="2.1.2",
org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100",
org.eclipse.core.resources;visibility:=reexport;bundle-version="3.7.100",
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ProjectHome.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ProjectHome.java 2011-11-16 21:29:02 UTC (rev 36383)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ProjectHome.java 2011-11-16 22:15:50 UTC (rev 36384)
@@ -11,6 +11,8 @@
package org.jboss.tools.common.model.project;
import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
@@ -18,14 +20,19 @@
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
+import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.ModuleCoreNature;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
import org.jboss.tools.common.model.XModelConstants;
import org.jboss.tools.common.model.XModelObjectConstants;
import org.jboss.tools.common.model.plugin.ModelPlugin;
@@ -98,7 +105,11 @@
}
//Taken from J2EEUtils and modified
- public static IPath getWebInfPath(IProject project) {
+ public static IPath getWebInfPath(IProject project) {
+ IPath[] ps = getWebInfPaths(project);
+ if(ps.length > 0) {
+ return ps[0];
+ }
IVirtualComponent component = ComponentCore.createComponent(project);
if(component == null || component.getRootFolder() == null) return null;
IVirtualFolder webInfDir = component.getRootFolder().getFolder(new Path("/WEB-INF")); //$NON-NLS-1$
@@ -109,17 +120,29 @@
public static IPath[] getWebInfPaths(IProject project) {
IVirtualComponent component = ComponentCore.createComponent(project);
if(component != null && component.getRootFolder() != null) {
- IVirtualFolder webInfDir = component.getRootFolder().getFolder(new Path("/WEB-INF")); //$NON-NLS-1$
- if(webInfDir.exists()) {
- IContainer[] cs = webInfDir.getUnderlyingFolders();
- List<IPath> ps = new ArrayList<IPath>();
- for (IContainer c: cs) {
- if(c.exists()) {
- ps.add(c.getFullPath());
+ List<IPath> ps = new ArrayList<IPath>();
+ IContainer[] cs = getWebRootFolders(project, true);
+ for (IContainer c: cs) {
+ if(c.exists()) {
+ IFolder f = c.getFolder(new Path("/WEB-INF")); //$NON-NLS-1$
+ if(f.exists()) {
+ ps.add(f.getFullPath());
}
}
- return ps.toArray(new IPath[0]);
}
+ return ps.toArray(new IPath[0]);
+
+// IVirtualFolder webInfDir = component.getRootFolder().getFolder(new Path("/WEB-INF")); //$NON-NLS-1$
+// if(webInfDir.exists()) {
+// IContainer[] cs = webInfDir.getUnderlyingFolders();
+// List<IPath> ps = new ArrayList<IPath>();
+// for (IContainer c: cs) {
+// if(c.exists()) {
+// ps.add(c.getFullPath());
+// }
+// }
+// return ps.toArray(new IPath[0]);
+// }
}
return new IPath[0];
}
@@ -127,17 +150,30 @@
public static IPath[] getWebContentPaths(IProject project) {
IVirtualComponent component = ComponentCore.createComponent(project);
if(component != null && component.getRootFolder() != null) {
- IVirtualFolder webDir = component.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
- if(webDir.exists()) {
- IContainer[] cs = webDir.getUnderlyingFolders();
- List<IPath> ps = new ArrayList<IPath>();
- for (IContainer c: cs) {
- if(c.exists()) {
- ps.add(c.getFullPath());
+
+ List<IPath> ps = new ArrayList<IPath>();
+ IContainer[] cs = getWebRootFolders(project, true);
+ for (IContainer c: cs) {
+ if(c.exists()) {
+ IFolder f = c.getFolder(new Path("/WEB-INF")); //$NON-NLS-1$
+ if(f.exists()) {
+ ps.add(f.getFullPath());
}
}
- return ps.toArray(new IPath[0]);
}
+ return ps.toArray(new IPath[0]);
+
+// IVirtualFolder webDir = component.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
+// if(webDir.exists()) {
+// IContainer[] cs = webDir.getUnderlyingFolders();
+// List<IPath> ps = new ArrayList<IPath>();
+// for (IContainer c: cs) {
+// if(c.exists()) {
+// ps.add(c.getFullPath());
+// }
+// }
+// return ps.toArray(new IPath[0]);
+// }
}
return new IPath[0];
}
@@ -147,10 +183,83 @@
IVirtualComponent vc = ComponentCore.createComponent(project);
if (vc == null || vc.getRootFolder() == null)
return null;
+ IContainer[] cs = getWebRootFolders(project, true);
+ for (IContainer c: cs) {
+ if(c.exists()) {
+ return c.getFullPath();
+ }
+ }
if (ModuleCoreNature.isFlexibleProject(project)) {
modulePath = vc.getRootFolder().getWorkspaceRelativePath();
}
return modulePath;
}
+
+ public static IContainer[] getWebRootFolders(IProject project, boolean ignoreDerived) {
+ IFacetedProject facetedProject = null;
+ try {
+ facetedProject = ProjectFacetsManager.create(project);
+ } catch (CoreException e) {
+ ModelPlugin.getDefault().logError(e);
+ }
+ if(facetedProject!=null && facetedProject.getProjectFacetVersion(IJ2EEFacetConstants.DYNAMIC_WEB_FACET)!=null) {
+ IVirtualComponent component = ComponentCore.createComponent(project);
+ if(component!=null) {
+ IVirtualFolder webRootVirtFolder = component.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
+
+ IPath defaultPath = getDefaultDeploymentDescriptorFolder(webRootVirtFolder);
+
+ IContainer[] folders = webRootVirtFolder.getUnderlyingFolders();
+ if(folders.length > 1){
+ ArrayList<IContainer> containers = new ArrayList<IContainer>();
+ for(IContainer container : folders){
+ if(!ignoreDerived || !container.isDerived(IResource.CHECK_ANCESTORS)) {
+ if(defaultPath!=null && defaultPath.equals(container.getFullPath())) {
+ containers.add(0, container); // Put default root folder to the first position of the list
+ } else {
+ containers.add(container);
+ }
+ }
+ }
+ return containers.toArray(new IContainer[containers.size()]);
+ } else {
+ return folders;
+ }
+ }
+ }
+ return EMPTY_ARRAY;
+ }
+
+ private static final IContainer[] EMPTY_ARRAY = new IContainer[0];
+ private static boolean WTP_3_3_0 = false;
+
+ /**
+ * Returns all the web root folders of the project.
+ * If the project is not a web project then the method will return an empty array.
+ * All the derived resources or resources belonged to derived containers will be eliminated.
+ * If some folder is set as default web root source folder (available since WTP 3.3.1) then this folder will be places in the very beginning of the result array.
+ * @param project
+ * @return
+ */
+ public static IPath getDefaultDeploymentDescriptorFolder(IVirtualFolder folder) {
+ if(!WTP_3_3_0) {
+ try {
+ Method getDefaultDeploymentDescriptorFolder = J2EEModuleVirtualComponent.class.getMethod("getDefaultDeploymentDescriptorFolder", IVirtualFolder.class); //$NON-NLS-1$
+ return (IPath) getDefaultDeploymentDescriptorFolder.invoke(null, folder);
+ } catch (NoSuchMethodException nsme) {
+ // Not available in this WTP version, let's ignore it
+ WTP_3_3_0 = true;
+ } catch (IllegalArgumentException e) {
+ ModelPlugin.getDefault().logError(e);
+ } catch (IllegalAccessException e) {
+ ModelPlugin.getDefault().logError(e);
+ } catch (InvocationTargetException e) {
+ // Not available in this WTP version, let's ignore it
+ WTP_3_3_0 = true;
+ }
+ }
+ return null;
+ }
+
}
13 years, 1 month
JBoss Tools SVN: r36383 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-11-16 16:29:02 -0500 (Wed, 16 Nov 2011)
New Revision: 36383
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddQualifiersToBeanProcessor.java
Log:
Quickfix and Wizard for fixing ambigious injection warning is confusing https://issues.jboss.org/browse/JBIDE-9940
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddQualifiersToBeanProcessor.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddQualifiersToBeanProcessor.java 2011-11-16 20:54:41 UTC (rev 36382)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddQualifiersToBeanProcessor.java 2011-11-16 21:29:02 UTC (rev 36383)
@@ -14,14 +14,18 @@
import java.util.List;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.refactoring.CompilationUnitChange;
+import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
import org.eclipse.text.edits.MultiTextEdit;
import org.jboss.tools.cdi.core.CDICoreMessages;
@@ -76,12 +80,29 @@
if(!isFileCorrect(beanFile)){
return status;
}
+ return status;
+ }
+
+ private ICompilationUnit getCompilationUnit(IFile file) throws CoreException{
+ IProject project = file.getProject();
+ IJavaProject javaProject = (IJavaProject)project.getNature(JavaCore.NATURE_ID);
+ IJavaElement element = javaProject.findElement(file.getProjectRelativePath());
+ if(element instanceof ICompilationUnit)
+ return (ICompilationUnit)element;
- createRootChange();
+ return null;
+ }
+
+ @Override
+ public Change createChange(IProgressMonitor pm) throws CoreException,
+ OperationCanceledException {
+ rootChange = new CompositeChange(label);
IFile file = (IFile)selectedBean.getBeanClass().getResource();
- ICompilationUnit compilationUnit = EclipseUtil.getCompilationUnit(file);
+ ICompilationUnit original = EclipseUtil.getCompilationUnit(file);
+ ICompilationUnit compilationUnit = original.getWorkingCopy(pm);
+
CompilationUnitChange fileChange = new CompilationUnitChange(file.getName(), compilationUnit);
MultiTextEdit edit = new MultiTextEdit();
@@ -89,9 +110,11 @@
MarkerResolutionUtils.addQualifiersToBean(qualifiers, selectedBean, compilationUnit, edit);
IFile file2 = (IFile)injectionPoint.getClassBean().getResource();
- ICompilationUnit compilationUnit2 = injectionPoint.getClassBean().getBeanClass().getCompilationUnit();
+ ICompilationUnit original2 = injectionPoint.getClassBean().getBeanClass().getCompilationUnit();
+ ICompilationUnit compilationUnit2 = original2.getWorkingCopy(pm);
- if(!compilationUnit.equals(compilationUnit2)){
+ if(!original.equals(original2)){
+ compilationUnit.discardWorkingCopy();
if(edit.getChildrenSize() > 0){
fileChange.setEdit(edit);
rootChange.add(fileChange);
@@ -109,11 +132,12 @@
fileChange.setEdit(edit);
rootChange.add(fileChange);
}
- return status;
+ compilationUnit.discardWorkingCopy();
+ return rootChange;
}
protected void createRootChange(){
- rootChange = new CompositeChange(label);
+
}
public IBean getSelectedBean(){
13 years, 1 month
JBoss Tools SVN: r36379 - trunk/download.jboss.org/jbosstools/updates/requirements/swt.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-11-16 15:02:41 -0500 (Wed, 16 Nov 2011)
New Revision: 36379
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/swt/build-3.6.2....
Log:
update build script / readme for regen/fix metadata (JBDS-1932)
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/swt/build-3.6.2....
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/swt/build-3.6.2.... 2011-11-16 20:02:23 UTC (rev 36378)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/swt/build-3.6.2.... 2011-11-16 20:02:41 UTC (rev 36379)
@@ -1,10 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<project default="default">
<target name="default">
- <echo>Run like this:
+<echo>
+1. You need a folder local to this one called 3.6.2.v3660-patched_JBDS-1648_source. You can create it as an rsync copy of 3.6.2.v3660-patched_JBDS-1648.
-java -cp /home/nboldt/eclipse/37clean/eclipse/plugins/org.eclipse.equinox.launcher_*.jar org.eclipse.equinox.launcher.Main -consoleLog -nosplash -data /tmp -application org.eclipse.equinox.p2.publisher.UpdateSitePublisher -metadataRepository file://${basedir}/result -artifactRepository file://${basedir}/result -source ${basedir}/3.6.2.v3660-patched_JBDS-1648 -publishArtifacts
+2. Run this script to regen metadata:
+java -cp /home/nboldt/eclipse/37clean/eclipse/plugins/org.eclipse.equinox.launcher_*.jar org.eclipse.equinox.launcher.Main -consoleLog -nosplash -data /tmp -application org.eclipse.equinox.p2.publisher.UpdateSitePublisher -metadataRepository file://${basedir}/3.6.2.v3660-patched_JBDS-1648 -artifactRepository file://${basedir}/3.6.2.v3660-patched_JBDS-1648 -source ${basedir}/3.6.2.v3660-patched_JBDS-1648_source -publishArtifacts
+
+3. Because p2 ignores the metadataRepositoryName, artifactRepositoryName, and repositoryName flags, you'll have to go edit the metadata files yourself. p2.publish.* ant tasks don't work either.
+
+Look for "result - metadata" and fix that value to be "JBoss SWT Patches".
+
+4. Commit changes and push to download.jboss.org.
+
</echo>
</target>
</project>
13 years, 1 month