JBoss Tools SVN: r13753 - trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/tools.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2009-02-24 05:25:57 -0500 (Tue, 24 Feb 2009)
New Revision: 13753
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/tools/hibernate-tools.jar
Log:
update hibernate-tools.jar to java 5 compiled version isntead of java 6
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/tools/hibernate-tools.jar
===================================================================
(Binary files differ)
16 years, 10 months
JBoss Tools SVN: r13751 - trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-02-24 05:12:55 -0500 (Tue, 24 Feb 2009)
New Revision: 13751
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModelModuleContributor.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModuleModelListener.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java
Log:
JBIDE-3848
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModelModuleContributor.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModelModuleContributor.java 2009-02-24 09:09:14 UTC (rev 13750)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModelModuleContributor.java 2009-02-24 10:12:55 UTC (rev 13751)
@@ -26,7 +26,6 @@
import org.jboss.ide.eclipse.archives.core.model.IArchive;
import org.jboss.ide.eclipse.archives.core.util.ModelUtil;
import org.jboss.ide.eclipse.archives.webtools.IntegrationPlugin;
-import org.jboss.ide.eclipse.archives.webtools.modules.PackageModuleFactory.IModuleContributor;
import org.jboss.ide.eclipse.archives.webtools.modules.PackageModuleFactory.PackagedModuleDelegate;
/**
@@ -34,23 +33,15 @@
* @author Rob Stryker rob.stryker(a)jboss.com
*
*/
-public class ArchivesModelModuleContributor implements IModuleContributor {
+public class ArchivesModelModuleContributor {
- private static ArchivesModelModuleContributor instance;
- public static ArchivesModelModuleContributor getInstance() {
- if( instance == null ) {
- instance = new ArchivesModelModuleContributor(PackageModuleFactory.getFactory());
- }
- return instance;
- }
-
private PackageModuleFactory factory;
protected ArrayList<IModule> modules = null;
protected HashMap<IPath, ArrayList<IModule>> projectToModules = new HashMap<IPath, ArrayList<IModule>>(5); //IPath to IModule
protected HashMap<IModule, Object> moduleDelegates = new HashMap<IModule, Object>(5);
protected HashMap<IArchive, IModule> packageToModule = new HashMap<IArchive, IModule>(5);
- private ArchivesModelModuleContributor(PackageModuleFactory factory) {
+ ArchivesModelModuleContributor(PackageModuleFactory factory) {
this.factory = factory;
}
@@ -169,8 +160,8 @@
for( int i = 0; i < archives.length; i++ ) {
if( PackageModuleFactory.getStamp(archives[i]) == null ) {
requiresSave = true;
- archives[i].setProperty(PackageModuleFactory.MODULE_ID_PROPERTY_KEY,
- PackageModuleFactory.getStamp(archives[i], true));
+ archives[i].setProperty(factory.MODULE_ID_PROPERTY_KEY,
+ factory.getStamp(archives[i], true));
}
}
return requiresSave;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModuleModelListener.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModuleModelListener.java 2009-02-24 09:09:14 UTC (rev 13750)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModuleModelListener.java 2009-02-24 10:12:55 UTC (rev 13751)
@@ -152,6 +152,6 @@
else
p = delta.getPreNode().getProjectPath();
- ArchivesModelModuleContributor.getInstance().refreshProject(p);
+ PackageModuleFactory.getFactory().refreshProject(p);
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java 2009-02-24 09:09:14 UTC (rev 13750)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java 2009-02-24 10:12:55 UTC (rev 13751)
@@ -146,13 +146,14 @@
- protected ArchivesModelModuleContributor moduleContributor;
+ protected final ArchivesModelModuleContributor moduleContributor
+ = new ArchivesModelModuleContributor(this);
public PackageModuleFactory() {
super();
}
-
- public void initialize() {
- moduleContributor = ArchivesModelModuleContributor.getInstance();
+
+ public void refreshProject(IPath projectLoc) {
+ moduleContributor.refreshProject(projectLoc);
}
protected IModule createModule2(IArchive pack, IProject project) {
@@ -171,12 +172,6 @@
return moduleContributor.getModuleDelegate(module);
}
- public static interface IModuleContributor {
- public IModule[] getModules();
- public boolean containsModule(IModule module);
- public PackagedModuleDelegate getModuleDelegate(IModule module);
- }
-
public static interface IExtendedModuleResource extends IModuleResource {
public IPath getSourcePath();
public IArchiveNode getNode();
16 years, 10 months
JBoss Tools SVN: r13750 - in trunk: vpe/tests/org.jboss.tools.vpe.ui.test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-02-24 04:09:14 -0500 (Tue, 24 Feb 2009)
New Revision: 13750
Modified:
trunk/tests/features/org.jboss.tools.test.feature/feature.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties
Log:
fix vpe.ui.test configuration errors
Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2009-02-24 08:52:30 UTC (rev 13749)
+++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2009-02-24 09:09:14 UTC (rev 13750)
@@ -348,8 +348,7 @@
id="org.jboss.tools.vpe.ui.test"
download-size="0"
install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
<plugin
id="org.jboss.tools.vpe.html.test"
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2009-02-24 08:52:30 UTC (rev 13749)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2009-02-24 09:09:14 UTC (rev 13750)
@@ -22,8 +22,10 @@
org.jboss.tools.common.model.ui;bundle-version="2.0.0",
org.jboss.tools.tests;bundle-version="2.0.0";visibility:=reexport
Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Export-Package: org.jboss.tools.vpe.ui.test
+Bundle-ClassPath: vpe-ui-test.jar
+Export-Package: org.jboss.tools.vpe.ui.test,
+ org.jboss.tools.vpe.ui.test.dialog,
+ org.jboss.tools.vpe.ui.test.preferences
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties 2009-02-24 08:52:30 UTC (rev 13749)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties 2009-02-24 09:09:14 UTC (rev 13750)
@@ -1,6 +1,7 @@
-source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .,\
plugin.xml,\
- plugin.properties
+ plugin.properties,\
+ vpe-ui-test.jar,\
+ resources/
+source.vpe-ui-test.jar = src/
16 years, 10 months
JBoss Tools SVN: r13749 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-02-24 03:52:30 -0500 (Tue, 24 Feb 2009)
New Revision: 13749
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java
Log:
JBIDE-3774 - publish clean is now gone
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java 2009-02-24 08:19:13 UTC (rev 13748)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java 2009-02-24 08:52:30 UTC (rev 13749)
@@ -135,7 +135,7 @@
clipboard = new Clipboard(tableViewer.getTree().getDisplay());
Shell shell = tableViewer.getTree().getShell();
- actions = new Action[7];
+ actions = new Action[6];
// create the start actions
actions[0] = new StartAction(shell, provider, ILaunchManager.DEBUG_MODE);
actions[1] = new StartAction(shell, provider, ILaunchManager.RUN_MODE);
16 years, 10 months
JBoss Tools SVN: r13748 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui: jbossui/org/jboss/ide/eclipse/as/ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-02-24 03:19:13 -0500 (Tue, 24 Feb 2009)
New Revision: 13748
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/xpath_level_1.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/xpath_level_2.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/xpath_level_3.gif
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/views/server/extensions/XPathTreeLabelProvider.java
Log:
JBIDE-3434 - image issues for xml config
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/xpath_level_1.gif
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/xpath_level_1.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/xpath_level_2.gif
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/xpath_level_2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/xpath_level_3.gif
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/xpath_level_3.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
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 2009-02-24 07:52:40 UTC (rev 13747)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2009-02-24 08:19:13 UTC (rev 13748)
@@ -44,10 +44,7 @@
public static final String WIZBAN_JBOSS42_LOGO = "jboss4.2logo";
public static final String WIZBAN_JBOSS50_LOGO = "jboss5.0logo";
public static final String WIZBAN_JBOSS_EAP_LOGO = "jbossEAPlogo";
-
public static final String WIZBAN_DEPLOY_ONLY_LOGO = "jbossdeployerlogo";
-
-
public static final String TWIDDLE_IMAGE = "TWIDDLE_IMAGE";
public static final String INACTIVE_CATEGORY_IMAGE = "INACTIVE_CATEGORY_IMAGE";
public static final String GENERIC_SERVER_IMAGE = "GENERIC_SERVER_IMAGE";
@@ -55,7 +52,12 @@
public static final String UNPUBLISH_IMAGE = "UNPUBLISH_IMAGE";
public static final String JMX_IMAGE = "JMX_IMAGE";
public static final String EXPLORE_IMAGE = "EXPLORE_IMAGE";
+ public static final String XPATH_LEVEL_1 = "xpath_level_1";
+ public static final String XPATH_LEVEL_2 = "xpath_level_2";
+ public static final String XPATH_LEVEL_3 = "xpath_level_3";
+
+
private static JBossServerUISharedImages instance;
private Hashtable<String, Object> images, descriptors;
@@ -81,8 +83,12 @@
descriptors.put(UNPUBLISH_IMAGE, createImageDescriptor(pluginBundle, "/icons/unpublish.gif"));
descriptors.put(JMX_IMAGE, createImageDescriptor(pluginBundle, "/icons/jmeth_obj.gif"));
descriptors.put(EXPLORE_IMAGE, createImageDescriptor(pluginBundle, "/icons/actions/xpl/explore.gif"));
+ descriptors.put(XPATH_LEVEL_1, createImageDescriptor(pluginBundle, "icons/xpath_level_1.gif"));
+ descriptors.put(XPATH_LEVEL_2, createImageDescriptor(pluginBundle, "icons/xpath_level_2.gif"));
+ descriptors.put(XPATH_LEVEL_3, createImageDescriptor(pluginBundle, "icons/xpath_level_3.gif"));
+
+
Iterator<String> iter = descriptors.keySet().iterator();
-
while (iter.hasNext()) {
String key = iter.next();
ImageDescriptor descriptor = descriptor(key);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java 2009-02-24 07:52:40 UTC (rev 13747)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java 2009-02-24 08:19:13 UTC (rev 13748)
@@ -13,6 +13,7 @@
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathQuery;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
+import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
import org.jboss.ide.eclipse.as.ui.views.server.extensions.XPathTreeContentProvider.ServerWrapper;
public class XPathTreeLabelProvider extends LabelProvider {
@@ -31,6 +32,15 @@
return PlatformUI.getWorkbench().getSharedImages().getImage(
ISharedImages.IMG_OBJ_FOLDER);
+ if( element instanceof XPathQuery )
+ return JBossServerUISharedImages.getImage(JBossServerUISharedImages.XPATH_LEVEL_1);
+
+ if( element instanceof XPathFileResult )
+ return JBossServerUISharedImages.getImage(JBossServerUISharedImages.XPATH_LEVEL_2);
+
+ if( element instanceof XPathResultNode )
+ return JBossServerUISharedImages.getImage(JBossServerUISharedImages.XPATH_LEVEL_3);
+
return null;
}
16 years, 10 months
JBoss Tools SVN: r13746 - in trunk/esb/plugins/org.jboss.tools.esb.project.core: src/org/jboss/tools/esb/core/runtime and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-02-24 02:51:25 -0500 (Tue, 24 Feb 2009)
New Revision: 13746
Removed:
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/classpath/AbstractClasspathContainer.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/classpath/AbstractClasspathContainerInitializer.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/classpath/ClasspathDecorations.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/classpath/ClasspathDecorationsManager.java
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeClassPathInitializer.java
Log:
JBIDE-3836 - CPC issues
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF 2009-02-24 06:37:26 UTC (rev 13745)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF 2009-02-24 07:51:25 UTC (rev 13746)
@@ -25,10 +25,11 @@
org.eclipse.jst.common.frameworks,
org.eclipse.wst.server.core,
org.eclipse.jst.common.project.facet.core,
- org.eclipse.wst.web;bundle-version="1.1.204",
- org.eclipse.jem.util;bundle-version="2.0.100",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.1.201",
- org.eclipse.emf.ecore;bundle-version="2.4.1"
+ org.eclipse.wst.web,
+ org.eclipse.jem.util,
+ org.eclipse.wst.common.emfworkbench.integration,
+ org.eclipse.emf.ecore,
+ org.jboss.ide.eclipse.as.classpath.core
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Export-Package: org.jboss.tools.esb.core,
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeClassPathInitializer.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeClassPathInitializer.java 2009-02-24 06:37:26 UTC (rev 13745)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeClassPathInitializer.java 2009-02-24 07:51:25 UTC (rev 13746)
@@ -16,7 +16,6 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IAccessRule;
import org.eclipse.jdt.core.IClasspathAttribute;
@@ -26,12 +25,10 @@
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.ServerCore;
-import org.jboss.tools.esb.core.ESBProjectCorePlugin;
-import org.jboss.tools.esb.core.StatusUtils;
+import org.jboss.ide.eclipse.as.classpath.core.jee.AbstractClasspathContainer;
+import org.jboss.ide.eclipse.as.classpath.core.jee.AbstractClasspathContainerInitializer;
+import org.jboss.ide.eclipse.as.classpath.core.xpl.ClasspathDecorations;
import org.jboss.tools.esb.core.messages.JBossFacetCoreMessages;
-import org.jboss.tools.esb.core.runtime.classpath.AbstractClasspathContainer;
-import org.jboss.tools.esb.core.runtime.classpath.AbstractClasspathContainerInitializer;
-import org.jboss.tools.esb.core.runtime.classpath.ClasspathDecorations;
/**
* @author Denny Xu
@@ -106,6 +103,10 @@
public IPath getPath() {
return path;
}
+
+ public IClasspathEntry[] getClasspathEntries() {
+ return computeEntries();
+ }
public IClasspathEntry[] computeEntries() {
ArrayList<IClasspathEntry> entryList = new ArrayList<IClasspathEntry>();
Deleted: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/classpath/AbstractClasspathContainer.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/classpath/AbstractClasspathContainer.java 2009-02-24 06:37:26 UTC (rev 13745)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/classpath/AbstractClasspathContainer.java 2009-02-24 07:51:25 UTC (rev 13746)
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-
-/*
- *
- */
-package org.jboss.tools.esb.core.runtime.classpath;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IAccessRule;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.jboss.tools.esb.core.ESBProjectCorePlugin;
-
-/*
- * Things in this package are duplicate code from as.classpath.core
- * and must be refactored out after 3.0 GA release.
- */
-/**
- *
- * @author Rob Stryker <rob.stryker(a)redhat.com>
- * @deprecated
- */
-public abstract class AbstractClasspathContainer implements IClasspathContainer {
-
- public static final String LIB_FOLDER = "lib"; //$NON-NLS-1$
- public static final String LIB_SOURCE_FOLDER = "libsrc"; //$NON-NLS-1$
-
- protected IClasspathEntry[] entries;
- protected IPath path;
- protected String description;
- protected String libFolder;
- protected IJavaProject javaProject;
-
- protected static ClasspathDecorationsManager decorations;
- static {
-
- decorations = new ClasspathDecorationsManager();
- }
-
- public AbstractClasspathContainer(IPath path, String description,
- String libFolder, IJavaProject project) {
- this.path = path;
- this.description = description;
- this.libFolder = libFolder;
- this.javaProject = project;
- }
-
- public IClasspathEntry[] getClasspathEntries() {
- entries = computeEntries();
- return entries;
- }
-
- public String getDescription() {
- return this.description;
- }
-
- public int getKind() {
- return IClasspathContainer.K_APPLICATION;
- }
-
- public IPath getPath() {
- return this.path;
- }
-
- protected IClasspathEntry[] computeEntries() {
- ArrayList<IClasspathEntry> entries = new ArrayList<IClasspathEntry>();
-
- String baseDir = getBaseDir();
- if (baseDir == null)
- return new IClasspathEntry[0];
-
- File libDir = new File(baseDir
- + "/" + LIB_FOLDER + "/" + getLibFolder());//$NON-NLS-1$ //$NON-NLS-2$
- File libSrcDir = new File(baseDir
- + "/" + LIB_SOURCE_FOLDER + "/" + getLibFolder());//$NON-NLS-1$ //$NON-NLS-2$
-
- // Lists every modules in the lib dir
- File[] jars = libDir.listFiles(new FileFilter() {
- public boolean accept(File file) {
- return (file.toString().endsWith(".jar"));//$NON-NLS-1$
- }
- });
-
- if (jars != null) {
- for (int i = 0; i < jars.length; i++) {
- File jarFile = jars[i];
- String jarFileName = jarFile.getName();
- File jarSrcFile = new File(libSrcDir, jarFileName);
-
- IPath entryPath = new Path(jarFile.toString());
-
- IPath sourceAttachementPath = null;
- IPath sourceAttachementRootPath = null;
-
- final ClasspathDecorations dec
- = decorations.getDecorations( getDecorationManagerKey(getPath().toString()), entryPath.toString() );
-
-
- IClasspathAttribute[] attrs = {};
- if( dec != null ) {
- sourceAttachementPath = dec.getSourceAttachmentPath();
- sourceAttachementRootPath = dec.getSourceAttachmentRootPath();
- attrs = dec.getExtraAttributes();
- } else if (jarSrcFile.exists()) {
- sourceAttachementPath = new Path(jarSrcFile.toString());
- sourceAttachementRootPath = new Path("/");//$NON-NLS-1$
- }
-
- IAccessRule[] access = {};
- IClasspathEntry entry = JavaCore.newLibraryEntry( entryPath, sourceAttachementPath,
- sourceAttachementRootPath, access, attrs, false );
- entries.add(entry);
- }
- }
-
- return entries.toArray(new IClasspathEntry[entries.size()]);
- }
-
- protected String getLibFolder() {
- return this.libFolder;
- }
-
- protected String getBaseDir() {
- try {
- URL installURL = FileLocator.toFileURL(ESBProjectCorePlugin
- .getDefault().getBundle().getEntry("/")); //$NON-NLS-1$
- return installURL.getFile().toString();
- } catch (IOException ioe) {
- // LOG THE ERROR (one day)
- IStatus status = new Status(IStatus.ERROR, ESBProjectCorePlugin.PLUGIN_ID, "Error loading classpath container", ioe);
- ESBProjectCorePlugin.getDefault().getLog().log(status);
- }
- return null;
- }
-
- public static String getDecorationManagerKey( String container){
- return container;
- }
-
- protected static ClasspathDecorationsManager getDecorationsManager() {
- return decorations;
- }
-
- public void install() {
- entries = computeEntries();
- IJavaProject[] javaProjects = new IJavaProject[] {javaProject};
- final IClasspathContainer[] conts = new IClasspathContainer[] { this };
- try {
- JavaCore.setClasspathContainer(path, javaProjects, conts, null);
- } catch (CoreException e) {
- ESBProjectCorePlugin.log(e.getMessage(), e);
- }
- }
-
- public abstract void refresh();
-
-}
Deleted: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/classpath/AbstractClasspathContainerInitializer.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/classpath/AbstractClasspathContainerInitializer.java 2009-02-24 06:37:26 UTC (rev 13745)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/classpath/AbstractClasspathContainerInitializer.java 2009-02-24 07:51:25 UTC (rev 13746)
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.jboss.tools.esb.core.runtime.classpath;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-
-/*
- * Things in this package are duplicate code from as.classpath.core
- * and must be refactored out after 3.0 GA release.
- */
-/**
- *
- * @author Rob Stryker <rob.stryker(a)redhat.com>
- * @deprecated
- */
-
-public abstract class AbstractClasspathContainerInitializer extends
- ClasspathContainerInitializer {
-
- protected IJavaProject javaProject;
- public AbstractClasspathContainerInitializer() {
- }
-
- /**
- * Description of the Method
- *
- * @param containerPath
- * Description of the Parameter
- * @param project
- * Description of the Parameter
- * @exception CoreException
- * Description of the Exception
- */
- public void initialize(IPath containerPath, IJavaProject project)
- throws CoreException {
- this.javaProject = project;
- int size = containerPath.segmentCount();
- if (size > 0) {
- AbstractClasspathContainer container = createClasspathContainer(containerPath);
- JavaCore.setClasspathContainer(containerPath,
- new IJavaProject[] { project },
- new IClasspathContainer[] { container }, null);
- }
- }
-
- /**
- * Description of the Method
- *
- * @param path
- * Description of the Parameter
- * @return Description of the Return Value
- */
- protected abstract AbstractClasspathContainer createClasspathContainer(
- IPath path);
-
- /**
- * Gets the classpathContainerID attribute of the
- * AbstractClasspathContainerInitializer object
- *
- * @return The classpathContainerID value
- */
- protected abstract String getClasspathContainerID();
-
- public boolean canUpdateClasspathContainer(IPath containerPath,
- IJavaProject project) {
- return true;
- }
-
- public void requestClasspathContainerUpdate(final IPath containerPath,
- final IJavaProject project, final IClasspathContainer sg)
-
- throws CoreException
-
- {
- String key = AbstractClasspathContainer
- .getDecorationManagerKey(containerPath.toString());
-
- IClasspathEntry[] entries = sg.getClasspathEntries();
- ClasspathDecorationsManager decorations = AbstractClasspathContainer
- .getDecorationsManager();
- decorations.clearAllDecorations(key);
-
- for (int i = 0; i < entries.length; i++) {
- final IClasspathEntry entry = entries[i];
-
- final IPath srcpath = entry.getSourceAttachmentPath();
- final IPath srcrootpath = entry.getSourceAttachmentRootPath();
- final IClasspathAttribute[] attrs = entry.getExtraAttributes();
- final String eid = entry.getPath().toString();
- final ClasspathDecorations dec = new ClasspathDecorations();
-
- dec.setSourceAttachmentPath(srcpath);
- dec.setSourceAttachmentRootPath(srcrootpath);
- dec.setExtraAttributes(attrs);
-
- decorations.setDecorations(key, eid, dec);
- }
- decorations.save();
- final IClasspathContainer container = JavaCore.getClasspathContainer(
- containerPath, project);
- ((AbstractClasspathContainer) container).refresh();
- }
-
-}
Deleted: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/classpath/ClasspathDecorations.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/classpath/ClasspathDecorations.java 2009-02-24 06:37:26 UTC (rev 13745)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/classpath/ClasspathDecorations.java 2009-02-24 07:51:25 UTC (rev 13746)
@@ -1,71 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.jboss.tools.esb.core.runtime.classpath;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.JavaCore;
-
-/*
- * Things in this package are duplicate code from as.classpath.core
- * and must be refactored out after 3.0 GA release.
- */
-/**
- *
- * @author Rob Stryker <rob.stryker(a)redhat.com>
- * @deprecated
- */
-
-public final class ClasspathDecorations {
- private IPath sourceAttachmentPath;
- private IPath sourceAttachmentRootPath;
- private ArrayList extraAttributes = new ArrayList();
-
- public IPath getSourceAttachmentPath() {
- return this.sourceAttachmentPath;
- }
-
- public void setSourceAttachmentPath(final IPath sourceAttachmentPath) {
- this.sourceAttachmentPath = sourceAttachmentPath;
- }
-
- public IPath getSourceAttachmentRootPath() {
- return this.sourceAttachmentRootPath;
- }
-
- public void setSourceAttachmentRootPath(final IPath sourceAttachmentRootPath) {
- this.sourceAttachmentRootPath = sourceAttachmentRootPath;
- }
-
- public IClasspathAttribute[] getExtraAttributes() {
- final IClasspathAttribute[] array = new IClasspathAttribute[this.extraAttributes
- .size()];
-
- return (IClasspathAttribute[]) this.extraAttributes.toArray(array);
- }
-
- public void setExtraAttributes(final IClasspathAttribute[] attrs) {
- for (int i = 0; i < attrs.length; i++) {
- this.extraAttributes.add(attrs[i]);
- }
- }
-
- public void addExtraAttribute(final String name, final String value) {
- final IClasspathAttribute attr = JavaCore.newClasspathAttribute(name,
- value);
-
- this.extraAttributes.add(attr);
- }
-
-}
Deleted: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/classpath/ClasspathDecorationsManager.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/classpath/ClasspathDecorationsManager.java 2009-02-24 06:37:26 UTC (rev 13745)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/classpath/ClasspathDecorationsManager.java 2009-02-24 07:51:25 UTC (rev 13746)
@@ -1,319 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.esb.core.runtime.classpath;
-
-import java.io.StringReader;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.NoSuchElementException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.jboss.tools.esb.core.ESBProjectCorePlugin;
-import org.osgi.service.prefs.BackingStoreException;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- * @deprecated
- */
-/*
- * Things in this package are duplicate code from as.classpath.core
- * and must be refactored out after 3.0 GA release.
- */
-public final class ClasspathDecorationsManager {
- private static final String CLASSPATH_PREFERENCES = "classpathPreferences"; //$NON-NLS-1$
- private static final String SEPARATOR = System
- .getProperty("line.separator"); //$NON-NLS-1$
- private final HashMap decorations;
-
- public ClasspathDecorationsManager() {
- this.decorations = read();
- }
-
- private IEclipsePreferences getEclipsePreferences() {
- IEclipsePreferences node = (IEclipsePreferences) Platform
- .getPreferencesService().getRootNode()
- .node(InstanceScope.SCOPE).node(ESBProjectCorePlugin.PLUGIN_ID);
- return node;
- }
-
- private String getPreferences() {
- return getEclipsePreferences().get(CLASSPATH_PREFERENCES, null);
- }
-
- public ClasspathDecorations getDecorations(final String key,
- final String entry) {
- final HashMap submap = (HashMap) this.decorations.get(key);
-
- if (submap == null) {
- return null;
- }
-
- return (ClasspathDecorations) submap.get(entry);
- }
-
- public void setDecorations(final String key, final String entry,
- final ClasspathDecorations dec) {
- HashMap submap = (HashMap) this.decorations.get(key);
-
- if (submap == null) {
- submap = new HashMap();
- this.decorations.put(key, submap);
- }
-
- submap.put(entry, dec);
- }
-
- public void clearAllDecorations(final String key) {
- this.decorations.remove(key);
- }
-
- public void save() {
- StringBuffer buffer = new StringBuffer();
- buffer.append("<classpath>"); //$NON-NLS-1$
- buffer.append(SEPARATOR);
- for (Iterator itr1 = decorations.entrySet().iterator(); itr1.hasNext();) {
- final Map.Entry entry1 = (Map.Entry) itr1.next();
- final Map submap = (Map) entry1.getValue();
-
- buffer.append(" <container id=\""); //$NON-NLS-1$
- buffer.append((String) entry1.getKey());
- buffer.append("\">"); //$NON-NLS-1$
- buffer.append(SEPARATOR);
-
- for (Iterator itr2 = submap.entrySet().iterator(); itr2.hasNext();) {
- final Map.Entry entry2 = (Map.Entry) itr2.next();
-
- final ClasspathDecorations dec = (ClasspathDecorations) entry2
- .getValue();
-
- buffer.append(" <entry id=\""); //$NON-NLS-1$
- buffer.append((String) entry2.getKey());
- buffer.append("\">"); //$NON-NLS-1$
- buffer.append(SEPARATOR);
-
- String src = ""; //$NON-NLS-1$
- if (dec.getSourceAttachmentPath() != null) {
- src = dec.getSourceAttachmentPath().toString();
- }
- buffer.append(" <source-attachment-path>"); //$NON-NLS-1$
- buffer.append(src);
- buffer.append("</source-attachment-path>"); //$NON-NLS-1$
- buffer.append(SEPARATOR);
-
- if (dec.getSourceAttachmentRootPath() != null) {
- buffer.append(" <source-attachment-root-path>"); //$NON-NLS-1$
- buffer.append(dec.getSourceAttachmentRootPath().toString());
- buffer.append("</source-attachment-root-path>"); //$NON-NLS-1$
- buffer.append(SEPARATOR);
- }
-
- final IClasspathAttribute[] attrs = dec.getExtraAttributes();
-
- for (int i = 0; i < attrs.length; i++) {
- final IClasspathAttribute attr = attrs[i];
-
- buffer.append(" <attribute name=\""); //$NON-NLS-1$
- buffer.append(attr.getName());
- buffer.append("\">"); //$NON-NLS-1$
- buffer.append(attr.getValue());
- buffer.append("</attribute>"); //$NON-NLS-1$
- buffer.append(SEPARATOR);
- }
-
- buffer.append(" </entry>"); //$NON-NLS-1$
- buffer.append(SEPARATOR);
- }
-
- buffer.append(" </container>"); //$NON-NLS-1$
- buffer.append(SEPARATOR);
- }
-
- buffer.append("</classpath>"); //$NON-NLS-1$
- buffer.append(SEPARATOR);
- IEclipsePreferences ep = getEclipsePreferences();
- ep.put(CLASSPATH_PREFERENCES, buffer.toString());
- try {
- ep.flush();
- } catch (BackingStoreException e) {
- String msg = "Encountered an unexpected exception.";
- ESBProjectCorePlugin.log(msg, e);
- }
- }
-
- private HashMap read() {
- final HashMap map = new HashMap();
- String prefs = getPreferences();
- if (prefs == null || prefs.length() <= 0)
- return map;
-
- Element root = null;
- try {
- final DocumentBuilderFactory factory = DocumentBuilderFactory
- .newInstance();
-
- final DocumentBuilder docbuilder = factory.newDocumentBuilder();
-
- StringReader reader = new StringReader(prefs);
- InputSource source = new InputSource(reader);
- root = docbuilder.parse(source).getDocumentElement();
- } catch (Exception e) {
- String msg = "Encountered an unexpected exception.";
- ESBProjectCorePlugin.log(msg, e);
- return map;
- }
-
- for (Iterator itr1 = elements(root, "container"); itr1.hasNext();) //$NON-NLS-1$
- {
- final Element e1 = (Element) itr1.next();
- final String cid = e1.getAttribute("id"); //$NON-NLS-1$
-
- final HashMap submap = new HashMap();
- map.put(cid, submap);
-
- for (Iterator itr2 = elements(e1, "entry"); itr2.hasNext();) //$NON-NLS-1$
- {
- final Element e2 = (Element) itr2.next();
- final String eid = e2.getAttribute("id"); //$NON-NLS-1$
- final ClasspathDecorations dec = new ClasspathDecorations();
-
- submap.put(eid, dec);
-
- for (Iterator itr3 = elements(e2); itr3.hasNext();) {
- final Element e3 = (Element) itr3.next();
- final String n = e3.getNodeName();
- String text = text(e3);
- if (text != null) {
- if (n.equals("source-attachment-path")) //$NON-NLS-1$
- {
- dec.setSourceAttachmentPath(new Path(text(e3)));
- } else if (n.equals("source-attachment-root-path")) //$NON-NLS-1$
- {
- dec.setSourceAttachmentRootPath(new Path(text(e3)));
- }
- }
- if (n.equals("attribute")) //$NON-NLS-1$
- {
- final String name = e3.getAttribute("name"); //$NON-NLS-1$
- dec.addExtraAttribute(name, text(e3));
- }
-
- }
- }
- }
-
- return map;
- }
-
- private static String text(final Element el) {
- final NodeList nodes = el.getChildNodes();
-
- String str = null;
- StringBuffer buf = null;
-
- for (int i = 0, n = nodes.getLength(); i < n; i++) {
- final Node node = nodes.item(i);
-
- if (node.getNodeType() == Node.TEXT_NODE) {
- final String val = node.getNodeValue();
-
- if (buf != null) {
- buf.append(val);
- } else if (str != null) {
- buf = new StringBuffer();
- buf.append(str);
- buf.append(val);
-
- str = null;
- } else {
- str = val;
- }
- }
- }
-
- if (buf != null) {
- return buf.toString();
- }
- return str;
- }
-
- private static Iterator elements(final Element el, final String name) {
- return new ElementsIterator(el, name);
- }
-
- private static Iterator elements(final Element el) {
- return new ElementsIterator(el, null);
- }
-
- private static final class ElementsIterator implements Iterator {
- private final NodeList nodes;
- private final int length;
- private final String name;
- private int position;
- private Element element;
-
- public ElementsIterator(final Element parent, final String name) {
- this.nodes = parent.getChildNodes();
- this.length = nodes.getLength();
- this.position = -1;
- this.name = name;
-
- advance();
- }
-
- private void advance() {
- this.element = null;
- this.position++;
-
- for (; this.position < this.length && this.element == null; this.position++) {
- final Node node = this.nodes.item(this.position);
-
- if (node.getNodeType() == Node.ELEMENT_NODE
- && (this.name == null || node.getNodeName().equals(
- this.name))) {
- this.element = (Element) node;
- }
- }
- }
-
- public boolean hasNext() {
- return (this.element != null);
- }
-
- public Object next() {
- final Element el = this.element;
-
- if (el == null) {
- throw new NoSuchElementException();
- }
-
- advance();
-
- return el;
- }
-
- public void remove() {
- throw new UnsupportedOperationException();
- }
- }
-
-}
16 years, 10 months
JBoss Tools SVN: r13745 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-02-24 01:37:26 -0500 (Tue, 24 Feb 2009)
New Revision: 13745
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
Log:
JBIDE-3770 - changed ids to non-internal
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2009-02-24 06:23:49 UTC (rev 13744)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2009-02-24 06:37:26 UTC (rev 13745)
@@ -130,7 +130,7 @@
"\"" + runtime.getRuntime().getLocation().append("bin").append("native") + "\"", false);
/* Claspath */
- List<String> cp = wc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, (List<String>)null);
+ List<String> cp = wc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, new ArrayList<String>());
List<String> newCP = fixCP(cp, jbs);
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, serverHome + Path.SEPARATOR + "bin");
@@ -143,13 +143,19 @@
protected static List<String> fixCP(List<String> list, JBossServer jbs) {
try {
+ boolean found = false;
String[] asString = (String[]) list.toArray(new String[list.size()]);
for( int i = 0; i < asString.length; i++ ) {
if( asString[i].contains(RunJarContainerWrapper.ID)) {
+ found = true;
asString[i] = getRunJarRuntimeCPEntry(jbs).getMemento();
}
}
- return Arrays.asList(asString);
+ ArrayList<String> result = new ArrayList<String>();
+ result.addAll(Arrays.asList(asString));
+ if( !found )
+ result.add(getRunJarRuntimeCPEntry(jbs).getMemento());
+ return result;
} catch( CoreException ce) {
return list;
}
16 years, 10 months
JBoss Tools SVN: r13744 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-02-24 01:23:49 -0500 (Tue, 24 Feb 2009)
New Revision: 13744
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java
Log:
JBIDE-3774 - publish clean is now gone
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java 2009-02-24 05:58:38 UTC (rev 13743)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java 2009-02-24 06:23:49 UTC (rev 13744)
@@ -146,8 +146,7 @@
// create the publish actions
actions[4] = new PublishAction(shell, provider);
- actions[5] = new PublishCleanAction(shell, provider);
- actions[6] = new ExploreAction(shell,provider);
+ actions[5] = new ExploreAction(shell,provider);
// create the open action
openAction = new OpenAction(provider);
16 years, 10 months