JBoss Tools SVN: r19677 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-01-07 16:41:42 -0500 (Thu, 07 Jan 2010)
New Revision: 19677
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java
Log:
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2010-01-07 19:05:18 UTC (rev 19676)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2010-01-07 21:41:42 UTC (rev 19677)
@@ -86,6 +86,7 @@
* This method is called when the plug-in is stopped
*/
public void stop(BundleContext context) throws Exception {
+ JBossServerUISharedImages.instance().cleanup();
super.stop(context);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2010-01-07 19:05:18 UTC (rev 19676)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2010-01-07 21:41:42 UTC (rev 19677)
@@ -89,45 +89,45 @@
descriptors.put(GENERIC_SERVER_IMAGE, ImageDescriptor.createFromImage((Image)images.get(GENERIC_SERVER_IMAGE)));
}
- private ImageDescriptor createImageDescriptor (Bundle pluginBundle, String relativePath)
- {
+ private ImageDescriptor createImageDescriptor (Bundle pluginBundle, String relativePath) {
return ImageDescriptor.createFromURL(pluginBundle.getEntry(relativePath));
}
- private static JBossServerUISharedImages instance() {
+ public static JBossServerUISharedImages instance() {
if (instance == null)
- return new JBossServerUISharedImages();
-
+ instance = new JBossServerUISharedImages();
return instance;
}
- public static Image getImage(String key)
- {
+ public static Image getImage(String key) {
return instance().image(key);
}
- public static ImageDescriptor getImageDescriptor(String key)
- {
+ public static ImageDescriptor getImageDescriptor(String key) {
return instance().descriptor(key);
}
- public Image image(String key)
- {
+ public Image image(String key) {
return (Image) images.get(key);
}
- public ImageDescriptor descriptor(String key)
- {
+ public ImageDescriptor descriptor(String key) {
return (ImageDescriptor) descriptors.get(key);
}
- protected void finalize() throws Throwable {
+ public void cleanup() {
Iterator<String> iter = images.keySet().iterator();
- while (iter.hasNext())
- {
+ while (iter.hasNext()) {
Image image = (Image) images.get(iter.next());
image.dispose();
}
+ images = null;
+ descriptors = null;
+ instance = null;
+ }
+
+ protected void finalize() throws Throwable {
+ cleanup();
super.finalize();
}
}
14 years, 3 months
JBoss Tools SVN: r19676 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2010-01-07 14:05:18 -0500 (Thu, 07 Jan 2010)
New Revision: 19676
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/TemplateWizardSelectionPage.java
Log:
OPEN - issue JBIDE-5562: Strange smooks apply template message type selection
https://jira.jboss.org/jira/browse/JBIDE-5562
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/TemplateWizardSelectionPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/TemplateWizardSelectionPage.java 2010-01-07 18:44:24 UTC (rev 19675)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/TemplateWizardSelectionPage.java 2010-01-07 19:05:18 UTC (rev 19676)
@@ -75,7 +75,7 @@
initInputTypeCombo(combo);
- GridData gd = new GridData(GridData.FILL_BOTH);
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
combo.setLayoutData(gd);
Composite separatorComposite = new Composite(main, SWT.NONE);
14 years, 3 months
JBoss Tools SVN: r19675 - in trunk/smooks/plugins: org.jboss.tools.smooks.runtime/META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2010-01-07 13:44:24 -0500 (Thu, 07 Jan 2010)
New Revision: 19675
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/META-INF/MANIFEST.MF
trunk/smooks/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF
trunk/smooks/plugins/org.jboss.tools.smooks.templating/META-INF/MANIFEST.MF
trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF
Log:
Adding qualifier to plug-in versions to fix issue with Smooks plug-ins not getting updated correctly (for https://jira.jboss.org/jira/browse/JBIDE-5606)
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/META-INF/MANIFEST.MF 2010-01-07 18:03:45 UTC (rev 19674)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/META-INF/MANIFEST.MF 2010-01-07 18:44:24 UTC (rev 19675)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.smooks.core;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.jboss.tools.smooks.core.SmooksCoreActivator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF 2010-01-07 18:03:45 UTC (rev 19674)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF 2010-01-07 18:44:24 UTC (rev 19675)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.jboss.tools.smooks.runtime
-Bundle-Version: 1.2.1
+Bundle-Version: 1.2.1.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.apache.commons.codec,
org.apache.commons.lang,
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.templating/META-INF/MANIFEST.MF
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.templating/META-INF/MANIFEST.MF 2010-01-07 18:03:45 UTC (rev 19674)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.templating/META-INF/MANIFEST.MF 2010-01-07 18:44:24 UTC (rev 19675)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.jboss.tools.smooks.templating;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2010-01-07 18:03:45 UTC (rev 19674)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2010-01-07 18:44:24 UTC (rev 19675)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.jboss.tools.smooks.ui;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.jboss.tools.smooks.configuration.SmooksConfigurationActivator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
14 years, 3 months
JBoss Tools SVN: r19674 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2010-01-07 13:03:45 -0500 (Thu, 07 Jan 2010)
New Revision: 19674
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLauncher.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/messages.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-5619
SmooksLauncher execution does not have access to localized messages
https://jira.jboss.org/jira/browse/JBIDE-5545
Change Smooks Run Configuration Output Labels to Match Task Descriptions in the Smooks Config Editor
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/Messages.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/Messages.java 2010-01-07 08:10:08 UTC (rev 19673)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/Messages.java 2010-01-07 18:03:45 UTC (rev 19674)
@@ -11,6 +11,9 @@
public static String SmooksLaunchConfigurationDelegate_Error_missing_artifact2;
public static String SmooksLaunchConfigurationDelegate_Error_Title;
public static String SmooksLauncher_Error_Do_Not_Support_Java_Inputs;
+ public static String SmooksLauncher_Templating_To_StreamResult;
+ public static String SmooksLauncher_Java_Mapping_Results;
+ public static String SmooksLauncher_Nothing_To_Display;
public static String SmooksLauncher_Error_Expected_Four_Args;
public static String SmooksLaunchShortcut_Exception_Occurred;
public static String SmooksLaunchShortcut_Message_Select_Config;
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java 2010-01-07 08:10:08 UTC (rev 19673)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLaunchConfigurationDelegate.java 2010-01-07 18:03:45 UTC (rev 19674)
@@ -20,13 +20,18 @@
package org.jboss.tools.smooks.launch;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
+import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Properties;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -43,6 +48,7 @@
import org.eclipse.jdt.launching.IVMRunner;
import org.eclipse.jdt.launching.VMRunnerConfiguration;
import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
@@ -120,17 +126,9 @@
private VMRunnerConfiguration buildRunnerConfig(ILaunchConfiguration launchConfig) throws CoreException {
List<String> classpath = new ArrayList<String>(Arrays.asList(getClasspath(launchConfig)));
- File wsRootDir = ResourcesPlugin.getWorkspace().getRoot().getRawLocation().toFile();
- File wsTempClasses = new File(wsRootDir, "temp/classes"); //$NON-NLS-1$
-
// We need to add the SmooksLauncher to the launch classpath because it will not be part of the projects
// classpath. Bit of a hack... there's probably a nicer way of doing this!!!
- addToCP(wsTempClasses, SmooksLauncher.class);
- addToCP(wsTempClasses, SmooksInputType.class);
- addToCP(wsTempClasses, ProcessNodeType.class);
- addToCP(wsTempClasses, ObjectSerializer.class);
- addToCP(wsTempClasses, MarshallingStrategy.class);
- addToCP(wsTempClasses, XPathMarshaller.class);
+ File wsTempClasses = copyLauncherResourcesToFilesys();
classpath.add(wsTempClasses.getAbsolutePath());
VMRunnerConfiguration runConfig= new VMRunnerConfiguration(SmooksLauncher.class.getName(), classpath.toArray(new String[classpath.size()]));
@@ -152,43 +150,82 @@
return runConfig;
}
- private void addToCP(File wsTempClasses, Class<?> theClass) throws CoreException {
- String className = theClass.getName().replace(".", "/") + ".class"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- URL classURI = getClass().getResource("/" + className); //$NON-NLS-1$
+ private File copyLauncherResourcesToFilesys() throws CoreException {
+ File wsRootDir = ResourcesPlugin.getWorkspace().getRoot().getRawLocation().toFile();
+ File wsTempClasses = new File(wsRootDir, "temp/launcher/classes"); //$NON-NLS-1$
- if(classURI != null) {
+ writeClassToFilesys(SmooksLauncher.class, wsTempClasses);
+ writeClassToFilesys(SmooksInputType.class, wsTempClasses);
+ writeClassToFilesys(ProcessNodeType.class, wsTempClasses);
+ writeClassToFilesys(ObjectSerializer.class, wsTempClasses);
+ writeClassToFilesys(MarshallingStrategy.class, wsTempClasses);
+ writeClassToFilesys(XPathMarshaller.class, wsTempClasses);
+
+ // Need to send the localized message strings to the launcher...
+ Properties localizedMessages = new Properties();
+ localizedMessages.setProperty("SmooksLauncher_Error_Do_Not_Support_Java_Inputs", Messages.SmooksLauncher_Error_Do_Not_Support_Java_Inputs);
+ localizedMessages.setProperty("SmooksLauncher_Error_Expected_Four_Args", Messages.SmooksLauncher_Error_Expected_Four_Args);
+ localizedMessages.setProperty("SmooksLauncher_Java_Mapping_Results", Messages.SmooksLauncher_Java_Mapping_Results);
+ localizedMessages.setProperty("SmooksLauncher_Templating_To_StreamResult", Messages.SmooksLauncher_Templating_To_StreamResult);
+ localizedMessages.setProperty("SmooksLauncher_Nothing_To_Display", Messages.SmooksLauncher_Nothing_To_Display);
+
+ try {
+ FileOutputStream messagesOutStream = getFilesysOutStream(SmooksLauncher.LOCALIZED_FILE_NAME, SmooksLauncher.class, wsTempClasses);
try {
- InputStream classStream = classURI.openStream();
+ localizedMessages.store(messagesOutStream, "Localized messages...");
+ } finally {
+ messagesOutStream.close();
+ }
+ } catch (IOException e) {
+ new CoreException(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, Messages.SmooksLaunchConfigurationDelegate_Error_Copying_Smooks_Launcher, e));
+ }
+
+ return wsTempClasses;
+ }
+
+ private void writeClassToFilesys(Class<?> theClass, File toDir) throws CoreException {
+ String className = theClass.getSimpleName() + ".class"; //$NON-NLS-1$
+ writeResourceToFilesys(className, theClass, toDir);
+ }
+
+ private void writeResourceToFilesys(String resource, Class<?> refClass, File toDir) {
+ String packagePath = refClass.getPackage().getName().replace(".", "/");
+ String resourcePath = "/" + packagePath + "/" + resource;
+ URL resourceURI = refClass.getResource(resourcePath);
+
+ if(resourceURI != null) {
+ try {
+ InputStream resourceStream = resourceURI.openStream();
- if(classStream != null) {
+ if(resourceStream != null) {
try {
- File classOutFile = new File(wsTempClasses, className);
- File classPackage = classOutFile.getParentFile();
+ File resourceOutFile = new File(toDir, resourcePath);
+ File resourcePackage = resourceOutFile.getParentFile();
- classPackage.mkdirs();
- if(classPackage.exists()) {
- FileOutputStream classOutStream = new FileOutputStream(classOutFile);
+ resourcePackage.mkdirs();
+ if(resourcePackage.exists()) {
+ FileOutputStream resourceOutStream = new FileOutputStream(resourceOutFile);
try {
byte[] readBuf = new byte[100];
int readCount = 0;
while(readCount != -1) {
- readCount = classStream.read(readBuf);
+ readCount = resourceStream.read(readBuf);
if(readCount != -1) {
- classOutStream.write(readBuf, 0, readCount);
+ resourceOutStream.write(readBuf, 0, readCount);
}
}
} finally {
try {
- classOutStream.flush();
+ resourceOutStream.flush();
} finally {
- classOutStream.close();
+ resourceOutStream.close();
}
}
}
} finally {
- classStream.close();
+ resourceStream.close();
}
}
} catch (IOException e) {
@@ -196,4 +233,15 @@
}
}
}
+
+ private FileOutputStream getFilesysOutStream(String resource, Class<?> refClass, File toDir) throws FileNotFoundException {
+ String packagePath = refClass.getPackage().getName().replace(".", "/");
+ String resourcePath = "/" + packagePath + "/" + resource;
+ File resourceOutFile = new File(toDir, resourcePath);
+ File resourcePackage = resourceOutFile.getParentFile();
+
+ resourcePackage.mkdirs();
+
+ return new FileOutputStream(resourceOutFile);
+ }
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLauncher.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLauncher.java 2010-01-07 08:10:08 UTC (rev 19673)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLauncher.java 2010-01-07 18:03:45 UTC (rev 19674)
@@ -23,9 +23,11 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.StringReader;
import java.util.Collection;
import java.util.HashSet;
+import java.util.Properties;
import java.util.Set;
import javax.xml.transform.stream.StreamSource;
@@ -44,18 +46,22 @@
* @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
*/
public class SmooksLauncher {
+
+ public static final String LOCALIZED_FILE_NAME = "localizedMessage.properties";
/**
* Launcher Main.
* @param args Args.
*/
public static void main(String[] args) throws IOException, SAXException {
+ Properties localizedMessages = loadLocalizedMessages();
+
if(args.length != 4) {
- throw new RuntimeException(Messages.SmooksLauncher_Error_Expected_Four_Args);
+ throw new RuntimeException(localizedMessages.getProperty("SmooksLauncher_Error_Expected_Four_Args"));
}
if(args[1].equals(SmooksInputType.INPUT_TYPE_JAVA)) {
- System.out.println(Messages.SmooksLauncher_Error_Do_Not_Support_Java_Inputs);
+ System.out.println(localizedMessages.getProperty("SmooksLauncher_Error_Do_Not_Support_Java_Inputs"));
} else {
File smooksConfig = new File(args[0]);
File input = new File(args[2]);
@@ -73,7 +79,7 @@
StringResult stringResult = new StringResult();
smooks.filterSource(new StreamSource(new FileInputStream(input)), stringResult, javaResult);
- System.out.println("[StreamResult ...]\n"); //$NON-NLS-1$
+ System.out.println("[" + localizedMessages.getProperty("SmooksLauncher_Templating_To_StreamResult") + " ...]\n"); //$NON-NLS-1$
System.out.println(" |--"); //$NON-NLS-1$
System.out.println(indent(stringResult.toString()));
System.out.println(" |--\n"); //$NON-NLS-1$
@@ -84,7 +90,7 @@
Collection<ObjectSerializer> serializedJavaResults = ObjectSerializer.serialize(javaResult);
if(!serializedJavaResults.isEmpty()) {
- System.out.println("[JavaResult Objects...]"); //$NON-NLS-1$
+ System.out.println("[" + localizedMessages.getProperty("SmooksLauncher_Java_Mapping_Results") + "...]"); //$NON-NLS-1$
for(ObjectSerializer serializedJavaResult : serializedJavaResults) {
System.out.println(" |--"); //$NON-NLS-1$
@@ -95,9 +101,7 @@
}
if(nothingDisplayed) {
- System.out.println("Nothing to Display:"); //$NON-NLS-1$
- System.out.println(" - No Java Mappings."); //$NON-NLS-1$
- System.out.println(" - No Templates Applied."); //$NON-NLS-1$
+ System.out.println(localizedMessages.getProperty("SmooksLauncher_Nothing_To_Display"));
}
} finally {
smooks.close();
@@ -105,6 +109,28 @@
}
}
+ private static Properties loadLocalizedMessages() {
+ Properties messages = new Properties();
+ InputStream messageStream = SmooksLauncher.class.getResourceAsStream(LOCALIZED_FILE_NAME);
+
+ try {
+ try {
+ messages.load(messageStream);
+ } catch (IOException e) {
+ System.out.println("Unexpected IOException reading classpath resource stream for '" + LOCALIZED_FILE_NAME + "'. " + e.getMessage());
+ e.printStackTrace();
+ }
+ } finally {
+ try {
+ messageStream.close();
+ } catch (IOException e) {
+ System.out.println("Unexpected IOException closing classpath resource stream for '" + LOCALIZED_FILE_NAME + "'.");
+ }
+ }
+
+ return messages;
+ }
+
private static void assertFile(File file, String name) {
if(!file.exists()) {
throw new RuntimeException("Specified '" + name + "' File '" + file.getAbsolutePath() + "' not found."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/messages.properties 2010-01-07 08:10:08 UTC (rev 19673)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/messages.properties 2010-01-07 18:03:45 UTC (rev 19674)
@@ -5,6 +5,9 @@
SmooksLaunchConfigurationDelegate_Error_missing_artifact2=' Smooks artifact. Download Smooks and add the Smooks jars to the Project classpath, or update your Maven POM to include the missing artifact.
SmooksLaunchConfigurationDelegate_Error_Title=Error
SmooksLauncher_Error_Do_Not_Support_Java_Inputs=Sorry... we don't support Java Inputs yet.
+SmooksLauncher_Templating_To_StreamResult=Stream Templating Result
+SmooksLauncher_Java_Mapping_Results=Java Mapping Results
+SmooksLauncher_Nothing_To_Display=Nothing to Display:\n - No Java Mappings.\n - No Templates Applied.
SmooksLauncher_Error_Expected_Four_Args=Expected 4 Launch arguments: <Smooks Config> <Input Type> <Input Path> <Node Types>
SmooksLaunchShortcut_Exception_Occurred=An exception occurred while testing the Smooks Configuration.
SmooksLaunchShortcut_Message_Select_Config=Select from the available Smooks Runtime Configurations.
14 years, 3 months
JBoss Tools SVN: r19673 - trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2010-01-07 03:10:08 -0500 (Thu, 07 Jan 2010)
New Revision: 19673
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java
Log:
rollback a small change which turn on the project Configuration combo at the first page of ESB wizard wrongly
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java 2010-01-07 07:45:50 UTC (rev 19672)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java 2010-01-07 08:10:08 UTC (rev 19673)
@@ -41,9 +41,9 @@
return ESBProjectConstant.ESB_PROJECT_FACET;
}
-// protected void createPresetPanel(Composite top) {
-// new Label(top, SWT.NONE);
-// }
+ protected void createPresetPanel(Composite top) {
+ new Label(top, SWT.NONE);
+ }
@Override
protected void validatePage() {
14 years, 3 months
JBoss Tools SVN: r19672 - trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-01-07 02:45:50 -0500 (Thu, 07 Jan 2010)
New Revision: 19672
Modified:
trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
Log:
Fix addServerRuntime() method to be working with older SWTBot version
Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2010-01-07 07:44:34 UTC (rev 19671)
+++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2010-01-07 07:45:50 UTC (rev 19672)
@@ -264,7 +264,7 @@
}
/**
- * Wait for appereance shell of given name
+ * Wait for appearance shell of given name
* @param shellName
*/
public void waitForShell(String shellName) {
@@ -359,8 +359,8 @@
int numRows = tbRuntimeEnvironments.rowCount();
if (numRows > 0){
int currentRow = 0;
- while (createRuntime && numRows < currentRow){
- if (tbRuntimeEnvironments.getTableItem(currentRow).getText(0).equalsIgnoreCase(runtimeName)){
+ while (createRuntime && currentRow < numRows){
+ if (tbRuntimeEnvironments.cell(currentRow, 0).equalsIgnoreCase(runtimeName)){
createRuntime = false;
}
else {
@@ -377,9 +377,8 @@
bot.textWithLabel(IDELabel.JBossServerRuntimeDialog.NAME).setText(runtimeName);
bot.textWithLabel(IDELabel.JBossServerRuntimeDialog.HOME_DIRECTORY).setText(runtimeHomeDir);
bot.button(IDELabel.Button.FINISH).click();
- bot.button(IDELabel.Button.OK).click();
}
-
+ bot.button(IDELabel.Button.OK).click();
}
/**
* Test if tree contains item with itemLabel
14 years, 3 months
JBoss Tools SVN: r19671 - trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-01-07 02:44:34 -0500 (Thu, 07 Jan 2010)
New Revision: 19671
Modified:
trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java
Log:
Added pause after application server is started.
Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2010-01-07 07:43:19 UTC (rev 19670)
+++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2010-01-07 07:44:34 UTC (rev 19671)
@@ -99,6 +99,7 @@
*/
public static void startApplicationServer(SWTWorkbenchBot bot , int index){
SWTJBTExt.chooseServerPopupMenu(bot,index, IDELabel.Menu.START,45*1000L);
+ bot.sleep(10*1000L);
}
/**
* Stops Application Server in Server View on position specified by index
14 years, 3 months
JBoss Tools SVN: r19670 - trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-01-07 02:43:19 -0500 (Thu, 07 Jan 2010)
New Revision: 19670
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java
Log:
Remove unused variables.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2010-01-07 00:47:50 UTC (rev 19669)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2010-01-07 07:43:19 UTC (rev 19670)
@@ -12,6 +12,7 @@
package org.jboss.tools.jsf.ui.bot.test.smoke;
import java.io.File;
+
import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
@@ -44,7 +45,7 @@
closeOpenJsfProject();
removeJSFCapabilities(jbdsIsRunning);
addJSFCapabilities();
- // Test import of deleted JSF project
+ // Test import of deleted JSF project
deleteJsfProject();
importJsfProject();
}
@@ -79,9 +80,6 @@
bot.textWithLabel("web.xml Location*").setText(webXmlFileLocation);
bot.button(WidgetVariables.NEXT_BUTTON).click();
- // Default Application Server is the one bundled with JBDS Installation
- String asStartingJob = IDELabel.ServerJobName.STARTING_JBOSS_EAP;
- String asStoppingJob = IDELabel.ServerJobName.STOPPING_JBOSS_EAP;
// Check if there is defined Application Server if not create one
if (!SWTJBTExt.isServerDefinedInWebWizardPage(bot)){
// Specify Application Server for Deployment
@@ -91,8 +89,6 @@
.select("JBoss Enterprise Application Platform 4.3");
bot.button(WidgetVariables.FINISH_BUTTON).click();
// Server Jobs has different labels now
- asStartingJob = IDELabel.ServerJobName.STARTING_JBOSS_EAP_43_RUNTIME;
- asStoppingJob = IDELabel.ServerJobName.STOPPING_JBOSS_EAP_43_RUNTIME;
}
delay();
// Finish Import
14 years, 3 months
JBoss Tools SVN: r19669 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-01-06 19:47:50 -0500 (Wed, 06 Jan 2010)
New Revision: 19669
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JavaMainTabClone.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java
Log:
JBIDE-5508 - remove "project" part of main class tab
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java 2010-01-06 23:23:08 UTC (rev 19668)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java 2010-01-07 00:47:50 UTC (rev 19669)
@@ -21,7 +21,14 @@
*/
package org.jboss.ide.eclipse.as.ui.launch;
+import java.text.MessageFormat;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
import org.eclipse.debug.ui.CommonTab;
@@ -31,8 +38,14 @@
import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaMainTab;
+import org.eclipse.jdt.internal.debug.ui.IJavaDebugHelpContextIds;
+import org.eclipse.jdt.internal.debug.ui.SWTFactory;
+import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
import org.jboss.ide.eclipse.as.core.util.ArgsUtil;
import org.jboss.ide.eclipse.as.ui.Messages;
@@ -47,7 +60,7 @@
public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
new JavaArgumentsTabExtension(),
- new JavaMainTab(),
+ new JavaMainTabExtension(),
new JavaClasspathTab(),
new SourceLookupTab(),
new EnvironmentTab(),
@@ -59,6 +72,37 @@
setTabs(tabs);
}
+ public class JavaMainTabExtension extends JavaMainTabClone {
+ public void createControl(Composite parent) {
+ Composite comp = SWTFactory.createComposite(parent, parent.getFont(), 1, 1, GridData.FILL_BOTH);
+ ((GridLayout)comp.getLayout()).verticalSpacing = 0;
+ //createProjectEditor(comp);
+ //createVerticalSpacer(comp, 1);
+ createMainTypeEditor(comp, LauncherMessages.JavaMainTab_Main_cla_ss__4);
+ setControl(comp);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IJavaDebugHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_MAIN_TAB);
+ }
+ public void initializeFrom(ILaunchConfiguration config) {
+ //super.initializeFrom(config);
+ //updateProjectFromConfig(config);
+ setCurrentLaunchConfiguration(config);
+ updateMainTypeFromConfig(config);
+ updateStopInMainFromConfig(config);
+ updateInheritedMainsFromConfig(config);
+ updateExternalJars(config);
+ }
+ public boolean isValid(ILaunchConfiguration config) {
+ setErrorMessage(null);
+ setMessage(null);
+ String name = fMainText.getText().trim();
+ if (name.length() == 0) {
+ setErrorMessage(LauncherMessages.JavaMainTab_Main_type_not_specified_16);
+ return false;
+ }
+ return true;
+ }
+ }
+
public class JavaArgumentsTabExtension extends JavaArgumentsTab {
private String originalHost=null;
private String originalConf=null;
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JavaMainTabClone.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JavaMainTabClone.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JavaMainTabClone.java 2010-01-07 00:47:50 UTC (rev 19669)
@@ -0,0 +1,314 @@
+package org.jboss.ide.eclipse.as.ui.launch;
+
+import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IJavaModel;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.search.IJavaSearchScope;
+import org.eclipse.jdt.core.search.SearchEngine;
+import org.eclipse.jdt.debug.ui.IJavaDebugUIConstants;
+import org.eclipse.jdt.internal.debug.ui.IJavaDebugHelpContextIds;
+import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
+import org.eclipse.jdt.internal.debug.ui.SWTFactory;
+import org.eclipse.jdt.internal.debug.ui.launcher.DebugTypeSelectionDialog;
+import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages;
+import org.eclipse.jdt.internal.debug.ui.launcher.MainMethodSearchEngine;
+import org.eclipse.jdt.internal.debug.ui.launcher.SharedJavaMainTab;
+import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
+import org.eclipse.jdt.ui.ISharedImages;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * This class is only here because of all the pain in the ass
+ * shit the jdt classes put in your way to prevent subclassing.
+ *
+ * Fuck that.
+ */
+
+public class JavaMainTabClone extends SharedJavaMainTab {
+ /**
+ * Boolean launch configuration attribute indicating that external jars (on
+ * the runtime classpath) should be searched when looking for a main type.
+ * Default value is <code>false</code>.
+ *
+ * @since 2.1
+ */
+ public static final String ATTR_INCLUDE_EXTERNAL_JARS = IJavaDebugUIConstants.PLUGIN_ID + ".INCLUDE_EXTERNAL_JARS"; //$NON-NLS-1$
+ /**
+ * Boolean launch configuration attribute indicating whether types inheriting
+ * a main method should be considered when searching for a main type.
+ * Default value is <code>false</code>.
+ *
+ * @since 3.0
+ */
+ public static final String ATTR_CONSIDER_INHERITED_MAIN = IJavaDebugUIConstants.PLUGIN_ID + ".CONSIDER_INHERITED_MAIN"; //$NON-NLS-1$
+
+ // UI widgets
+ private Button fSearchExternalJarsCheckButton;
+ private Button fConsiderInheritedMainButton;
+ private Button fStopInMainCheckButton;
+
+ /* (non-Javadoc)
+ * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
+ */
+ public void createControl(Composite parent) {
+ Composite comp = SWTFactory.createComposite(parent, parent.getFont(), 1, 1, GridData.FILL_BOTH);
+ ((GridLayout)comp.getLayout()).verticalSpacing = 0;
+ createProjectEditor(comp);
+ createVerticalSpacer(comp, 1);
+ createMainTypeEditor(comp, LauncherMessages.JavaMainTab_Main_cla_ss__4);
+ setControl(comp);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IJavaDebugHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_MAIN_TAB);
+ }
+
+ /**
+ * @see org.eclipse.jdt.internal.debug.ui.launcher.SharedJavaMainTab#createMainTypeExtensions(org.eclipse.swt.widgets.Composite)
+ */
+ protected void createMainTypeExtensions(Composite parent) {
+ fSearchExternalJarsCheckButton = SWTFactory.createCheckButton(parent, LauncherMessages.JavaMainTab_E_xt__jars_6, null, false, 2);
+ fSearchExternalJarsCheckButton.addSelectionListener(getDefaultListener());
+
+ fConsiderInheritedMainButton = SWTFactory.createCheckButton(parent, LauncherMessages.JavaMainTab_22, null, false, 2);
+ fConsiderInheritedMainButton.addSelectionListener(getDefaultListener());
+
+ fStopInMainCheckButton = SWTFactory.createCheckButton(parent, LauncherMessages.JavaMainTab_St_op_in_main_1, null, false, 1);
+ fStopInMainCheckButton.addSelectionListener(getDefaultListener());
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#getImage()
+ */
+ public Image getImage() {
+ return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_CLASS);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
+ */
+ public String getName() {
+ return LauncherMessages.JavaMainTab__Main_19;
+ }
+
+ /**
+ * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#getId()
+ *
+ * @since 3.3
+ */
+ public String getId() {
+ return "org.eclipse.jdt.debug.ui.javaMainTab"; //$NON-NLS-1$
+ }
+
+ /**
+ * Show a dialog that lists all main types
+ */
+ protected void handleSearchButtonSelected() {
+ IJavaProject project = getJavaProject();
+ IJavaElement[] elements = null;
+ if ((project == null) || !project.exists()) {
+ IJavaModel model = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
+ if (model != null) {
+ try {
+ elements = model.getJavaProjects();
+ }
+ catch (JavaModelException e) {JDIDebugUIPlugin.log(e);}
+ }
+ }
+ else {
+ elements = new IJavaElement[]{project};
+ }
+ if (elements == null) {
+ elements = new IJavaElement[]{};
+ }
+ int constraints = IJavaSearchScope.SOURCES;
+ constraints |= IJavaSearchScope.APPLICATION_LIBRARIES;
+ if (fSearchExternalJarsCheckButton.getSelection()) {
+ constraints |= IJavaSearchScope.SYSTEM_LIBRARIES;
+ }
+ IJavaSearchScope searchScope = SearchEngine.createJavaSearchScope(elements, constraints);
+ MainMethodSearchEngine engine = new MainMethodSearchEngine();
+ IType[] types = null;
+ try {
+ types = engine.searchMainMethods(getLaunchConfigurationDialog(), searchScope, fConsiderInheritedMainButton.getSelection());
+ }
+ catch (InvocationTargetException e) {
+ setErrorMessage(e.getMessage());
+ return;
+ }
+ catch (InterruptedException e) {
+ setErrorMessage(e.getMessage());
+ return;
+ }
+ DebugTypeSelectionDialog mmsd = new DebugTypeSelectionDialog(getShell(), types, LauncherMessages.JavaMainTab_Choose_Main_Type_11);
+ if (mmsd.open() == Window.CANCEL) {
+ return;
+ }
+ Object[] results = mmsd.getResult();
+ IType type = (IType)results[0];
+ if (type != null) {
+ fMainText.setText(type.getFullyQualifiedName());
+ fProjText.setText(type.getJavaProject().getElementName());
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jdt.internal.debug.ui.launcher.AbstractJavaMainTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
+ */
+ public void initializeFrom(ILaunchConfiguration config) {
+ //super.initializeFrom(config);
+ //updateProjectFromConfig(config);
+ setCurrentLaunchConfiguration(config);
+ updateMainTypeFromConfig(config);
+ updateStopInMainFromConfig(config);
+ updateInheritedMainsFromConfig(config);
+ updateExternalJars(config);
+ }
+
+ private ILaunchConfiguration fLaunchConfig;
+ protected ILaunchConfiguration getCurrentLaunchConfiguration() {
+ return fLaunchConfig;
+ }
+ protected void setCurrentLaunchConfiguration(ILaunchConfiguration config) {
+ fLaunchConfig = config;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
+ */
+ public boolean isValid(ILaunchConfiguration config) {
+ setErrorMessage(null);
+ setMessage(null);
+ String name = fProjText.getText().trim();
+ if (name.length() > 0) {
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IStatus status = workspace.validateName(name, IResource.PROJECT);
+ if (status.isOK()) {
+ IProject project= ResourcesPlugin.getWorkspace().getRoot().getProject(name);
+ if (!project.exists()) {
+ setErrorMessage(MessageFormat.format(LauncherMessages.JavaMainTab_20, new String[] {name}));
+ return false;
+ }
+ if (!project.isOpen()) {
+ setErrorMessage(MessageFormat.format(LauncherMessages.JavaMainTab_21, new String[] {name}));
+ return false;
+ }
+ }
+ else {
+ setErrorMessage(MessageFormat.format(LauncherMessages.JavaMainTab_19, new String[]{status.getMessage()}));
+ return false;
+ }
+ }
+ name = fMainText.getText().trim();
+ if (name.length() == 0) {
+ setErrorMessage(LauncherMessages.JavaMainTab_Main_type_not_specified_16);
+ return false;
+ }
+ return true;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
+ */
+ public void performApply(ILaunchConfigurationWorkingCopy config) {
+ config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, fProjText.getText().trim());
+ config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, fMainText.getText().trim());
+ mapResources(config);
+
+ // attribute added in 2.1, so null must be used instead of false for backwards compatibility
+ if (fStopInMainCheckButton.getSelection()) {
+ config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_STOP_IN_MAIN, true);
+ }
+ else {
+ config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_STOP_IN_MAIN, (String)null);
+ }
+
+ // attribute added in 2.1, so null must be used instead of false for backwards compatibility
+ if (fSearchExternalJarsCheckButton.getSelection()) {
+ config.setAttribute(ATTR_INCLUDE_EXTERNAL_JARS, true);
+ }
+ else {
+ config.setAttribute(ATTR_INCLUDE_EXTERNAL_JARS, (String)null);
+ }
+
+ // attribute added in 3.0, so null must be used instead of false for backwards compatibility
+ if (fConsiderInheritedMainButton.getSelection()) {
+ config.setAttribute(ATTR_CONSIDER_INHERITED_MAIN, true);
+ }
+ else {
+ config.setAttribute(ATTR_CONSIDER_INHERITED_MAIN, (String)null);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
+ */
+ public void setDefaults(ILaunchConfigurationWorkingCopy config) {
+ IJavaElement javaElement = getContext();
+ if (javaElement != null) {
+ initializeJavaProject(javaElement, config);
+ }
+ else {
+ config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, EMPTY_STRING);
+ }
+ initializeMainTypeAndName(javaElement, config);
+ }
+
+ /**
+ * updates the external jars attribute from the specified launch config
+ * @param config the config to load from
+ */
+ protected void updateExternalJars(ILaunchConfiguration config) {
+ boolean search = false;
+ try {
+ search = config.getAttribute(ATTR_INCLUDE_EXTERNAL_JARS, false);
+ }
+ catch (CoreException e) {JDIDebugUIPlugin.log(e);}
+ fSearchExternalJarsCheckButton.setSelection(search);
+ }
+
+ /**
+ * update the inherited mains attribute from the specified launch config
+ * @param config the config to load from
+ */
+ protected void updateInheritedMainsFromConfig(ILaunchConfiguration config) {
+ boolean inherit = false;
+ try {
+ inherit = config.getAttribute(ATTR_CONSIDER_INHERITED_MAIN, false);
+ }
+ catch (CoreException e) {JDIDebugUIPlugin.log(e);}
+ fConsiderInheritedMainButton.setSelection(inherit);
+ }
+
+ /**
+ * updates the stop in main attribute from the specified launch config
+ * @param config the config to load the stop in main attribute from
+ */
+ protected void updateStopInMainFromConfig(ILaunchConfiguration config) {
+ boolean stop = false;
+ try {
+ stop = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_STOP_IN_MAIN, false);
+ }
+ catch (CoreException e) {JDIDebugUIPlugin.log(e);}
+ fStopInMainCheckButton.setSelection(stop);
+ }
+
+}
14 years, 3 months
JBoss Tools SVN: r19668 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-01-06 18:23:08 -0500 (Wed, 06 Jan 2010)
New Revision: 19668
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java
Log:
JBIDE-5597 - modifying the list of folders that are added automatically
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2010-01-06 22:08:00 UTC (rev 19667)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2010-01-06 23:23:08 UTC (rev 19668)
@@ -21,6 +21,7 @@
import org.eclipse.jst.server.core.IEnterpriseApplication;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.ServerPort;
import org.eclipse.wst.server.core.model.ServerDelegate;
@@ -165,9 +166,13 @@
}
public IJBossServerRuntime getRuntime() {
+ return getRuntime(getServer());
+ }
+
+ public static IJBossServerRuntime getRuntime(IServer server) {
IJBossServerRuntime ajbsrt = null;
- if( getServer().getRuntime() != null ) {
- ajbsrt = (IJBossServerRuntime) getServer().getRuntime()
+ if( server.getRuntime() != null ) {
+ ajbsrt = (IJBossServerRuntime) server.getRuntime()
.loadAdapter(IJBossServerRuntime.class,
new NullProgressMonitor());
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2010-01-06 22:08:00 UTC (rev 19667)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2010-01-06 23:23:08 UTC (rev 19668)
@@ -29,6 +29,7 @@
import org.eclipse.jst.server.core.IWebModule;
import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.internal.Server;
import org.eclipse.wst.server.core.model.IURLProvider;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
@@ -138,12 +139,16 @@
}
public String getDeployFolder() {
- IJBossServerRuntime jbsrt = getRuntime();
- String type = getDeployLocationType();
+ return getDeployFolder(this, getDeployLocationType());
+ }
+
+ public static String getDeployFolder(JBossServer jbs, String type) {
+ IServer server = jbs.getServer();
+ IJBossServerRuntime jbsrt = getRuntime(server);
if( type.equals(DEPLOY_CUSTOM))
- return ServerUtil.makeGlobal(jbsrt, new Path(getAttribute(DEPLOY_DIRECTORY, ""))).toString(); //$NON-NLS-1$
+ return ServerUtil.makeGlobal(jbsrt, new Path(jbs.getAttribute(DEPLOY_DIRECTORY, ""))).toString(); //$NON-NLS-1$
if( type.equals(DEPLOY_METADATA)) {
- return JBossServerCorePlugin.getServerStateLocation(getServer()).
+ return JBossServerCorePlugin.getServerStateLocation(server).
append(IJBossServerConstants.DEPLOY).makeAbsolute().toString();
} else if( type.equals(DEPLOY_SERVER)) {
String config = jbsrt.getJBossConfiguration();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2010-01-06 22:08:00 UTC (rev 19667)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2010-01-06 23:23:08 UTC (rev 19668)
@@ -74,58 +74,36 @@
// server change event
if ((eventKind & ServerEvent.STATE_CHANGE) != 0) {
if( event.getServer().getServerState() == IServer.STATE_STARTED ) {
- if( shouldAddDeployLocation(event.getServer())) {
- IJMXRunnable r = new IJMXRunnable() {
- public void run(MBeanServerConnection connection) throws Exception {
- ensureDeployLocationAdded(event.getServer(), connection);
- }
- };
- try {
- JBossServerConnectionProvider.run(event.getServer(), r);
- } catch( JMXException jmxe ) {
- IStatus s = jmxe.getStatus();
- IStatus newStatus = new Status(s.getSeverity(), s.getPlugin(), IEventCodes.ADD_DEPLOYMENT_FOLDER_FAIL,
- Messages.AddingJMXDeploymentFailed, s.getException());
- ServerLogger.getDefault().log(event.getServer(), newStatus);
+ IJMXRunnable r = new IJMXRunnable() {
+ public void run(MBeanServerConnection connection) throws Exception {
+ ensureDeployLocationAdded(event.getServer(), connection);
}
+ };
+ try {
+ JBossServerConnectionProvider.run(event.getServer(), r);
+ } catch( JMXException jmxe ) {
+ IStatus s = jmxe.getStatus();
+ IStatus newStatus = new Status(s.getSeverity(), s.getPlugin(), IEventCodes.ADD_DEPLOYMENT_FOLDER_FAIL,
+ Messages.AddingJMXDeploymentFailed, s.getException());
+ ServerLogger.getDefault().log(event.getServer(), newStatus);
}
}
}
}
}
-
- protected boolean shouldAddDeployLocation(IServer server) {
- IDeployableServer ds = ServerConverter.getDeployableServer(server);
- boolean shouldAdd = server.getServerState() == IServer.STATE_STARTED;
- String type = ds.getDeployLocationType();
- String deployFolder = ds.getDeployFolder();
- if( type.equals(IDeployableServer.DEPLOY_SERVER))
- shouldAdd = false;
- else if( type.equals(IDeployableServer.DEPLOY_METADATA))
- shouldAdd = true;
- else if( type.equals( IDeployableServer.DEPLOY_CUSTOM )) {
- if( !new File(deployFolder).exists())
- shouldAdd = false;
- else {
- IRuntime rt = server.getRuntime();
- IJBossServerRuntime jbsrt = (IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
- String config = jbsrt.getJBossConfiguration();
- IPath deploy = new Path(IJBossServerConstants.SERVER)
- .append(config)
- .append(IJBossServerConstants.DEPLOY).makeRelative();
- IPath deployGlobal = ServerUtil.makeGlobal(jbsrt, deploy);
- if( new Path(deployFolder).equals(deployGlobal))
- shouldAdd = false;
- }
- }
- return shouldAdd;
- }
protected void ensureDeployLocationAdded(IServer server, MBeanServerConnection connection) throws Exception {
- IDeployableServer ds = ServerConverter.getDeployableServer(server);
-
+ JBossServer ds = ServerConverter.getJBossServer(server);
ArrayList<String> folders = new ArrayList<String>();
- folders.add(ds.getDeployFolder());
+ // add the server folder deploy loc. first
+ String insideServer = JBossServer.getDeployFolder(ds, JBossServer.DEPLOY_SERVER);
+ String metadata = JBossServer.getDeployFolder(ds, JBossServer.DEPLOY_METADATA);
+ String custom = JBossServer.getDeployFolder(ds, JBossServer.DEPLOY_CUSTOM);
+ folders.add(insideServer);
+ if( !folders.contains(metadata))
+ folders.add(metadata);
+ if( !folders.contains(custom))
+ folders.add(custom);
IModule[] modules2 = org.eclipse.wst.server.core.ServerUtil.getModules(server.getServerType().getRuntimeType().getModuleTypes());
if (modules2 != null) {
@@ -140,7 +118,7 @@
}
}
}
-
+ folders.remove(insideServer); // doesn't need to be added to deployment scanner
String[] folders2 = (String[]) folders.toArray(new String[folders.size()]);
for( int i = 0; i < folders2.length; i++ ) {
String asURL = new File(folders2[i]).toURL().toString();
14 years, 3 months