JBoss Tools SVN: r11557 - in trunk/seam/tests/org.jboss.tools.seam.core.test: projects and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-11-06 00:48:59 -0500 (Thu, 06 Nov 2008)
New Revision: 11557
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.eclipse.jst.common.project.facet.core.prefs
Removed:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/lib/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject1/
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.classpath
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.classpath
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.classpath
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.eclipse.jst.common.project.facet.core.prefs
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java
Log:
SeamEARTest errors fix
Unused test project was removed
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2008-11-06 05:41:20 UTC (rev 11556)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2008-11-06 05:48:59 UTC (rev 11557)
@@ -34,5 +34,6 @@
org.eclipse.jface,
org.eclipse.jdt.core.manipulation,
org.eclipse.jst.jsf.core,
- org.eclipse.wst.validation
+ org.eclipse.wst.validation,
+ org.eclipse.jdt.launching
Provide-Package: org.jboss.tools.seam.core.test
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.classpath
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.classpath 2008-11-06 05:41:20 UTC (rev 11556)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.classpath 2008-11-06 05:48:59 UTC (rev 11557)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" output="WebContent/WEB-INF/dev" path="src/action"/>
<classpathentry kind="src" path="src/model"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-1.5.0-sun-1.5.0.15"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.preview.runtimeTarget/J2EE Preview"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-11-06 05:41:20 UTC (rev 11556)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-11-06 05:48:59 UTC (rev 11557)
@@ -1,4 +1,4 @@
#Wed Nov 05 07:46:18 PST 2008
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:java-1.5.0-sun-1.5.0.15/owners=jst.java\:5.0
+classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.launching.JRE_CONTAINER/owners=jst.java\:5.0
classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.preview.runtimeTarget\:\:J2EE\ Preview/owners=jst.web\:2.5
eclipse.preferences.version=1
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-11-06 05:41:20 UTC (rev 11556)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-11-06 05:48:59 UTC (rev 11557)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="J2EE Preview"/>
<fixed facet="jst.web"/>
<fixed facet="jst.java"/>
<installed facet="jst.java" version="5.0"/>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.classpath
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.classpath 2008-11-06 05:41:20 UTC (rev 11556)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.classpath 2008-11-06 05:48:59 UTC (rev 11557)
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="output" path="build/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 4.2 Runtime"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.eclipse.jst.common.project.facet.core.prefs
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-11-06 05:41:20 UTC (rev 11556)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-11-06 05:48:59 UTC (rev 11557)
@@ -1,3 +1,4 @@
-#Tue Aug 28 17:17:16 MSD 2007
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER/owners=jst.java\:5.0
-eclipse.preferences.version=1
+#Wed Nov 05 15:08:03 PST 2008
+classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.launching.JRE_CONTAINER/owners=jst.java\:5.0
+classpath.helper/org.eclipse.jst.server.core.container\:\:org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget\:\:JBoss\ 4.2\ Runtime/owners=jst.web\:2.5;jst.jsf\:1.2
+eclipse.preferences.version=1
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-11-06 05:41:20 UTC (rev 11556)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-11-06 05:48:59 UTC (rev 11557)
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <fixed facet="jst.seam"/>
- <fixed facet="jst.java"/>
- <fixed facet="jst.web"/>
- <fixed facet="jst.jsf"/>
- <installed facet="jst.java" version="5.0"/>
- <installed facet="jst.web" version="2.5"/>
- <installed facet="jst.jsf" version="1.2"/>
- <installed facet="jst.seam" version="1.2"/>
-</faceted-project>
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 4.2 Runtime"/>
+ <fixed facet="jst.seam"/>
+ <fixed facet="jst.java"/>
+ <fixed facet="jst.web"/>
+ <fixed facet="jst.jsf"/>
+ <installed facet="jst.java" version="5.0"/>
+ <installed facet="jst.web" version="2.5"/>
+ <installed facet="jst.jsf" version="1.2"/>
+ <installed facet="jst.seam" version="1.2"/>
+</faceted-project>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-11-06 05:41:20 UTC (rev 11556)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-11-06 05:48:59 UTC (rev 11557)
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <runtime name=""/>
- <fixed facet="jst.ear"/>
- <installed facet="jst.ear" version="5.0"/>
-</faceted-project>
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 4.2 Runtime"/>
+ <fixed facet="jst.ear"/>
+ <installed facet="jst.ear" version="5.0"/>
+</faceted-project>
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/META-INF/MANIFEST.MF 2008-11-06 05:48:59 UTC (rev 11557)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.classpath
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.classpath 2008-11-06 05:41:20 UTC (rev 11556)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.classpath 2008-11-06 05:48:59 UTC (rev 11557)
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="ejbModule"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.generic.runtimeTarget/"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="output" path="build/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="ejbModule"/>
+ <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 4.2 Runtime"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.eclipse.jst.common.project.facet.core.prefs
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-11-06 05:48:59 UTC (rev 11557)
@@ -0,0 +1,4 @@
+#Wed Nov 05 15:08:04 PST 2008
+classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.launching.JRE_CONTAINER/owners=jst.java\:5.0
+classpath.helper/org.eclipse.jst.server.core.container\:\:org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget\:\:JBoss\ 4.2\ Runtime/owners=jst.ejb\:3.0
+eclipse.preferences.version=1
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.eclipse.jst.common.project.facet.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-11-06 05:41:20 UTC (rev 11556)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-11-06 05:48:59 UTC (rev 11557)
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <runtime name=""/>
- <fixed facet="jst.java"/>
- <fixed facet="jst.ejb"/>
- <installed facet="jst.java" version="5.0"/>
- <installed facet="jst.ejb" version="3.0"/>
-</faceted-project>
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 4.2 Runtime"/>
+ <fixed facet="jst.java"/>
+ <fixed facet="jst.ejb"/>
+ <installed facet="jst.java" version="5.0"/>
+ <installed facet="jst.ejb" version="3.0"/>
+</faceted-project>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java 2008-11-06 05:41:20 UTC (rev 11556)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java 2008-11-06 05:48:59 UTC (rev 11557)
@@ -13,10 +13,19 @@
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IRuntimeType;
+import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
+import org.eclipse.wst.server.core.ServerUtil;
+import org.eclipse.wst.server.core.internal.RuntimeWorkingCopy;
import org.jboss.tools.common.test.util.TestProjectProvider;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamProject;
@@ -41,15 +50,17 @@
public SeamEARTest() {}
protected void setUp() throws Exception {
+ createRuntime("JBoss 4.2 Runtime");
+ JobUtils.waitForIdle();
providerEAR = new TestProjectProvider("org.jboss.tools.seam.core.test", null, "Test1-ear", makeCopy);
projectEAR = providerEAR.getProject();
JobUtils.waitForIdle();
+ providerEJB = new TestProjectProvider("org.jboss.tools.seam.core.test", null, "Test1-ejb", makeCopy);
+ projectEJB = providerEJB.getProject();
+ JobUtils.waitForIdle();
providerWAR = new TestProjectProvider("org.jboss.tools.seam.core.test", null, "Test1", makeCopy);
projectWAR = providerWAR.getProject();
JobUtils.waitForIdle();
- providerEJB = new TestProjectProvider("org.jboss.tools.seam.core.test", null, "Test1-ejb", makeCopy);
- projectEJB = providerEJB.getProject();
- JobUtils.waitForIdle();
}
private ISeamProject getSeamProject(IProject project) throws CoreException {
@@ -83,4 +94,30 @@
providerEJB.dispose();
providerEAR.dispose();
}
+
+ private static IRuntime createRuntime(String runtimeName) throws CoreException {
+ IRuntimeWorkingCopy runtime = null;
+ String type = null;
+ String version = null;
+ String runtimeId = null;
+ IPath jbossAsLocationPath = new Path(System.getProperty("jbosstools.test.jboss.home.4.2"));
+ IRuntimeType[] runtimeTypes = ServerUtil.getRuntimeTypes(null, null, "org.jboss.ide.eclipse.as.runtime.42");
+ if (runtimeTypes.length > 0) {
+ runtime = runtimeTypes[0].createRuntime(null, new NullProgressMonitor());
+ runtime.setLocation(jbossAsLocationPath);
+ if(runtimeName!=null) {
+ runtime.setName(runtimeName);
+ }
+ IVMInstall defaultVM = JavaRuntime.getDefaultVMInstall();
+ // IJBossServerRuntime.PROPERTY_VM_ID
+ ((RuntimeWorkingCopy) runtime).setAttribute("PROPERTY_VM_ID", defaultVM.getId());
+ // IJBossServerRuntime.PROPERTY_VM_TYPE_ID
+ ((RuntimeWorkingCopy) runtime).setAttribute("PROPERTY_VM_TYPE_ID", defaultVM.getVMInstallType().getId());
+ // IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME
+ ((RuntimeWorkingCopy) runtime).setAttribute("org.jboss.ide.eclipse.as.core.runtime.configurationName", "default");
+
+ return runtime.save(false, new NullProgressMonitor());
+ }
+ return runtime;
+ }
}
\ No newline at end of file
16 years, 2 months
JBoss Tools SVN: r11556 - trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-11-06 00:41:20 -0500 (Thu, 06 Nov 2008)
New Revision: 11556
Modified:
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java
Log:
One more attempt to fix Seam Validation Test Errors
Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java 2008-11-06 05:19:07 UTC (rev 11555)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java 2008-11-06 05:41:20 UTC (rev 11556)
@@ -214,6 +214,7 @@
.getActiveWorkbenchWindow().getShell());
// run import
importOp.run(null);
+ JobUtils.waitForIdle();
} catch (InvocationTargetException ite) {
// TePlugin.getDefault().logError(ite.getCause());
16 years, 2 months
JBoss Tools SVN: r11555 - trunk/jbpm/plugins/org.jboss.tools.jbpm.convert.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-11-06 00:19:07 -0500 (Thu, 06 Nov 2008)
New Revision: 11555
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.properties
Log:
JBIDE-3116: Make sure that the plug-in provider is "JBoss, a division of Red Hat"
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.properties
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.properties 2008-11-06 05:19:01 UTC (rev 11554)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.properties 2008-11-06 05:19:07 UTC (rev 11555)
@@ -2,4 +2,4 @@
wizard.description = Export a BPMN file to jPDL
category.name=BPMN
PLUGIN_NAME=BPMNExport
-PLUGIN_PROVIDER=JBoss.org
\ No newline at end of file
+PLUGIN_PROVIDER=JBoss, a division of Red Hat
\ No newline at end of file
16 years, 2 months
JBoss Tools SVN: r11554 - trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-11-06 00:19:01 -0500 (Thu, 06 Nov 2008)
New Revision: 11554
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF
Log:
JBIDE-3116: Make sure that the plug-in provider is "JBoss, a division of Red Hat"
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2008-11-06 05:18:54 UTC (rev 11553)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2008-11-06 05:19:01 UTC (rev 11554)
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
+Bundle-Name: JBossWS Creation Core
Bundle-SymbolicName: org.jboss.tools.ws.creation.core
Bundle-Version: 1.0.0
Bundle-Activator: org.jboss.tools.ws.creation.core.JBossWSCreationCore
-Bundle-Vendor: %PLUGIN_PROVIDER
+Bundle-Vendor: JBoss, a division of Red Hat
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.wst.common.frameworks,
16 years, 2 months
JBoss Tools SVN: r11553 - trunk/ws/plugins/org.jboss.tools.ws.ui.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-11-06 00:18:54 -0500 (Thu, 06 Nov 2008)
New Revision: 11553
Modified:
trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.properties
Log:
JBIDE-3116: Make sure that the plug-in provider is "JBoss, a division of Red Hat"
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.properties 2008-11-06 05:18:48 UTC (rev 11552)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.properties 2008-11-06 05:18:54 UTC (rev 11553)
@@ -1,3 +1,3 @@
JBOSSWS_PREFERENCE_PAGE=JBossWS Preferences
PLUGIN_NAME=JBossWS UI
-PLUGIN_PROVIDER=Red Hat, Inc.
\ No newline at end of file
+PLUGIN_PROVIDER=JBoss, a division of Red Hat
\ No newline at end of file
16 years, 2 months
JBoss Tools SVN: r11552 - trunk/ws/plugins/org.jboss.tools.ws.creation.ui.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-11-06 00:18:48 -0500 (Thu, 06 Nov 2008)
New Revision: 11552
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.properties
Log:
JBIDE-3116: Make sure that the plug-in provider is "JBoss, a division of Red Hat"
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.properties 2008-11-06 05:18:40 UTC (rev 11551)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.properties 2008-11-06 05:18:48 UTC (rev 11552)
@@ -1,5 +1,5 @@
-PLUGIN_NAME=Webservice JBossWS Creation UI Plug-in
-PLUGIN_PROVIDER=JBoss
+PLUGIN_NAME=JBossWS Creation UI
+PLUGIN_PROVIDER=JBoss, a division of Red Hat
LABEL_RUNTIME_JBossWS1=JBossWS
\ No newline at end of file
16 years, 2 months
JBoss Tools SVN: r11551 - trunk/ws/plugins/org.jboss.tools.ws.core.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-11-06 00:18:40 -0500 (Thu, 06 Nov 2008)
New Revision: 11551
Modified:
trunk/ws/plugins/org.jboss.tools.ws.core/plugin.properties
Log:
JBIDE-3116: Make sure that the plug-in provider is "JBoss, a division of Red Hat"
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/plugin.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/plugin.properties 2008-11-06 03:26:03 UTC (rev 11550)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/plugin.properties 2008-11-06 05:18:40 UTC (rev 11551)
@@ -1,5 +1,5 @@
PLUGIN_NAME=JBossWS Core
-PLUGIN_PROVIDER=Red Hat, Inc.
+PLUGIN_PROVIDER=JBoss, a division of Red Hat
JBOSSWS_CATOGERY_LABEL=JBoss Web Services
JBOSSWS_CATOGERY_DISCRIPTION=Enables Web services generation through the JBoss Web services engine.
16 years, 2 months
JBoss Tools SVN: r11550 - in trunk/jbpm/plugins/org.jboss.tools.jbpm.convert: src/org/jboss/tools/jbpm/convert/bpmnto/wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-11-05 22:26:03 -0500 (Wed, 05 Nov 2008)
New Revision: 11550
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnPoolsChoicePage.java
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java
Log:
JBIDE-3088:BPMN -> jPDL wizard fails if selected file is not BPMN
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml 2008-11-06 02:27:48 UTC (rev 11549)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml 2008-11-06 03:26:03 UTC (rev 11550)
@@ -10,7 +10,6 @@
class="org.jboss.tools.jbpm.convert.b2j.wizard.B2JExportWizard"
id="org.jboss.tools.jbpm.convert.export.b2jexportwizard">
<description>%wizard.description</description>
- <selection name="*.bpmn" class="org.eclipse.core.resources.IFile"/>
</wizard>
</extension>
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnPoolsChoicePage.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnPoolsChoicePage.java 2008-11-06 02:27:48 UTC (rev 11549)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/BpmnPoolsChoicePage.java 2008-11-06 03:26:03 UTC (rev 11550)
@@ -39,7 +39,8 @@
/**
* @author Grid Qian
*
- * the wizardpage used by user to choose the bpmn pool from a bpmn diagram
+ * the wizardpage used by user to choose the bpmn pool from a bpmn
+ * diagram
*/
public class BpmnPoolsChoicePage extends WizardPage {
@@ -161,7 +162,11 @@
if (listViewer == null) {
return;
}
- listViewer.setInput(idMap.entrySet());
+ if (idMap != null) {
+ listViewer.setInput(idMap.entrySet());
+ } else {
+ listViewer.setInput(null);
+ }
wizard = this.getWizard();
List<String> poolIdList = ((BpmnToWizard) wizard).getPoolIdList();
if (poolIdList.size() == 0) {
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java 2008-11-06 02:27:48 UTC (rev 11549)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/bpmnto/wizard/GeneratedFileLocationPage.java 2008-11-06 03:26:03 UTC (rev 11550)
@@ -122,6 +122,9 @@
// Select the parent project of this first bpmn file chosen
ITreeSelection node = (ITreeSelection) currentSelection;
TreePath[] paths = node.getPaths();
+ if(paths.length == 0) {
+ return;
+ }
TreePath projPath = new TreePath(new Object[] { paths[0]
.getFirstSegment() });
TreeSelection projSel = new TreeSelection(projPath);
16 years, 2 months
JBoss Tools SVN: r11549 - trunk/ws/plugins/org.jboss.tools.ws.creation.ui.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-11-05 21:27:48 -0500 (Wed, 05 Nov 2008)
New Revision: 11549
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml
Log:
JBIDE-3005: merge the changes to trunk
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml 2008-11-06 00:35:07 UTC (rev 11548)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml 2008-11-06 02:27:48 UTC (rev 11549)
@@ -68,7 +68,15 @@
class="org.jboss.tools.ws.creation.ui.project.facet.JBossWSPropertyPage"
id="org.jboss.tools.ws.creation.ui.page"
name="JBossWS Runtime">
+ <enabledWhen>
+<adapt
+type="org.eclipse.core.resources.IProject">
+<test
+property="org.eclipse.wst.common.project.facet.core.projectFacet"
+value="jbossws.core"/>
+</adapt>
+</enabledWhen>
</page>
</extension>
-</plugin>
+</plugin>
\ No newline at end of file
16 years, 2 months
JBoss Tools SVN: r11548 - in trunk/as/plugins: org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-11-05 19:35:07 -0500 (Wed, 05 Nov 2008)
New Revision: 11548
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml
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/PackagesPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerConstants.java
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.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
Log:
JBIDE-3073 - hard coded paths fixed in server editor and creation wizard
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2008-11-05 23:05:15 UTC (rev 11547)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2008-11-06 00:35:07 UTC (rev 11548)
@@ -126,7 +126,7 @@
</or></possibleChildren>
<actionProvider
class="org.jboss.ide.eclipse.archives.webtools.ui.FilesetActionProvider"
- id="rg.jboss.ide.eclipse.archives.webtools.ui.extensions.filesets.actions"
+ id="org.jboss.ide.eclipse.archives.webtools.ui.extensions.filesets.actions"
priority="highest">
</actionProvider>
</navigatorContent>
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 2008-11-05 23:05:15 UTC (rev 11547)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModuleModelListener.java 2008-11-06 00:35:07 UTC (rev 11548)
@@ -149,7 +149,7 @@
for( int i = 0; i < serverBehaviors.length; i++ ) {
sourcePath = topLevelPackage.getArchiveFilePath();
depServer = getDeployableServerFromBehavior(serverBehaviors[i]);
- destPath = new Path(depServer.getDeployDirectory()).append(sourcePath.lastSegment());
+ destPath = new Path(depServer.getDeployFolder()).append(sourcePath.lastSegment());
FileUtil.safeDelete(destPath.toFile());
FileUtil.fileSafeCopy(sourcePath.toFile(), destPath.toFile());
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2008-11-05 23:05:15 UTC (rev 11547)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2008-11-06 00:35:07 UTC (rev 11548)
@@ -104,7 +104,7 @@
// remove all of the deployed items
if( pack != null ) {
IPath sourcePath = pack.getArchiveFilePath();
- IPath destPath = new Path(server.getDeployDirectory()).append(sourcePath.lastSegment());
+ IPath destPath = new Path(server.getDeployFolder()).append(sourcePath.lastSegment());
// remove the entire file or folder
PublisherFileUtilListener listener = new PublisherFileUtilListener(eventRoot);
FileUtil.safeDelete(destPath.toFile(), listener);
@@ -116,7 +116,7 @@
protected void publishModule(IModule module, boolean incremental, IProgressMonitor monitor) {
IArchive pack = getPackage(module);
IPath sourcePath = pack.getArchiveFilePath();
- IPath destPathRoot = new Path(server.getDeployDirectory());
+ IPath destPathRoot = new Path(server.getDeployFolder());
// if destination is deploy directory... no need to re-copy!
if( destPathRoot.toOSString().equals(PathUtils.getGlobalLocation(pack).toOSString())) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2008-11-05 23:05:15 UTC (rev 11547)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2008-11-06 00:35:07 UTC (rev 11548)
@@ -185,7 +185,7 @@
}
protected IPath getDeployPath(IModule[] moduleTree) {
- IPath root = new Path( server.getDeployDirectory() );
+ IPath root = new Path( server.getDeployFolder() );
String type, name;
for( int i = 0; i < moduleTree.length; i++ ) {
type = moduleTree[i].getModuleType().getId();
@@ -275,7 +275,7 @@
* @return returns whether an error was found
*/
protected boolean localSafeDelete(IPath deployPath, final EventLogTreeItem event) {
- String serverDeployFolder = server.getDeployDirectory();
+ String serverDeployFolder = server.getDeployFolder();
Assert.isTrue(!deployPath.toFile().equals(new Path(serverDeployFolder).toFile()), "An attempt to delete your entire deploy folder has been prevented. This should never happen");
final Boolean[] errorFound = new Boolean[] { new Boolean(false)};
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2008-11-05 23:05:15 UTC (rev 11547)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2008-11-06 00:35:07 UTC (rev 11548)
@@ -72,7 +72,7 @@
SingleDeployableModuleDelegate delegate = (SingleDeployableModuleDelegate)module.loadAdapter(SingleDeployableModuleDelegate.class, new NullProgressMonitor());
if( delegate != null ) {
IPath sourcePath = delegate.getGlobalSourcePath();
- IPath destFolder = new Path(server.getDeployDirectory());
+ IPath destFolder = new Path(server.getDeployFolder());
File destFile = destFolder.append(sourcePath.lastSegment()).toFile();
FileUtilListener l = new FileUtilListener(root);
FileUtil.fileSafeCopy(sourcePath.toFile(), destFile, l);
@@ -96,7 +96,7 @@
SingleDeployableModuleDelegate delegate = (SingleDeployableModuleDelegate)module.loadAdapter(SingleDeployableModuleDelegate.class, new NullProgressMonitor());
if( delegate != null ) {
IPath sourcePath = delegate.getGlobalSourcePath();
- IPath destFolder = new Path(server.getDeployDirectory());
+ IPath destFolder = new Path(server.getDeployFolder());
FileUtilListener l = new FileUtilListener(root);
FileUtil.safeDelete(destFolder.append(sourcePath.lastSegment()).toFile(), l);
if( l.errorFound ) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServer.java 2008-11-05 23:05:15 UTC (rev 11547)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServer.java 2008-11-06 00:35:07 UTC (rev 11548)
@@ -32,7 +32,11 @@
public static final String DEPLOY_DIRECTORY = "org.jboss.ide.eclipse.as.core.server.deployDirectory";
public static final String TEMP_DEPLOY_DIRECTORY = "org.jboss.ide.eclipse.as.core.server.tempDeployDirectory";
- public String getDeployDirectory();
+ public String getDeployFolder();
+ public void setDeployFolder(String folder);
+ public String getTempDeployFolder();
+ public void setTempDeployFolder(String folder);
+
public String getConfigDirectory();
public ServerAttributeHelper getAttributeHelper();
public IServer getServer();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerConstants.java 2008-11-05 23:05:15 UTC (rev 11547)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerConstants.java 2008-11-06 00:35:07 UTC (rev 11548)
@@ -21,7 +21,6 @@
*/
package org.jboss.ide.eclipse.as.core.server;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
/**
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 2008-11-05 23:05:15 UTC (rev 11547)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2008-11-06 00:35:07 UTC (rev 11548)
@@ -24,8 +24,11 @@
import java.util.ArrayList;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.jst.server.core.IEnterpriseApplication;
import org.eclipse.jst.server.core.IWebModule;
@@ -38,6 +41,7 @@
import org.eclipse.wst.server.core.model.ServerDelegate;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
public class DeployableServer extends ServerDelegate implements IDeployableServer {
@@ -123,14 +127,22 @@
public void modifyModules(IModule[] add, IModule[] remove,
IProgressMonitor monitor) throws CoreException {
}
-
- /* (non-Javadoc)
- * @see org.jboss.ide.eclipse.as.core.server.attributes.IDeployableServer#getDeployDirectory()
- */
- public String getDeployDirectory() {
- return getAttribute(DEPLOY_DIRECTORY, "");
+
+
+ public String getDeployFolder() {
+ return makeGlobal(getRuntime(), new Path(getAttribute(DEPLOY_DIRECTORY, ""))).toString();
}
+ public void setDeployFolder(String folder) {
+ setAttribute(DEPLOY_DIRECTORY, makeRelative(getRuntime(), new Path(folder)).toString());
+ }
+ public String getTempDeployFolder() {
+ return makeGlobal(getRuntime(), new Path(getAttribute(TEMP_DEPLOY_DIRECTORY, ""))).toString();
+ }
+ public void setTempDeployFolder(String folder) {
+ setAttribute(TEMP_DEPLOY_DIRECTORY, makeRelative(getRuntime(), new Path(folder)).toString());
+ }
+
/*
* (non-Javadoc)
* @see org.jboss.ide.eclipse.as.core.server.attributes.IDeployableServer#getAttributeHelper()
@@ -145,6 +157,28 @@
// only used for xpaths and is a complete crap hack ;) misleading, too
public String getConfigDirectory() {
- return getDeployDirectory();
+ return getDeployFolder();
}
+
+ public IJBossServerRuntime getRuntime() {
+ IJBossServerRuntime ajbsrt = (IJBossServerRuntime) getServer().getRuntime()
+ .loadAdapter(IJBossServerRuntime.class,
+ new NullProgressMonitor());
+ return ajbsrt;
+ }
+
+ public static IPath makeRelative(IJBossServerRuntime rt, IPath p) {
+ if( p.isAbsolute()) {
+ if(rt.getRuntime().getLocation().isPrefixOf(p))
+ return p.removeFirstSegments(rt.getRuntime().getLocation().segmentCount()).makeRelative();
+ }
+ return p;
+ }
+
+ public static IPath makeGlobal(IJBossServerRuntime rt, IPath p) {
+ if( !p.isAbsolute()) {
+ return rt.getRuntime().getLocation().append(p).makeAbsolute();
+ }
+ return p;
+ }
}
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 2008-11-05 23:05:15 UTC (rev 11547)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2008-11-06 00:35:07 UTC (rev 11548)
@@ -74,7 +74,7 @@
String config = runtime.getJBossConfiguration();
startArgs = ArgsUtil.setArg(startArgs, "-c", "--configuration", config);
- if( startArgs != null && !startArgs.equals(originalArgs)) {
+ if( startArgs != null && !startArgs.trim().equals(originalArgs)) {
ILaunchConfigurationWorkingCopy wc = lc.getWorkingCopy();
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, startArgs);
wc.doSave();
@@ -125,12 +125,12 @@
return new Path(configDir).toOSString();
}
- public String getDeployDirectory() {
- String folder = super.getDeployDirectory();
- return folder != null ? folder : getDeployDirectory(true);
+ public String getDeployFolder() {
+ String folder = super.getDeployFolder();
+ return folder != null ? folder : getDeployFolder(true);
}
- protected String getDeployDirectory(boolean checkLaunchConfig) {
+ protected String getDeployFolder(boolean checkLaunchConfig) {
return new Path(getConfigDirectory(checkLaunchConfig) + Path.SEPARATOR + DEPLOY).toOSString();
}
@@ -239,18 +239,5 @@
public void setPassword(String pass) {
setAttribute(SERVER_PASSWORD, pass);
}
-
- public String getDeployFolder() {
- return getAttribute(DEPLOY_DIRECTORY, "");
- }
- public void setDeployFolder(String folder) {
- setAttribute(DEPLOY_DIRECTORY, folder);
- }
-
- public String getTempDeployFolder() {
- return getAttribute(TEMP_DEPLOY_DIRECTORY, "");
- }
- public void setTempDeployFolder(String folder) {
- setAttribute(TEMP_DEPLOY_DIRECTORY, folder);
- }
+
}
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2008-11-05 23:05:15 UTC (rev 11547)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2008-11-06 00:35:07 UTC (rev 11548)
@@ -21,10 +21,12 @@
*/
package org.jboss.ide.eclipse.as.ui.editor;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
@@ -48,12 +50,13 @@
import org.eclipse.ui.forms.widgets.ExpandableComposite;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.Section;
+import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.internal.ServerPlugin;
-import org.eclipse.wst.server.core.internal.ServerWorkingCopy;
import org.eclipse.wst.server.ui.editor.ServerEditorSection;
import org.eclipse.wst.server.ui.internal.command.ServerCommand;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
import org.jboss.ide.eclipse.as.ui.Messages;
@@ -107,10 +110,11 @@
}
public void widgetSelected(SelectionEvent e) {
DirectoryDialog d = new DirectoryDialog(new Shell());
- d.setFilterPath(deployText.getText());
+ d.setFilterPath(makeGlobal(deployText.getText()));
String x = d.open();
- if( x != null )
- deployText.setText(x);
+ if( x != null ) {
+ deployText.setText(makeRelative(x));
+ }
}
});
@@ -130,10 +134,10 @@
}
public void widgetSelected(SelectionEvent e) {
DirectoryDialog d = new DirectoryDialog(new Shell());
- d.setFilterPath(tempDeployText.getText());
+ d.setFilterPath(makeGlobal(tempDeployText.getText()));
String x = d.open();
if( x != null )
- tempDeployText.setText(x);
+ tempDeployText.setText(makeRelative(x));
}
});
@@ -196,16 +200,14 @@
public IStatus[] getSaveStatus() {
String error = "";
List<Status> status = new ArrayList<Status>();
- if(!new Path(deployText.getText()).toFile().exists()) {
+ if(!new File(makeGlobal(deployText.getText())).exists()) {
String msg = NLS.bind(Messages.EditorDeployDNE, deployText.getText());
-// "The deploy directory \"" + deployText.getText() + "\" does not exist.";
status.add(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, msg));
error = msg + "\n";
}
- if(!new Path(tempDeployText.getText()).toFile().exists()) {
+ if(!new File(makeGlobal(tempDeployText.getText())).exists()) {
String msg = NLS.bind(Messages.EditorTempDeployDNE, tempDeployText.getText());
- //"The temporary deploy directory \"" + tempDeployText.getText() + "\" does not exist.";
status.add(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, msg));
error = error + msg + "\n";
}
@@ -226,14 +228,14 @@
this.text = deployText;
this.newDir = deployText.getText();
this.listener = deployListener;
- this.oldDir = helper.getAttribute(DeployableServer.DEPLOY_DIRECTORY, "");
+ this.oldDir = helper.getAttribute(IDeployableServer.DEPLOY_DIRECTORY, "");
}
public void execute() {
- helper.setAttribute(DeployableServer.DEPLOY_DIRECTORY, newDir);
+ helper.setAttribute(IDeployableServer.DEPLOY_DIRECTORY, newDir);
}
public void undo() {
text.removeModifyListener(listener);
- helper.setAttribute(DeployableServer.DEPLOY_DIRECTORY, oldDir);
+ helper.setAttribute(IDeployableServer.DEPLOY_DIRECTORY, oldDir);
text.setText(oldDir);
text.addModifyListener(listener);
}
@@ -261,8 +263,27 @@
text.addModifyListener(listener);
}
}
-
+
public void dispose() {
// ignore
}
+
+ private String makeGlobal(String path) {
+ return DeployableServer.makeGlobal(getRuntime(), new Path(path)).toString();
+ }
+
+ private String makeRelative(String path) {
+ return DeployableServer.makeRelative(getRuntime(), new Path(path)).toString();
+ }
+
+ private IJBossServerRuntime getRuntime() {
+ IRuntime r = server.getRuntime();
+ IJBossServerRuntime ajbsrt = null;
+ if (r != null) {
+ ajbsrt = (IJBossServerRuntime) r
+ .loadAdapter(IJBossServerRuntime.class,
+ new NullProgressMonitor());
+ }
+ return ajbsrt;
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2008-11-05 23:05:15 UTC (rev 11547)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2008-11-06 00:35:07 UTC (rev 11548)
@@ -24,8 +24,10 @@
import java.io.File;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -54,6 +56,7 @@
import org.eclipse.wst.server.ui.wizard.IWizardHandle;
import org.eclipse.wst.server.ui.wizard.WizardFragment;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
import org.jboss.ide.eclipse.as.ui.Messages;
@@ -287,35 +290,30 @@
deployBrowseButton.addSelectionListener(new SelectionListener() {
public void widgetDefaultSelected(SelectionEvent e) {}
public void widgetSelected(SelectionEvent e) {
- File file = new File(deployText.getText());
- if (!file.exists()) {
- file = null;
+ String directory = getDirectory(deployText.getText(), deployGroup.getShell());
+ if (directory != null) {
+ deployText.setText(directory);
+ deployVal = deployText.getText();
}
-
- File directory = getDirectory(file, deployGroup.getShell());
- if (directory == null) {
- return;
- }
-
- deployText.setText(directory.getAbsolutePath());
- deployVal = deployText.getText();
}
});
deployText.setEditable(false);
}
- protected File getDirectory(File startingDirectory, Shell shell) {
+ protected String getDirectory(String startingDirectory, Shell shell) {
DirectoryDialog fileDialog = new DirectoryDialog(shell, SWT.OPEN);
- if (startingDirectory != null) {
- fileDialog.setFilterPath(startingDirectory.getPath());
- }
+ if( startingDirectory == null )
+ startingDirectory = getRuntime().getRuntime().getLocation().toString();
+ IPath sp = DeployableServer.makeGlobal(getRuntime(), new Path(startingDirectory));
+ fileDialog.setFilterPath(sp.toString());
+
String dir = fileDialog.open();
if (dir != null) {
dir = dir.trim();
if (dir.length() > 0) {
- return new File(dir);
+ return DeployableServer.makeRelative(getRuntime(), new Path(dir)).toString();
}
}
return null;
@@ -357,7 +355,7 @@
configValLabel.setText(srt.getJBossConfiguration());
IVMInstall install = srt.getVM();
jreValLabel.setText(install.getInstallLocation().getAbsolutePath() + " (" + install.getName() + ")");
- String deployFolder = srt.getRuntime().getLocation().append( "server").append(configValLabel.getText()).append("deploy").toOSString();
+ String deployFolder = new Path("server").append(configValLabel.getText()).append("deploy").toString();
deployTmpFolderVal = srt.getRuntime().getLocation().append( "server").append(configValLabel.getText()).append("tmp").append("jbosstoolsTemp").toOSString();
deployText.setText(deployFolder);
deployVal = deployFolder;
16 years, 2 months