JBoss Tools SVN: r27922 - in trunk/seam/plugins: org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-01-05 14:44:18 -0500 (Wed, 05 Jan 2011)
New Revision: 27922
Modified:
trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java
trunk/seam/plugins/org.jboss.tools.seam.core/templates/ejb/ejbModule/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-7932
Modified: trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2011-01-05 19:33:12 UTC (rev 27921)
+++ trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2011-01-05 19:44:18 UTC (rev 27922)
@@ -12,6 +12,7 @@
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.util.HashSet;
import java.util.Set;
@@ -266,6 +267,43 @@
"ejbModule").getAdapter(IContainer.class));
}
+ /**
+ * https://issues.jboss.org/browse/JBIDE-7932
+ * @throws CoreException
+ * @throws IOException
+ */
+ public void testEarManifestFiles() throws CoreException, IOException {
+ IProject war = earProject.getProject();
+
+ SeamProjectsSet seamProjectsSet = new SeamProjectsSet(earProject
+ .getProject());
+
+ IProject ejb = seamProjectsSet.getEjbProject();
+
+ IFile ejbManifest = (IFile)ejb.findMember(new Path("ejbModule/META-INF/MANIFEST.MF"));
+ assertNotNull("Can't find ejbModule/META-INF/MANIFEST.MF", ejbManifest);
+ assertTrue("ejbModule/META-INF/MANIFEST.MF is not accessible.", ejbManifest.isAccessible());
+ String content = getContents(ejbManifest);
+ assertEquals("Found jboss-seam.jar in ejbModule/META-INF/MANIFEST.MF", -1, content.indexOf("jboss-seam.jar"));
+
+ IFile warManifest = (IFile)war.findMember(new Path("WebContent/META-INF/MANIFEST.MF"));
+ assertNotNull("Can't find WebContent/META-INF/MANIFEST.MF", warManifest);
+ assertTrue("WebContent/META-INF/MANIFEST.MF is not accessible.", warManifest.isAccessible());
+ content = getContents(warManifest);
+ assertFalse("Didn't find jboss-seam.jar in WebContent/META-INF/MANIFEST.MF", content.indexOf("jboss-seam.jar")==-1);
+ }
+
+ private String getContents(IFile file) throws IOException, CoreException {
+ StringBuffer sb = new StringBuffer();
+ InputStream is = file.getContents();
+ int i = 0;
+ while(i!=-1) {
+ i = is.read();
+ sb.append((char)i);
+ }
+ return sb.toString();
+ }
+
public void testMvelEarJars() {
IProject war = earProject.getProject();
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2011-01-05 19:33:12 UTC (rev 27921)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2011-01-05 19:44:18 UTC (rev 27922)
@@ -15,12 +15,13 @@
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
+import java.util.regex.Pattern;
import org.apache.tools.ant.types.FilterSet;
import org.apache.tools.ant.types.FilterSetCollection;
import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
@@ -49,10 +50,10 @@
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action;
import org.jboss.tools.common.util.ResourcesUtils;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
@@ -120,7 +121,9 @@
protected File ejbMetaInf;
protected File droolsLibFolder;
-
+
+ private String jbossSeamPath;
+
private static final Map<String,String> COMPILER_LEVEL_TO_EXEC_ENV = new HashMap<String,String>();
static
@@ -262,17 +265,31 @@
return name.lastIndexOf(".jar") > 0; //$NON-NLS-1$
}
});
- String earJarsStr = ""; //$NON-NLS-1$
+ StringBuffer earJarsStrWar = new StringBuffer();
+ StringBuffer earJarsStrEjb = new StringBuffer();
for (File file : earJars) {
- earJarsStr += " " + file.getName() + " \n"; //$NON-NLS-1$ //$NON-NLS-2$
+ earJarsStrWar.append(" ").append(file.getName()).append(" \n");
+ if (isJBossSeamJar(file)) {
+ jbossSeamPath = file.getAbsolutePath();
+ } else {
+ earJarsStrEjb.append(" ").append(file.getName()).append(" \n");
+ }
}
- FilterSetCollection manifestFilterCol = new FilterSetCollection(projectFilterSet);
- FilterSet manifestFilter = new FilterSet();
- manifestFilter.addFilter("earLibs", earJarsStr); //$NON-NLS-1$
- manifestFilterCol.addFilterSet(manifestFilter);
- AntCopyUtils.copyFileToFolder(new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "war/META-INF/MANIFEST.MF"), webMetaInf, manifestFilterCol, true); //$NON-NLS-1$
- AntCopyUtils.copyFileToFolder(new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "ejb/ejbModule/META-INF/MANIFEST.MF"), ejbMetaInf, manifestFilterCol, true); //$NON-NLS-1$
+ if(earJarsStrEjb.length()>0) {
+ earJarsStrEjb.insert(0, "Class-Path: "); //$NON-NLS-1$
+ }
+ FilterSetCollection manifestFilterColWar = new FilterSetCollection(projectFilterSet);
+ FilterSet manifestFilterWar = new FilterSet();
+ manifestFilterWar.addFilter("earLibs", earJarsStrWar.toString()); //$NON-NLS-1$
+ manifestFilterColWar.addFilterSet(manifestFilterWar);
+ AntCopyUtils.copyFileToFolder(new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "war/META-INF/MANIFEST.MF"), webMetaInf, manifestFilterColWar, true); //$NON-NLS-1$
+
+ FilterSetCollection manifestFilterColEjb = new FilterSetCollection(projectFilterSet);
+ FilterSet manifestFilterEjb = new FilterSet();
+ manifestFilterEjb.addFilter("earClasspath", earJarsStrEjb.toString()); //$NON-NLS-1$
+ manifestFilterColEjb.addFilterSet(manifestFilterEjb);
+ AntCopyUtils.copyFileToFolder(new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "ejb/ejbModule/META-INF/MANIFEST.MF"), ejbMetaInf, manifestFilterColEjb, true); //$NON-NLS-1$
} catch (IOException e) {
SeamCorePlugin.getPluginLog().logError(e);
}
@@ -304,29 +321,56 @@
IProjectFacetVersion jfv = ProjectFacetsManager.create(ejbProjectToBeImported).getInstalledVersion(jf);
JavaFacetUtil.resetClasspath(ejbProjectToBeImported, null, jfv);
ClasspathHelper.addClasspathEntries(ejbProjectToBeImported, pfv);
- WtpUtils.reconfigure(ejbProjectToBeImported,monitor);
+// WtpUtils.reconfigure(ejbProjectToBeImported,monitor);
IProject earProjectToBeImported = wsRoot.getProject(earProjectName);
ResourcesUtils.importExistingProject(earProjectToBeImported, wsPath + "/" + earProjectName, earProjectName, monitor, false);
-
+ if (jbossSeamPath != null && jbossSeamPath.trim().length() > 0 && new File(jbossSeamPath).exists()) {
+ IJavaProject ejbJavaProject = JavaCore.create(ejbProjectToBeImported);
+ if (ejbJavaProject != null) {
+ if (!ejbJavaProject.isOpen()) {
+ ejbJavaProject.open(monitor);
+ }
+ IClasspathEntry[] cps = ejbJavaProject.getRawClasspath();
+ IClasspathEntry[] entries = new IClasspathEntry[cps.length + 1];
+ for (int i = 0; i < cps.length; i++) {
+ entries[i] = cps[i];
+ }
+ IPath path = new Path(jbossSeamPath);
+ IFile[] files = wsRoot.findFilesForLocation(path);
+ IFile f = null;
+ if (files != null && files.length > 0) {
+ f = files[0];
+ } else {
+ f = wsRoot.getFile(path);
+ }
+ if (f.exists()) {
+ path = f.getFullPath();
+ }
+ entries[cps.length] = JavaCore.newLibraryEntry(path, null,
+ null);
+ ejbJavaProject.setRawClasspath(entries, monitor);
+ }
+ }
+ WtpUtils.reconfigure(ejbProjectToBeImported, monitor);
configureJBossAppXml();
-
+
WtpUtils.reconfigure(earProjectToBeImported, monitor);
}
IProject testProjectToBeImported = null;
if(testProjectCreated){
testProjectToBeImported = wsRoot.getProject(testProjectName);
-
+
ResourcesUtils.importExistingProject(testProjectToBeImported, wsPath + "/" + testProjectName, testProjectName, monitor, true);
// Set up compilation level for test project.
-
+
String level = JavaFacetUtils.getCompilerLevel(seamWebProject);
String testLevel = JavaFacetUtils.getCompilerLevel(testProjectToBeImported);
if (!testLevel.equals(level)) {
JavaFacetUtils.setCompilerLevel(testProjectToBeImported, level);
}
testProjectToBeImported.refreshLocal(IResource.DEPTH_INFINITE, monitor);
-
+
final IVMInstall vm = JavaRuntime.getDefaultVMInstall();
if (vm != null) {
int jreIndex = getJreContainer(testProjectToBeImported);
@@ -344,7 +388,7 @@
javaProject.setRawClasspath(entries, null);
}
}
-
+
SeamFacetAbstractInstallDelegate.toggleHibernateOnProject(testProjectToBeImported, consoleName);
}
@@ -354,18 +398,21 @@
WtpUtils.reconfigure(testProjectToBeImported, monitor);
}
- private static String getCorrespondingExecutionEnvironment( String compilerLevel )
- {
+ private boolean isJBossSeamJar(File file) {
+ String regex = "(jboss-seam){1}(-[0-9][0-9\\.]+){0,1}(.jar){1}";
+ return Pattern.matches(regex, file.getName());
+ }
+
+ private static String getCorrespondingExecutionEnvironment( String compilerLevel ) {
final String res = COMPILER_LEVEL_TO_EXEC_ENV.get( compilerLevel );
-
- if( res == null )
- {
+
+ if( res == null ) {
throw new IllegalArgumentException( compilerLevel );
}
-
+
return res;
}
-
+
private static int getJreContainer(final IProject proj)
throws CoreException {
final IJavaProject jproj = JavaCore.create(proj);
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/templates/ejb/ejbModule/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/templates/ejb/ejbModule/META-INF/MANIFEST.MF 2011-01-05 19:33:12 UTC (rev 27921)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/templates/ejb/ejbModule/META-INF/MANIFEST.MF 2011-01-05 19:44:18 UTC (rev 27922)
@@ -1,2 +1,2 @@
Manifest-Version: 1.0
-Class-Path: @earLibs@
+@earClasspath@
13 years, 5 months
JBoss Tools SVN: r27921 - workspace/snjeza/seam-examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-01-05 14:33:12 -0500 (Wed, 05 Jan 2011)
New Revision: 27921
Modified:
workspace/snjeza/seam-examples/booking22.zip
Log:
JBIDE-7423 examples with datasources does not get deployed before "make deployable" is called
Modified: workspace/snjeza/seam-examples/booking22.zip
===================================================================
(Binary files differ)
13 years, 5 months
JBoss Tools SVN: r27920 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-01-05 14:09:14 -0500 (Wed, 05 Jan 2011)
New Revision: 27920
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java
Log:
https://issues.jboss.org/browse/JBIDE-8033 1 test failure in Seam UI
test method renamed and issue moved to next version
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java 2011-01-05 18:54:01 UTC (rev 27919)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java 2011-01-05 19:09:14 UTC (rev 27920)
@@ -448,7 +448,7 @@
assertEquals("Not all quickfixes \"Change scope to...\" found.", 8, found);
}
- public void testAddSetterForProperty() throws CoreException {
+ public void fixMeTestAddSetterForProperty() throws CoreException {
String TARGET_FILE_NAME = "WebContent/WEB-INF/components.xml";
copyContentsFile(TARGET_FILE_NAME, "WebContent/WEB-INF/components.3");
13 years, 5 months
JBoss Tools SVN: r27919 - in trunk: jbpm/plugins/org.jboss.tools.flow.jpdl4 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-01-05 13:54:01 -0500 (Wed, 05 Jan 2011)
New Revision: 27919
Added:
trunk/flow/plugins/org.jboss.tools.flow.common/about.html
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.multipage/about.html
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/about.html
Log:
https://issues.jboss.org/browse/JBIDE-4564 JBPM4 feature has wrong branding data in feature: name, provider, url for update site and license
default about.html page added
Added: trunk/flow/plugins/org.jboss.tools.flow.common/about.html
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/about.html (rev 0)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/about.html 2011-01-05 18:54:01 UTC (rev 27919)
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<HTML>
+
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+
+<BODY lang="EN-US">
+
+<H3>About This Content</H3>
+
+<P>©2007 Red Hat, Inc. All rights reserved</P>
+
+<H3>License</H3>
+
+<P>Red Hat Inc., through its JBoss division, makes available all content in this plug-in
+("Content"). Unless otherwise indicated below, the Content is provided to you
+under the terms and conditions of the Eclipse Public License Version 1.0
+("EPL"). A copy of the EPL is available at
+<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
+For purposes of the EPL, "Program" will mean the Content.</P>
+
+<P>If you did not receive this Content directly from Red Hat Inc., the
+Content is being redistributed by another party ("Redistributor") and different
+terms and conditions may apply to your use of any object code in the Content.
+Check the Redistributor's license that was provided with the Content. If no such
+license exists, contact the Redistributor. Unless otherwise indicated below, the
+terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at
+ <A href="http://www.jboss.org/tools">http://www.jboss.org/tools</A>.</P>
+
+</BODY>
+</HTML>
\ No newline at end of file
Property changes on: trunk/flow/plugins/org.jboss.tools.flow.common/about.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/about.html
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/about.html (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/about.html 2011-01-05 18:54:01 UTC (rev 27919)
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<HTML>
+
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+
+<BODY lang="EN-US">
+
+<H3>About This Content</H3>
+
+<P>©2007 Red Hat, Inc. All rights reserved</P>
+
+<H3>License</H3>
+
+<P>Red Hat Inc., through its JBoss division, makes available all content in this plug-in
+("Content"). Unless otherwise indicated below, the Content is provided to you
+under the terms and conditions of the Eclipse Public License Version 1.0
+("EPL"). A copy of the EPL is available at
+<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
+For purposes of the EPL, "Program" will mean the Content.</P>
+
+<P>If you did not receive this Content directly from Red Hat Inc., the
+Content is being redistributed by another party ("Redistributor") and different
+terms and conditions may apply to your use of any object code in the Content.
+Check the Redistributor's license that was provided with the Content. If no such
+license exists, contact the Redistributor. Unless otherwise indicated below, the
+terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at
+ <A href="http://www.jboss.org/tools">http://www.jboss.org/tools</A>.</P>
+
+</BODY>
+</HTML>
\ No newline at end of file
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/about.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.multipage/about.html
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.multipage/about.html (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.multipage/about.html 2011-01-05 18:54:01 UTC (rev 27919)
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<HTML>
+
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+
+<BODY lang="EN-US">
+
+<H3>About This Content</H3>
+
+<P>©2007 Red Hat, Inc. All rights reserved</P>
+
+<H3>License</H3>
+
+<P>Red Hat Inc., through its JBoss division, makes available all content in this plug-in
+("Content"). Unless otherwise indicated below, the Content is provided to you
+under the terms and conditions of the Eclipse Public License Version 1.0
+("EPL"). A copy of the EPL is available at
+<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
+For purposes of the EPL, "Program" will mean the Content.</P>
+
+<P>If you did not receive this Content directly from Red Hat Inc., the
+Content is being redistributed by another party ("Redistributor") and different
+terms and conditions may apply to your use of any object code in the Content.
+Check the Redistributor's license that was provided with the Content. If no such
+license exists, contact the Redistributor. Unless otherwise indicated below, the
+terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at
+ <A href="http://www.jboss.org/tools">http://www.jboss.org/tools</A>.</P>
+
+</BODY>
+</HTML>
\ No newline at end of file
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.multipage/about.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
13 years, 5 months
JBoss Tools SVN: r27918 - trunk/download.jboss.org/jbosstools/builds/cascade.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-01-05 11:36:49 -0500 (Wed, 05 Jan 2011)
New Revision: 27918
Modified:
trunk/download.jboss.org/jbosstools/builds/cascade/trunk.html
Log:
clean up links and mark more stuff deprecated
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/trunk.html
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/trunk.html 2011-01-05 16:12:31 UTC (rev 27917)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/trunk.html 2011-01-05 16:36:49 UTC (rev 27918)
@@ -13,7 +13,8 @@
cellspacing="0" cellpadding="0">
<tr>
<td colspan="2"><a href="https://www.jboss.org/tools"><img
- src="https://www.jboss.org/dms/tools/images/tools-banner.png" border="0"/></a></td>
+ src="https://www.jboss.org/dms/tools/images/tools-banner.png"
+ border="0" /></a></td>
</tr>
<tr>
<td class="bodyText">  </td>
@@ -21,99 +22,123 @@
<tr>
<td class="bodyText">  </td>
<td class="bodyText">
-<p class="bodyText"><i>Note: <b style="color: red">red links</b> require VPN
-access.</i>
-<h2 class="title">Build Job Cascade:</h2>
-<ul>
- <li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.2_trunk.target-platform">Local
- Target Platform build</a> (build + publish)
- <ul>
- <li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.2_trunk.continuous">Continuous
- build</a> (build only, no tests, no publish)</li>
- <li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.2_trunk.tests">Tests
- build</a> (build + tests, no publish)</li>
- <li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.2_trunk.nightly">Nightly
- build</a> (build + tests, publish)</li>
- <li><a style="color: red" href="http://hudson.qa.jboss.com/hudson/view/DevStudio_Trunk/">drools, teiid, pi4soa, savara</a> (other components: build, test, publish)</a></li>
+ <p class="bodyText"><i>Note: <b style="color: red">red
+ links</b> require VPN access.</i>
+ <h2 class="title">Build Job Cascade:</h2>
<ul>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.2_trunk.aggregate-publish">Aggregate
- build publisher</a> (publish select pieces of aggregate site for use by
- JBDS uberbuild)
- <hr />
- </li>
-</ul>
+ href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.2_trunk.target-platform">Local
+ Target Platform build</a> (build + publish)
+ <ul>
+ <li><a style="color: red"
+ href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.2_trunk.continuous">Continuous
+ build</a> (build only, no tests, no publish)</li>
+ <li><a style="color: red"
+ href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.2_trunk.tests">Tests
+ build</a> (build + tests, no publish)</li>
+ <li><em><a style="color: red"
+ href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.2_stable_branch.nightly">Nightly
+ build</a> (build + tests, publish) :: disabled in favour of 30+
+ per-component jobs :: <b>deprecated</b></em></li>
+ <li><a style="color: red"
+ href="http://hudson.qa.jboss.com/hudson/view/DevStudio_Trunk/">All
+ components' jobs, including JBT core + drools, teiid, pi4soa, savara</a>
+ (build, test, publish) :: <b><a style="color: red"
+ href="http://hudson.qa.jboss.com/hudson/view/DevStudio_Trunk/portlet/dashboard_...">list
+ of unstable jobs</a></b></li>
+ <ul>
+ <li><a style="color: red"
+ href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.2_trunk.aggregate">Aggregate
+ build</a> (collect components into a single update site for downstream use and publishing to sf.net)
+ <ul>
+ <li><em><a style="color: red"
+ href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.2_trunk.aggregate-publish">Aggregate
+ build publisher</a> (publish select pieces of aggregate site for use
+ by JBDS uberbuild) :: <b>deprecated</b></em>
+ </li>
+ </ul>
+
+ </li>
+ </ul>
+ </ul>
+ <hr />
<li><a style="color: red"
href="http://hudson.qa.jboss.com/hudson/job/devstudio-4.0.target-platform">Local
JBDS Target Platform build</a> (build + publish)
<ul>
- <li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/devstudio-4.0_trunk.updatesite">JBDS
- Aggregate site build</a> (build core [JBT + JBDS], third-party, and
- preview sites, publish)
<ul>
<li><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/devstudio-4.0_trunk.product">JBDS
- Product build (experimental)</a> (combine JBDS components + TP into
- installers, publish)</li>
- <li><em><a style="color: red"
- href="http://hudson.qa.jboss.com/hudson/job/devstudio-4.0_trunk.uberbuild">JBDS
- PDE "Uberbuilder" build</a> (compile JBDS components + some aggregate
- pieces into installers, publish) :: deprecated</em></li>
+ href="http://hudson.qa.jboss.com/hudson/job/devstudio-4.0_trunk.updatesite">JBDS
+ Aggregate site build</a> (build Core [JBT + JBDS], Extras, Tech Preview
+ sites, then publish)
+ <ul>
+ <li><a style="color: red"
+ href="http://hudson.qa.jboss.com/hudson/job/devstudio-4.0_trunk.product">JBDS
+ Product builds</a> (combine JBDS components + TP into installers,
+ publish)</li>
+ <ul><li><em><a style="color: red"
+ href="http://hudson.qa.jboss.com/hudson/job/devstudio-4.0_trunk.uberbuild">JBDS
+ PDE "Uberbuild" builds</a> (compile JBDS components + some aggregate
+ pieces into installers, publish) :: <b>deprecated</b></em></li></ul>
+ </ul>
+ </li>
</ul>
- </li>
- </ul>
</li>
</ul>
</li>
- </ul>
- </li>
-</ul>
-<h2 class="title">Results:</h2>
-<ul>
- <li>JBT Aggregate update sites: <a
- href="http://download.jboss.org/jbosstools/updates/nightly/">http://download.jboss.org/jbosstools/updates/nightly/</a>
- :: <a
- href="http://download.jboss.org/jbosstools/updates/nightly/trunk/">latest
- from trunk</a></li>
- <li>JBT Aggregate builds: <a
- href="http://download.jboss.org/jbosstools/builds/nightly/">http://download.jboss.org/jbosstools/builds/nightly/</a>
- :: <a
- href="http://download.jboss.org/jbosstools/builds/nightly/trunk/latestBuild.html">latest
- from trunk</a>
- <ul>
- <li>JBT Component builds: <a
- href="http://download.jboss.org/jbosstools/builds/staging/">http://download.jboss.org/jbosstools/builds/staging/</a>
- <hr />
+ </ul>
+ </li>
+ </ul>
+ <h2 class="title">Results:</h2>
<ul>
- <li>JBDS Aggregate update sites: <a style="color: red"
- href="http://reports.qa.atl.jboss.com/binaries/RHDS/updates/nightly/">http://reports.qa.atl.jboss.com/binaries/RHDS/updates/nightly/</a>
- :: <a style="color: red"
- href="http://reports.qa.atl.jboss.com/binaries/RHDS/updates/nightly/trunk/">latest
- from trunk</a></li>
- <li>JBDS Product builds: <a style="color: red"
- href="http://reports.qa.atl.jboss.com/binaries/RHDS/builds/staging/devstudio-4....">http://reports.qa.atl.jboss.com/binaries/RHDS/builds/staging/</a></li>
- <li><em>JBDS "Uber" builds: <a style="color: red"
- href="http://reports.qa.atl.jboss.com/binaries/RHDS/builds/nightly/">http://reports.qa.atl.jboss.com/binaries/RHDS/builds/nightly/</a>
- :: <a style="color: red"
- href="http://reports.qa.atl.jboss.com/binaries/RHDS/builds/nightly/trunk/latest...">latest
- from trunk</a> :: deprecated </em>
+ <li>JBT Target Platform build: <a
+ href="http://download.jboss.org/jbosstools/updates/target-platform/">http://download.jboss.org/jbosstools/updates/target-platform/</a>
<ul>
- <li>JBDS Component builds: <a style="color: red"
- href="http://reports.qa.atl.jboss.com/binaries/RHDS/builds/staging/">http://reports.qa.atl.jboss.com/binaries/RHDS/builds/staging/</a></li>
- <li>JBDS Other update sites: <a style="color: red"
- href="http://reports.qa.atl.jboss.com/binaries/RHDS/builds/staging/">http://reports.qa.atl.jboss.com/binaries/RHDS/builds/staging/</a></li>
+ <li>JBT Component builds: <a
+ href="http://download.jboss.org/jbosstools/builds/staging/">http://download.jboss.org/jbosstools/builds/staging/</a>
+ :: <b><a
+ href="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/">composite
+ update site</a></b>
+ <ul>
+ <li>JBT Aggregate builds: <a
+ href="http://download.jboss.org/jbosstools/builds/nightly/">http://download.jboss.org/jbosstools/builds/nightly/</a>
+ :: <a
+ href="http://download.jboss.org/jbosstools/builds/nightly/trunk/latestBuild.html">latest
+ from trunk</a> :: <a
+ href="http://download.jboss.org/jbosstools/updates/nightly/trunk/">updates</a>
+ <ul><li><em>Select JBT component updates: <a href="http://download.jboss.org/jbosstools/updates/staging/">http://download.jboss.org/jbosstools/updates/staging/</a> (used by "Uberbuild") :: <b>deprecated</b></em></li></ul>
+ </ul>
</ul>
+ <hr />
+ <li>JBDS Target Platform build: <a style="color: red"
+ href="http://reports.qa.atl.jboss.com/binaries/RHDS/updates/jbds-target-platform/">http://reports.qa.atl.jboss.com/binaries/RHDS/updates/jbds-target-platform/</a>
+ <ul>
+ <ul>
+ <li>JBDS Aggregate updates: <a style="color: red"
+ href="http://reports.qa.atl.jboss.com/binaries/RHDS/builds/staging/devstudio-4....">http://reports.qa.atl.jboss.com/binaries/RHDS/builds/staging/</a>
+ (Core [JBT + JBDS], Extras, Tech Preview)</li>
+ <ul>
+ <li>JBDS Product builds: <a style="color: red"
+ href="http://reports.qa.atl.jboss.com/binaries/RHDS/builds/staging/devstudio-4....">http://reports.qa.atl.jboss.com/binaries/RHDS/builds/staging/</a>
+ :: <a style="color: red"
+ href="http://reports.qa.atl.jboss.com/binaries/RHDS/builds/staging/devstudio-4....">latest
+ from trunk</a> :: <a style="color: red"
+ href="http://reports.qa.atl.jboss.com/binaries/RHDS/builds/staging/devstudio-4....">updates</a></li>
+
+ <ul><li><em>JBDS "Uberbuild" builds: <a style="color: red"
+ href="http://reports.qa.atl.jboss.com/binaries/RHDS/builds/nightly/">http://reports.qa.atl.jboss.com/binaries/RHDS/builds/nightly/</a>
+ :: <a style="color: red"
+ href="http://reports.qa.atl.jboss.com/binaries/RHDS/builds/nightly/trunk/latest...">latest
+ from trunk</a> :: <a style="color: red"
+ href="http://reports.qa.atl.jboss.com/binaries/RHDS/updates/nightly/trunk/">updates</a>
+ :: <b>deprecated</b> </em></li></ul>
+ </ul>
+ </ul>
+ </ul>
</li>
</ul>
- </li>
- </ul>
- </li>
-</ul>
-</td></tr></table>
+ </td>
+ </tr>
+</table>
</body>
</html>
\ No newline at end of file
13 years, 5 months
JBoss Tools SVN: r27917 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console: workbench and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2011-01-05 11:12:31 -0500 (Wed, 05 Jan 2011)
New Revision: 27917
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java
Log:
https://issues.jboss.org/browse/JBIDE-8027 - correct message in case of null execution context, fixed
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java 2011-01-05 15:55:28 UTC (rev 27916)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java 2011-01-05 16:12:31 UTC (rev 27917)
@@ -539,7 +539,7 @@
return file;
}
final ConsoleConfiguration cc2 = consoleConfig;
- List<String> documentPaths = (List<String>)consoleConfig.getExecutionContext().execute(new ExecutionContext.Command() {
+ List<String> documentPaths = (List<String>)consoleConfig.execute(new ExecutionContext.Command() {
public Object execute() {
return OpenMappingUtilsEjb3.enumDocuments(cc2);
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java 2011-01-05 15:55:28 UTC (rev 27916)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java 2011-01-05 16:12:31 UTC (rev 27917)
@@ -104,7 +104,7 @@
protected void readDatabaseSchema(final IProgressMonitor monitor, final DefaultDatabaseCollector db, ConsoleConfiguration consoleConfiguration, final ReverseEngineeringStrategy strategy) {
final Configuration configuration = consoleConfiguration.buildWith(null, false);
- consoleConfiguration.getExecutionContext().execute(new ExecutionContext.Command() {
+ consoleConfiguration.execute(new ExecutionContext.Command() {
public Object execute() {
Settings settings = configuration.buildSettings();
13 years, 5 months
JBoss Tools SVN: r27916 - trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2011-01-05 10:55:28 -0500 (Wed, 05 Jan 2011)
New Revision: 27916
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleMessages.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleMessages.properties
Log:
https://issues.jboss.org/browse/JBIDE-8027 - correct message in case of null execution context, fixed
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2011-01-05 15:05:26 UTC (rev 27915)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2011-01-05 15:55:28 UTC (rev 27916)
@@ -34,6 +34,7 @@
import java.util.Iterator;
import java.util.Map;
+import org.eclipse.osgi.util.NLS;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.Configuration;
@@ -67,11 +68,11 @@
}
public Object execute(Command c) {
- // to avoid npe, in case when configuration closed from other thread during it's load time
if (executionContext != null) {
return executionContext.execute(c);
}
- return null;
+ final String msg = NLS.bind(ConsoleMessages.ConsoleConfiguration_null_execution_context, getName());
+ throw new HibernateConsoleRuntimeException(msg);
}
public ConsoleConfigurationPreferences prefs = null;
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleMessages.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleMessages.java 2011-01-05 15:05:26 UTC (rev 27915)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleMessages.java 2011-01-05 15:55:28 UTC (rev 27916)
@@ -16,6 +16,7 @@
public static String ConsoleConfiguration_invalid_configuration;
public static String ConsoleConfiguration_persistence_unit_not_found;
public static String ConsoleConfiguration_problems_while_loading_database_driverclass;
+ public static String ConsoleConfiguration_null_execution_context;
public static String JavaPage_no_info;
public static String JavaPage_not_allowed;
public static String KnownConfigurations_could_not_write_state;
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleMessages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleMessages.properties 2011-01-05 15:05:26 UTC (rev 27915)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleMessages.properties 2011-01-05 15:55:28 UTC (rev 27916)
@@ -9,6 +9,7 @@
ConsoleConfiguration_invalid_configuration=invalid configuration
ConsoleConfiguration_persistence_unit_not_found=Persistence unit not found: ''{0}''.
ConsoleConfiguration_problems_while_loading_database_driverclass=Problems while loading database driverclass ({0})
+ConsoleConfiguration_null_execution_context=Command execution interrupted: Execution context is null, ''{0}'' console configuration is closed.
JavaPage_no_info=<no info>
JavaPage_not_allowed=System.exit not allowed\!
KnownConfigurations_could_not_write_state=Could not write state
13 years, 5 months
JBoss Tools SVN: r27915 - in trunk/deltacloud/plugins: org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-05 10:05:26 -0500 (Wed, 05 Jan 2011)
New Revision: 27915
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilterWizard.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilterWizard.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
Log:
[JBIDE-7294] hunting down the cases where alias get lost
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2011-01-05 14:58:46 UTC (rev 27914)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2011-01-05 15:05:26 UTC (rev 27915)
@@ -38,7 +38,6 @@
public class DeltaCloud extends ObservablePojo {
public static final String PROP_INSTANCES = "instances";
- public static final String PROP_INSTANCES_ADDED = "instancesAdded";
public static final String PROP_INSTANCES_REMOVED = "instancesRemoved";
public static final String PROP_IMAGES = "images";
public static final String PROP_NAME = "name";
@@ -102,14 +101,17 @@
boolean nameChanged = updateName(name);
boolean connectionPropertiesChanged = updateConnectionProperties(url, username, password);
+ if (connectionPropertiesChanged) {
+ client = createClient(url, username, password);
+ loadChildren();
+ }
+
if (nameChanged || connectionPropertiesChanged) {
this.passwordStore.update(new DeltaCloudPasswordStorageKey(name, username), password);
+ // TODO: move to notification based approach
+ DeltaCloudManager.getDefault().saveClouds();
}
- if (connectionPropertiesChanged) {
- client = createClient(url, username, password);
- loadChildren();
- }
}
private boolean updateName(String name) {
@@ -218,6 +220,7 @@
// notifying the changed instance
firePropertyChange(
PROP_INSTANCES, getInstancesRepository().get(), getInstancesRepository().get());
+ DeltaCloudManager.getDefault().saveClouds();
}
}
@@ -247,6 +250,8 @@
// TODO: remove notification with all instanceRepo, replace by
// notifying the changed instance
firePropertyChange(PROP_IMAGES, getImagesRepository().get(), getImagesRepository().get());
+ // TODO: move to notification based approach
+ DeltaCloudManager.getDefault().saveClouds();
}
}
@@ -580,7 +585,8 @@
// TODO: remove notification with all instanceRepo, replace by
// notifying the changed instance
firePropertyChange(PROP_INSTANCES, instances, repo.get());
- firePropertyChange(PROP_INSTANCES_ADDED, null, deltaCloudInstance);
+ // TODO: move to notification based approach
+ DeltaCloudManager.getDefault().saveClouds();
return deltaCloudInstance;
}
} catch (DeltaCloudClientException e) {
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2011-01-05 14:58:46 UTC (rev 27914)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2011-01-05 15:05:26 UTC (rev 27915)
@@ -167,7 +167,7 @@
}
// TODO: move to marshaler component
- public void saveClouds() throws DeltaCloudException {
+ protected void saveClouds() throws DeltaCloudException {
try {
File cloudFile = getOrCreateCloudFile();
PrintWriter p = new PrintWriter(new BufferedWriter(new FileWriter(cloudFile)));
@@ -209,13 +209,14 @@
private void printInstances(DeltaCloud d, PrintWriter printWriter) {
try {
for (DeltaCloudInstance instance : d.getInstances()) {
- DeltaCloudXMLBuilder.tag(DeltaCloudXMLBuilder.TAG_INSTANCE, printWriter);
- DeltaCloudXMLBuilder.attribute(DeltaCloudXMLBuilder.ATTR_ID, instance.getId(), printWriter);
- DeltaCloudXMLBuilder.attribute(
- DeltaCloudXMLBuilder.ATTR_ALIAS, StringUtils.null2EmptyString(instance.getAlias()),
- printWriter);
- DeltaCloudXMLBuilder.closeTag(printWriter);
- DeltaCloudXMLBuilder.endTag(DeltaCloudXMLBuilder.TAG_INSTANCE, printWriter);
+ String alias = instance.getAlias();
+ if (alias != null) {
+ DeltaCloudXMLBuilder.tag(DeltaCloudXMLBuilder.TAG_INSTANCE, printWriter);
+ DeltaCloudXMLBuilder.attribute(DeltaCloudXMLBuilder.ATTR_ID, instance.getId(), printWriter);
+ DeltaCloudXMLBuilder.attribute(DeltaCloudXMLBuilder.ATTR_ALIAS, alias, printWriter);
+ DeltaCloudXMLBuilder.closeTag(printWriter);
+ DeltaCloudXMLBuilder.endTag(DeltaCloudXMLBuilder.TAG_INSTANCE, printWriter);
+ }
}
} catch (DeltaCloudException e) {
// ignore
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2011-01-05 14:58:46 UTC (rev 27914)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2011-01-05 15:05:26 UTC (rev 27915)
@@ -13,7 +13,6 @@
import java.text.MessageFormat;
import org.jboss.tools.deltacloud.core.DeltaCloud;
-import org.jboss.tools.deltacloud.core.DeltaCloudManager;
import org.jboss.tools.deltacloud.core.Driver;
import org.jboss.tools.deltacloud.ui.ErrorUtils;
@@ -38,7 +37,6 @@
Driver driver = mainPage.getModel().getDriver();
try {
initialCloud.update(name, url, username, password, driver);
- DeltaCloudManager.getDefault().saveClouds();
} catch (Exception e) {
// TODO internationalize strings
ErrorUtils.handleError("Error",
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilterWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilterWizard.java 2011-01-05 14:58:46 UTC (rev 27914)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilterWizard.java 2011-01-05 15:05:26 UTC (rev 27915)
@@ -12,7 +12,6 @@
import org.eclipse.jface.wizard.Wizard;
import org.jboss.tools.deltacloud.core.DeltaCloud;
-import org.jboss.tools.deltacloud.core.DeltaCloudManager;
import org.jboss.tools.deltacloud.ui.ErrorUtils;
/**
@@ -47,11 +46,11 @@
String descRule = mainPage.getDescRule();
try {
- cloud.updateImageFilter(nameRule + ";" + //$NON-NLS-1$
+ cloud.updateImageFilter(
+ nameRule + ";" + //$NON-NLS-1$
idRule + ";" + //$NON-NLS-1$
archRule + ";" + //$NON-NLS-1$
descRule);
- DeltaCloudManager.getDefault().saveClouds();
} catch (Exception e) {
// TODO: internationalize strings
ErrorUtils.handleError(
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilterWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilterWizard.java 2011-01-05 14:58:46 UTC (rev 27914)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilterWizard.java 2011-01-05 15:05:26 UTC (rev 27915)
@@ -13,7 +13,6 @@
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Display;
import org.jboss.tools.deltacloud.core.DeltaCloud;
-import org.jboss.tools.deltacloud.core.DeltaCloudManager;
import org.jboss.tools.deltacloud.ui.ErrorUtils;
/**
@@ -57,7 +56,6 @@
keyNameRule + ";" + //$NON-NLS-1$
realmRule + ";" + //$NON-NLS-1$
profileRule);
- DeltaCloudManager.getDefault().saveClouds();
} catch (Exception e) {
// TODO: internationalize strings
ErrorUtils.handleError(
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2011-01-05 14:58:46 UTC (rev 27914)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2011-01-05 15:05:26 UTC (rev 27915)
@@ -116,7 +116,6 @@
try {
DeltaCloud newCloud = new DeltaCloud(name, url, username, password, driver);
DeltaCloudManager.getDefault().addCloud(newCloud);
- DeltaCloudManager.getDefault().saveClouds();
} catch (Exception e) {
// TODO internationalize strings
ErrorUtils
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2011-01-05 14:58:46 UTC (rev 27914)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2011-01-05 15:05:26 UTC (rev 27915)
@@ -23,7 +23,6 @@
import org.jboss.tools.deltacloud.core.DeltaCloudException;
import org.jboss.tools.deltacloud.core.DeltaCloudImage;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
-import org.jboss.tools.deltacloud.core.DeltaCloudManager;
import org.jboss.tools.deltacloud.core.job.InstanceStateJob;
import org.jboss.tools.deltacloud.ui.Activator;
import org.jboss.tools.deltacloud.ui.DeltacloudUIExtensionManager;
@@ -56,6 +55,11 @@
public NewInstanceWizard(DeltaCloud cloud) {
this.cloud = cloud;
+ try {
+ this.image = cloud.getLastImage();
+ } catch (DeltaCloudException e) {
+ // ignore
+ }
}
public NewInstanceWizard(DeltaCloud cloud, DeltaCloudImage image) {
@@ -102,7 +106,6 @@
boolean result = false;
Exception e = null;
try {
- DeltaCloudManager.getDefault().saveClouds();
boolean dontShowDialog = prefs.getBoolean(IDeltaCloudPreferenceConstants.DONT_CONFIRM_CREATE_INSTANCE,
false);
if (!dontShowDialog) {
@@ -126,26 +129,26 @@
instance = cloud.createInstance(name, imageId, realmId, profileId, keyId, memory, storage);
if (instance != null) {
result = true;
- }
- if (instance != null
- && instance.getState().equals(DeltaCloudInstance.State.PENDING)) {
- // TODO use chained job? Maybe. But chainedJob needs to be moved
- ChainedJob first =
- new InstanceStateJob(
- WizardMessages.getFormattedString(STARTING_INSTANCE_TITLE, instance.getName()),
- instance,
- DeltaCloudInstance.State.RUNNING);
- first.setUser(true);
- ChainedJob last = first;
- ChainedJob temp;
- for (int i = 0; i < additionalPages.length; i++) {
- temp = additionalPages[i].getPerformFinishJob(instance);
- if (temp != null) {
- last.setNextJob(temp);
- last = temp;
+ if (instance.getState().equals(DeltaCloudInstance.State.PENDING)) {
+ // TODO use chained job? Maybe. But chainedJob needs to be
+ // moved
+ ChainedJob first =
+ new InstanceStateJob(
+ WizardMessages.getFormattedString(STARTING_INSTANCE_TITLE, instance.getName()),
+ instance,
+ DeltaCloudInstance.State.RUNNING);
+ first.setUser(true);
+ ChainedJob last = first;
+ ChainedJob temp;
+ for (int i = 0; i < additionalPages.length; i++) {
+ temp = additionalPages[i].getPerformFinishJob(instance);
+ if (temp != null) {
+ last.setNextJob(temp);
+ last = temp;
+ }
}
+ first.schedule();
}
- first.schedule();
}
} catch (DeltaCloudException ex) {
e = ex;
13 years, 5 months
JBoss Tools SVN: r27914 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-05 09:58:46 -0500 (Wed, 05 Jan 2011)
New Revision: 27914
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java
Log:
cleanup
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2011-01-05 14:55:47 UTC (rev 27913)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2011-01-05 14:58:46 UTC (rev 27914)
@@ -279,8 +279,7 @@
}
@Override
- public Instance createInstance(String imageId)
- throws DeltaCloudClientException {
+ public Instance createInstance(String imageId) throws DeltaCloudClientException {
try {
return buildInstance(requestStringResponse(new CreateInstanceRequest(baseUrl, imageId)));
} catch (DeltaCloudClientException e) {
@@ -383,11 +382,9 @@
property.setKind(kind);
if (Kind.RANGE.toString().equals(property.getKind())) {
setRange(element, property);
- }
- else if (Kind.ENUM.toString().equals(property.getKind())) {
+ } else if (Kind.ENUM.toString().equals(property.getKind())) {
setEnum(element, property);
- }
- else if (Kind.FIXED.toString().equals(property.getKind())) {
+ } else if (Kind.FIXED.toString().equals(property.getKind())) {
// no special treatement
}
return property;
@@ -406,7 +403,7 @@
Element enumElement = (Element) node;
NodeList nodeList = enumElement.getElementsByTagName("entry");
ArrayList<String> enumValues = new ArrayList<String>();
- for (int i = 0; i< nodeList.getLength(); i++) {
+ for (int i = 0; i < nodeList.getLength(); i++) {
Node entryNode = nodeList.item(i);
Assert.isTrue(entryNode instanceof Element);
Element entryElement = (Element) entryNode;
13 years, 5 months
JBoss Tools SVN: r27913 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-05 09:55:47 -0500 (Wed, 05 Jan 2011)
New Revision: 27913
Removed:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/DeltaCloudObjectLabelUtils.java
Log:
[JBIDE-7294] changed label in tree to display ALIAS__OR__NAME[ID] for instances
Deleted: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/DeltaCloudObjectLabelUtils.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/DeltaCloudObjectLabelUtils.java 2011-01-05 14:55:29 UTC (rev 27912)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/DeltaCloudObjectLabelUtils.java 2011-01-05 14:55:47 UTC (rev 27913)
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.internal.deltacloud.ui.utils;
-
-import org.jboss.tools.deltacloud.core.DeltaCloudImage;
-import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
-
-/**
- * @author André Dietisheim
- */
-public class DeltaCloudObjectLabelUtils {
- public static String getLabel(DeltaCloudImage image) {
- StringBuilder builder = new StringBuilder();
- if (image != null) {
- if (image.getName() != null) {
- builder.append(image.getName()).append(' ');
- }
- if (image.getId() != null) {
- builder.append('[').append(image.getId()).append(']');
- }
- }
- return builder.toString();
- }
-
- public static String getLabel(DeltaCloudInstance instance) {
- StringBuilder sb = new StringBuilder();
- if (instance != null) {
- String alias = instance.getAlias();
- if (alias != null) {
- sb.append(alias).append(' ');
- }
- String name = instance.getName();
- if (name != null) {
- if (alias == null) {
- sb.append(name);
- } else if (!alias.equals(name)) {
- sb.append('[').append(name).append(']');
- }
- }
- if (instance.getId() != null) {
- sb.append('[').append(instance.getId()).append(']');
- }
- }
- return sb.toString();
- }
-}
13 years, 5 months
