JBoss Tools SVN: r41204 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-05-21 07:58:14 -0400 (Mon, 21 May 2012)
New Revision: 41204
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/ImageRepository.java
Log:
added author
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/ImageRepository.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/ImageRepository.java 2012-05-21 11:45:55 UTC (rev 41203)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/ImageRepository.java 2012-05-21 11:58:14 UTC (rev 41204)
@@ -22,6 +22,9 @@
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
+/**
+ * @author Andre Dietisheim
+ */
public class ImageRepository {
private ImageRegistry imageRegistry;
13 years, 10 months
JBoss Tools SVN: r41203 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-05-21 07:45:55 -0400 (Mon, 21 May 2012)
New Revision: 41203
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
Log:
[JBIDE-11898] fixed endless recursion
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-05-21 11:01:13 UTC (rev 41202)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-05-21 11:45:55 UTC (rev 41203)
@@ -13,6 +13,7 @@
import java.net.SocketTimeoutException;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -396,7 +397,7 @@
}
protected void setSelectedEmbeddableCartridges(List<? extends IEmbeddableCartridge> cartridges) {
- setSelectedEmbeddableCartridges(cartridges);
+ setSelectedEmbeddableCartridges(new HashSet<IEmbeddableCartridge>(cartridges));
}
public void setSelectedEmbeddableCartridges(Set<IEmbeddableCartridge> selectedEmbeddableCartridges) {
13 years, 10 months
JBoss Tools SVN: r41202 - branches/soatools-3.3.0.Beta2/build/aggregate.
by jbosstools-commits＠lists.jboss.org
Author: dpalmer
Date: 2012-05-21 07:01:13 -0400 (Mon, 21 May 2012)
New Revision: 41202
Modified:
branches/soatools-3.3.0.Beta2/build/aggregate/build.xml
Log:
[JBIDE-11720] Adjusted regex to match the soatools job names as well as the devstudio names
Modified: branches/soatools-3.3.0.Beta2/build/aggregate/build.xml
===================================================================
--- branches/soatools-3.3.0.Beta2/build/aggregate/build.xml 2012-05-21 10:50:32 UTC (rev 41201)
+++ branches/soatools-3.3.0.Beta2/build/aggregate/build.xml 2012-05-21 11:01:13 UTC (rev 41202)
@@ -525,7 +525,7 @@
<isset property="BUILD_ALIAS" />
</and>
<then>
- <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9.]+)(_.*?\.)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\4" />
+ <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9.]+)(_.*?)\.(.*?)\.*aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\4" />
</then>
<else>
<propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9.]+)(.*).aggregate" replace=": \2.${BUILD_TS}-H${BUILD_NUMBER}\3" />
13 years, 10 months
JBoss Tools SVN: r41201 - trunk/build/aggregate.
by jbosstools-commits＠lists.jboss.org
Author: dpalmer
Date: 2012-05-21 06:50:32 -0400 (Mon, 21 May 2012)
New Revision: 41201
Modified:
trunk/build/aggregate/build.xml
Log:
[JBIDE-11720] Adjusted regex to match the soatools job names as well as the devstudio names
Modified: trunk/build/aggregate/build.xml
===================================================================
--- trunk/build/aggregate/build.xml 2012-05-21 10:26:50 UTC (rev 41200)
+++ trunk/build/aggregate/build.xml 2012-05-21 10:50:32 UTC (rev 41201)
@@ -525,7 +525,7 @@
<isset property="BUILD_ALIAS" />
</and>
<then>
- <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9.]+)(_.*?\.)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\4" />
+ <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9.]+)(_.*?)\.(.*?)\.*aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\4" />
</then>
<else>
<propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9.]+)(.*).aggregate" replace=": \2.${BUILD_TS}-H${BUILD_NUMBER}\3" />
13 years, 10 months
JBoss Tools SVN: r41200 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate.jpt.ui/META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2012-05-21 06:26:50 -0400 (Mon, 21 May 2012)
New Revision: 41200
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/MANIFEST.MF
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java
Log:
https://issues.jboss.org/browse/JBIDE-11705
Get hibernate.cfg.xml only from classpath
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2012-05-21 09:28:51 UTC (rev 41199)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2012-05-21 10:26:50 UTC (rev 41200)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.hibernate.jpt.core.internal.context;
-import java.io.File;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
@@ -279,8 +278,6 @@
if (configFile != null && configFile.length() > 0){
IPath path = new Path(configFile);
- if (new File(path.toOSString()).exists()) return;
-
try {
IJavaProject jp = getJpaProject().getJavaProject();
IPackageFragmentRoot[] pfrs = jp.getPackageFragmentRoots();
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/MANIFEST.MF 2012-05-21 09:28:51 UTC (rev 41199)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/MANIFEST.MF 2012-05-21 10:26:50 UTC (rev 41200)
@@ -23,7 +23,9 @@
org.eclipse.jpt.common.ui,
org.eclipse.jpt.jpa.db,
org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.0",
- org.hibernate.eclipse.libs;bundle-version="3.4.0"
+ org.hibernate.eclipse.libs;bundle-version="3.4.0",
+ org.eclipse.wst.web.ui;bundle-version="1.1.400",
+ org.eclipse.wst.common.frameworks.ui;bundle-version="1.2.100"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %Bundle-Vendor.0
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java 2012-05-21 09:28:51 UTC (rev 41199)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java 2012-05-21 10:26:50 UTC (rev 41200)
@@ -12,6 +12,7 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.LinkedList;
import java.util.List;
import org.eclipse.core.resources.IContainer;
@@ -26,6 +27,7 @@
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.internal.ui.wizards.TypedElementSelectionValidator;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -43,7 +45,6 @@
import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
-import org.eclipse.jpt.jpa.core.JpaProject;
import org.eclipse.jpt.jpa.ui.details.JpaPageComposite;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Button;
@@ -51,9 +52,13 @@
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.model.WorkbenchContentProvider;
+import org.eclipse.ui.model.WorkbenchLabelProvider;
+import org.eclipse.ui.views.navigator.ResourceSorter;
+import org.hibernate.eclipse.console.FileFilter;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
-import org.hibernate.eclipse.console.utils.DialogSelectionHelper;
import org.hibernate.eclipse.console.utils.DriverClassHelpers;
import org.hibernate.eclipse.console.wizards.NewConfigurationWizard;
import org.hibernate.eclipse.console.wizards.NewConfigurationWizardPage;
@@ -202,29 +207,42 @@
path = new Path(files[0].getProject().getName()).append(files[0].getProjectRelativePath());
filePath = path.toString();
}
- if (props != null && filePath.length() > 0 ){
+ if (filePath.length() > 0 ){
+ IPackageFragmentRoot[] allPackageFragmentRoots = getSourcePackageFragmentRoots();
+ for (IPackageFragmentRoot iPackageFragmentRoot : allPackageFragmentRoots) {
+ IResource sourceFolder = iPackageFragmentRoot.getResource();
+ if (sourceFolder instanceof IContainer) {
+ IContainer folder = (IContainer) sourceFolder;
+ if (folder.findMember(filePath) != null){
+ return folder.findMember(filePath).getFullPath();
+ }
+ }
+ }
+ }
+ return path;
+ }
+
+ public IPackageFragmentRoot[] getSourcePackageFragmentRoots(){
+ BasicHibernateProperties props = getSubject();
+ if (props != null){
IProject project = props.getJpaProject().getProject();
IJavaProject jProject = JavaCore.create(project);
if (jProject != null){
try {
IPackageFragmentRoot[] allPackageFragmentRoots = jProject.getAllPackageFragmentRoots();
+ List<IPackageFragmentRoot> sources = new LinkedList<IPackageFragmentRoot>();
for (IPackageFragmentRoot iPackageFragmentRoot : allPackageFragmentRoots) {
- if (!iPackageFragmentRoot.isArchive()){
- IResource sourceFolder = iPackageFragmentRoot.getResource();
- if (sourceFolder instanceof IContainer) {
- IContainer folder = (IContainer) sourceFolder;
- if (folder.findMember(filePath) != null){
- return folder.findMember(filePath).getFullPath();
- }
- }
+ if (!iPackageFragmentRoot.isArchive() && iPackageFragmentRoot.isOpen()){
+ sources.add(iPackageFragmentRoot);
}
}
+ return sources.toArray(new IPackageFragmentRoot[0]);
} catch (JavaModelException e) {
//ignore
}
}
}
- return path;
+ return new IPackageFragmentRoot[0];
}
private Runnable createSetupAction() {
@@ -253,21 +271,11 @@
IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
IResource res = root.findMember(cfgFile);
if ( res != null && res.exists() && res.getType() == IResource.FILE) {
- JpaProject jpaProject = HibernatePropertiesComposite.this.getSubject().getJpaProject();
- IJavaProject jProject = jpaProject.getJavaProject();
- if (jProject != null){
- try {
- IPackageFragmentRoot[] allPackageFragmentRoots = jProject.getAllPackageFragmentRoots();
- for (IPackageFragmentRoot iPackageFragmentRoot : allPackageFragmentRoots) {
- if (!iPackageFragmentRoot.isArchive()){
- if (iPackageFragmentRoot.getResource().getFullPath().isPrefixOf(cfgFile)){
- cfgFile = cfgFile.removeFirstSegments(iPackageFragmentRoot.getResource().getFullPath().segmentCount());
- return cfgFile;
- }
- }
- }
- } catch (JavaModelException e) {
- //ignore
+ IPackageFragmentRoot[] allPackageFragmentRoots = getSourcePackageFragmentRoots();
+ for (IPackageFragmentRoot iPackageFragmentRoot : allPackageFragmentRoots) {
+ if (iPackageFragmentRoot.getResource().getFullPath().isPrefixOf(cfgFile)){
+ cfgFile = cfgFile.removeFirstSegments(iPackageFragmentRoot.getResource().getFullPath().segmentCount());
+ return cfgFile;
}
}
}
@@ -285,14 +293,49 @@
}
private IPath handleConfigurationFileBrowse() {
- IPath initialPath = getConfigurationFilePath();
- IPath[] paths = DialogSelectionHelper.chooseFileEntries(getShell(), initialPath, new IPath[0], HibernateConsoleMessages.ConsoleConfigurationMainTab_select_hibernate_cfg_xml_file, HibernateConsoleMessages.ConsoleConfigurationMainTab_choose_file_to_use_as_hibernate_cfg_xml, new String[] {HibernateConsoleMessages.ConsoleConfigurationMainTab_cfg_xml}, false, false, true);
+ IPath[] paths = chooseFileEntries();
if(paths!=null && paths.length==1) {
return paths[0];
}
return null;
}
+ public IPath[] chooseFileEntries() {
+ TypedElementSelectionValidator validator = new TypedElementSelectionValidator(new Class[]{IFile.class}, false);
+ IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
+ IResource focus= getConfigurationFilePath() != null ? root.findMember(getConfigurationFilePath()) : null;
+
+ ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), new WorkbenchLabelProvider(), new WorkbenchContentProvider(){
+ public Object[] getElements(Object element) {
+ IPackageFragmentRoot[] sourcePackageFragmentRoots = getSourcePackageFragmentRoots();
+ IResource[] ress = new IResource[sourcePackageFragmentRoots.length];
+ for (int i = 0; i < sourcePackageFragmentRoots.length; i++) {
+ ress[i] = sourcePackageFragmentRoots[i].getResource();
+ }
+ return ress;
+ }
+ });
+ dialog.setValidator(validator);
+ dialog.setAllowMultiple(false);
+ dialog.setTitle(HibernateConsoleMessages.ConsoleConfigurationMainTab_select_hibernate_cfg_xml_file);
+ dialog.setMessage(HibernateConsoleMessages.ConsoleConfigurationMainTab_choose_file_to_use_as_hibernate_cfg_xml);
+ dialog.addFilter(new FileFilter(new String[] {HibernateConsoleMessages.ConsoleConfigurationMainTab_cfg_xml}, null, true, false) );
+ dialog.setInput(root);
+ dialog.setSorter(new ResourceSorter(ResourceSorter.NAME) );
+ dialog.setInitialSelection(focus);
+
+ if (dialog.open() == Window.OK) {
+ Object[] elements= dialog.getResult();
+ IPath[] res= new IPath[elements.length];
+ for (int i= 0; i < res.length; i++) {
+ IResource elem= (IResource)elements[i];
+ res[i]= elem.getFullPath();
+ }
+ return res;
+ }
+ return null;
+ }
+
private IPath handleConfigurationFileCreate() {
NewConfigurationWizard wizard = new NewConfigurationWizard();
wizard.init(PlatformUI.getWorkbench(), StructuredSelection.EMPTY );
13 years, 10 months
JBoss Tools SVN: r41199 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2012-05-21 05:28:51 -0400 (Mon, 21 May 2012)
New Revision: 41199
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/HibernateExtension3_6.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java
Log:
https://issues.jboss.org/browse/JBIDE-11662
Do not forget to deregister drivers on rebuild
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java 2012-05-21 09:21:41 UTC (rev 41198)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java 2012-05-21 09:28:51 UTC (rev 41199)
@@ -204,15 +204,20 @@
@Override
public boolean reset() {
- boolean res = false;
+ boolean resetted = false;
// reseting state
if (configuration != null) {
configuration = null;
- res = true;
+ resetted = true;
}
- boolean tmp = closeSessionFactory();
- res = res || tmp;
+ resetted = resetted | closeSessionFactory() | cleanUpClassLoader();
+ executionContext = null;
+ return resetted;
+ }
+
+ protected boolean cleanUpClassLoader() {
+ boolean resetted = false;
if (executionContext != null) {
executionContext.execute(new Command() {
public Object execute() {
@@ -230,29 +235,21 @@
}
if (fakeDrivers.size() > 0) {
fakeDrivers.clear();
- res = true;
+ resetted = true;
}
- tmp = cleanUpClassLoader();
- res = res || tmp;
- executionContext = null;
- return res;
- }
-
- protected boolean cleanUpClassLoader() {
- boolean res = false;
ClassLoader classLoaderTmp = classLoader;
while (classLoaderTmp != null) {
if (classLoaderTmp instanceof ConsoleConfigClassLoader) {
((ConsoleConfigClassLoader)classLoaderTmp).close();
- res = true;
+ resetted = true;
}
classLoaderTmp = classLoaderTmp.getParent();
}
if (classLoader != null) {
classLoader = null;
- res = true;
+ resetted = true;
}
- return res;
+ return resetted;
}
@Override
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/HibernateExtension3_6.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/HibernateExtension3_6.java 2012-05-21 09:21:41 UTC (rev 41198)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/HibernateExtension3_6.java 2012-05-21 09:28:51 UTC (rev 41199)
@@ -206,15 +206,20 @@
@Override
public boolean reset() {
- boolean res = false;
+ boolean resetted = false;
// reseting state
if (configuration != null) {
configuration = null;
- res = true;
+ resetted = true;
}
- boolean tmp = closeSessionFactory();
- res = res || tmp;
+ resetted = resetted | closeSessionFactory() | cleanUpClassLoader();
+ executionContext = null;
+ return resetted;
+ }
+
+ protected boolean cleanUpClassLoader() {
+ boolean resetted = false;
if (executionContext != null) {
executionContext.execute(new Command() {
public Object execute() {
@@ -232,29 +237,21 @@
}
if (fakeDrivers.size() > 0) {
fakeDrivers.clear();
- res = true;
+ resetted = true;
}
- tmp = cleanUpClassLoader();
- res = res || tmp;
- executionContext = null;
- return res;
- }
-
- protected boolean cleanUpClassLoader() {
- boolean res = false;
ClassLoader classLoaderTmp = classLoader;
while (classLoaderTmp != null) {
if (classLoaderTmp instanceof ConsoleConfigClassLoader) {
((ConsoleConfigClassLoader)classLoaderTmp).close();
- res = true;
+ resetted = true;
}
classLoaderTmp = classLoaderTmp.getParent();
}
if (classLoader != null) {
classLoader = null;
- res = true;
+ resetted = true;
}
- return res;
+ return resetted;
}
@Override
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java 2012-05-21 09:21:41 UTC (rev 41198)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java 2012-05-21 09:28:51 UTC (rev 41199)
@@ -216,15 +216,21 @@
@Override
public boolean reset() {
- boolean res = false;
+ boolean resetted = false;
// reseting state
if (configuration != null) {
configuration = null;
- res = true;
+ resetted = true;
}
- boolean tmp = closeSessionFactory();
- res = res || tmp;
+ resetted = resetted | closeSessionFactory() | cleanUpClassLoader();
+
+ executionContext = null;
+ return resetted;
+ }
+
+ protected boolean cleanUpClassLoader() {
+ boolean resetted = false;
if (executionContext != null) {
executionContext.execute(new Command() {
public Object execute() {
@@ -242,29 +248,21 @@
}
if (fakeDrivers.size() > 0) {
fakeDrivers.clear();
- res = true;
+ resetted = true;
}
- tmp = cleanUpClassLoader();
- res = res || tmp;
- executionContext = null;
- return res;
- }
-
- protected boolean cleanUpClassLoader() {
- boolean res = false;
ClassLoader classLoaderTmp = classLoader;
while (classLoaderTmp != null) {
if (classLoaderTmp instanceof ConsoleConfigClassLoader) {
((ConsoleConfigClassLoader)classLoaderTmp).close();
- res = true;
+ resetted = true;
}
classLoaderTmp = classLoaderTmp.getParent();
}
if (classLoader != null) {
classLoader = null;
- res = true;
+ resetted = true;
}
- return res;
+ return resetted;
}
@Override
13 years, 10 months
JBoss Tools SVN: r41198 - workspace/mistria/install-tests/scripts.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-05-21 05:21:41 -0400 (Mon, 21 May 2012)
New Revision: 41198
Modified:
workspace/mistria/install-tests/scripts/testInstall.sh
Log:
Set memory options
Modified: workspace/mistria/install-tests/scripts/testInstall.sh
===================================================================
--- workspace/mistria/install-tests/scripts/testInstall.sh 2012-05-21 07:47:01 UTC (rev 41197)
+++ workspace/mistria/install-tests/scripts/testInstall.sh 2012-05-21 09:21:41 UTC (rev 41198)
@@ -50,6 +50,7 @@
output=$(java \
-DUPDATE_SITE=$site \
-Dusage_reporting_enabled=false \
+ -Xms256M -Xmx768M -XX:MaxPermSize=512M \
-jar plugins/org.eclipse.equinox.launcher_*.jar \
-application org.eclipse.swtbot.eclipse.junit4.headless.swtbottestapplication \
-testApplication org.eclipse.ui.ide.workbench \
13 years, 10 months
JBoss Tools SVN: r41196 - in trunk/documentation/whatsnew: forge and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2012-05-21 03:46:13 -0400 (Mon, 21 May 2012)
New Revision: 41196
Added:
trunk/documentation/whatsnew/forge/forge-news-3.3.0.Beta3.html
trunk/documentation/whatsnew/forge/images/3.3.0.Beta3/
trunk/documentation/whatsnew/forge/images/3.3.0.Beta3/about.png
Modified:
trunk/documentation/whatsnew/index.html
Log:
JBIDE-11762: Forge Component N&N
Added: trunk/documentation/whatsnew/forge/forge-news-3.3.0.Beta3.html
===================================================================
--- trunk/documentation/whatsnew/forge/forge-news-3.3.0.Beta3.html (rev 0)
+++ trunk/documentation/whatsnew/forge/forge-news-3.3.0.Beta3.html 2012-05-21 07:46:13 UTC (rev 41196)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>Forge Tools 3.3.0.Beta3 What's New</title>
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-17645367-5']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+</script></head>
+<body>
+<h1>Forge Tools 3.3.0.Beta3 What's New</h1>
+
+ <p align="right"><a href="../index.html">< Main Index</a> <a
+ href="../maven/maven-news-3.3.0.Beta3.html">Maven Tools ></a></p>
+
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>New Embedded Forge Runtime</b></td>
+ <td valign="top">
+ <p>The embedded runtime is now Forge 1.0.4.</p>
+ <p><img src="images/3.3.0.Beta3/about.png" /></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+</table>
+
+</body>
+
+</html>
+
+
Property changes on: trunk/documentation/whatsnew/forge/forge-news-3.3.0.Beta3.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/documentation/whatsnew/forge/images/3.3.0.Beta3/about.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/forge/images/3.3.0.Beta3/about.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2012-05-21 06:04:09 UTC (rev 41195)
+++ trunk/documentation/whatsnew/index.html 2012-05-21 07:46:13 UTC (rev 41196)
@@ -42,6 +42,7 @@
<p><a href="vpe/vpe-news-3.3.0.Beta3.html">Visual Page Editor/BrowserSim</a></p>
<p><a href="central/central-news-1.0.0.Beta3.html">JBoss Central</a></p>
<p><a href="maven/maven-news-3.3.0.Beta3.html">Maven</a></p>
+ <p><a href="forge/forge-news-3.3.0.Beta3.html">Forge Tools</a></p>
<!--
<p><a href="modeshape/modeshape-news-3.3.0.Beta3.html">ModeShape
13 years, 10 months
JBoss Tools SVN: r41195 - in trunk/documentation/whatsnew: central and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-05-21 02:04:09 -0400 (Mon, 21 May 2012)
New Revision: 41195
Modified:
trunk/documentation/whatsnew/central/central-news-1.0.0.Beta3.html
trunk/documentation/whatsnew/index.html
trunk/documentation/whatsnew/maven/maven-news-3.3.0.Beta3.html
trunk/documentation/whatsnew/openshift/openshift-news-2.3.0.Beta3.html
trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.Beta3.html
Log:
JBIDE-11744 NN review and link fixing
Modified: trunk/documentation/whatsnew/central/central-news-1.0.0.Beta3.html
===================================================================
--- trunk/documentation/whatsnew/central/central-news-1.0.0.Beta3.html 2012-05-21 02:22:08 UTC (rev 41194)
+++ trunk/documentation/whatsnew/central/central-news-1.0.0.Beta3.html 2012-05-21 06:04:09 UTC (rev 41195)
@@ -23,9 +23,7 @@
<body>
<h1>JBoss Central 1.0.0.Beta1 What's New</h1>
-<p align="right"><a href="../index.html">< Main Index</a> <a
-href="../usage/usage-news-3.3.0.Beta1.html">Usage ></a>
-
+<p align="right"><a href="../index.html">< Main Index</a>
</p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2012-05-21 02:22:08 UTC (rev 41194)
+++ trunk/documentation/whatsnew/index.html 2012-05-21 06:04:09 UTC (rev 41195)
@@ -23,8 +23,6 @@
<html>
-
-
<table border="0" cellpadding="10" cellspacing="0" width="80%">
<tr>
@@ -42,9 +40,16 @@
<p><a href="openshift/openshift-news-2.3.0.Beta3.html">OpenShift
Tools</a></p>
<p><a href="vpe/vpe-news-3.3.0.Beta3.html">Visual Page Editor/BrowserSim</a></p>
- <p><a href="modeshape/modeshape-news-3.3.0.Beta3.html">ModeShape
+ <p><a href="central/central-news-1.0.0.Beta3.html">JBoss Central</a></p>
+ <p><a href="maven/maven-news-3.3.0.Beta3.html">Maven</a></p>
+
+ <!--
+ <p><a href="modeshape/modeshape-news-3.3.0.Beta3.html">ModeShape
Tools</a></p>
- <p><a href="central/central-news-1.0.0.Beta3.html">JBoss Central</a></p>
+
+ <p><a href="bpel/bpel-news-1.1.0.Beta3.html">BPEL Tools</a></p>
+ -->
+
</td>
</tr>
Modified: trunk/documentation/whatsnew/maven/maven-news-3.3.0.Beta3.html
===================================================================
--- trunk/documentation/whatsnew/maven/maven-news-3.3.0.Beta3.html 2012-05-21 02:22:08 UTC (rev 41194)
+++ trunk/documentation/whatsnew/maven/maven-news-3.3.0.Beta3.html 2012-05-21 06:04:09 UTC (rev 41195)
@@ -24,7 +24,7 @@
<h1>Maven Tools</h1>
<p align="right"><a href="../index.html">< Main Index</a> <a
-href="../ws/openshift-news-2.3.0.Beta3">OpenShift Tools ></a></p>
+href="../vpe/vpe-news-3.3.0.Beta3.html">Visual Page Editor/BrowserSim ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
<tr>
<td colspan="2">
@@ -34,6 +34,53 @@
</td>
</tr>
<tr>
+ <td valign="top" align="left">
+ <a name="itemname3" id="itemname3"></a><b>JBoss Source Lookup</b></td>
+ <td valign="top">
+ <p>JBoss Source lookup utilizes the Maven metadata
+ found in Jar's to locate source code found in runtime
+ directories.</p>
+
+ <p>Normal m2e source lookup only does this for
+ launch configurations related to a Maven project and on
+ Maven classpaths. This source lookup is useful for all
+ launch configurations which uses jar's (with Maven metadata) from one or more
+ directories which are not even on your project
+ classpath. This is the case for many runtimes these days.</p>
+
+ <p>The Source lookup feature automatically
+ recognizes JBoss AS runtimes, but if you are using
+ other runtimes (such as Glassfish or Tomcat) you can point it at a
+ directory and source lookup will recursively scan
+ this directorys jar and look for maven metadata to
+ use against the list of known repositories.</p>
+
+ <p>It will use standard maven artifact id lookups to
+ find matching source artifacts and if that does not
+ work it will do a checksum lookup to try and locate
+ the source.</p>
+
+ <p>To enable it for all JBoss AS launch
+ configurations you need to go enable it in the
+ preferences.</p>
+
+ <p><img src="../images/sourcelookuppreferences.png"/></p>
+ <p>There are more about this feature in the <a
+ href="https://community.jboss.org/en/tools/blog/2012/01/24/jboss-source-lookup">JBoss
+ Source Lookup</a> wiki.
+ </p>
+ <p>
+ <small>
+ Related <a href="https://issues.jboss.org/browse/JBIDE-9309">jira</a>.
+ </small>
+ </p>
+ </td>
+ </tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+
+ <tr>
<td valign="top" align="left">
<a name="itemname1" id="itemname1"></a><b>Annotation Processing support</b></td>
<td valign="top">
@@ -72,7 +119,7 @@
<tr>
<td valign="top" align="left">
- <a name="itemname2" id="itemname2"></a><b>New GWT configurator</b></td>
+ <a name="itemname2" id="itemname2"></a><b>GWT configurator</b></td>
<td valign="top">
<p>You can enable/disable GWT Project Configurator by using follow preference:</p>
<img src="../images/jboss_maven_integration_gwt.png" />
@@ -82,7 +129,7 @@
<img src="../images/gwt_module_definition.png" />
<p>or</p>
<img src="../images/gwt_modules_definition.png" />
- <p>If there is no modules defined in pom.xml then Configurator adds all existing modules to configuration.</p>
+ <p>If there are no modules defined in pom.xml then Configurator adds all existing modules to configuration.</p>
<p>GWT Project Configurator sets GWT Compiler output folder to the same folder which is used by Maven Compiler.</p>
<p>You can use Maven or GWT Compiler to compile your application and Deploy to Server or Running on an External Server, it does not require additional compilation.</p>
<p>
@@ -102,28 +149,10 @@
</tr>
- <tr>
- <td valign="top" align="left">
- <a name="itemname3" id="itemname3"></a><b>JBoss Source Lookup</b></td>
- <td valign="top">
- <p>See <a href="https://community.jboss.org/en/tools/blog/2012/01/24/jboss-source-lookup">JBoss Source Lookup</a> for more details.
- </p>
- <p>
- <small>
- Related <a href="https://issues.jboss.org/browse/JBIDE-9309">jira</a>.
- </small>
- </p>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <hr/>
- </td>
- </tr>
<tr>
<td valign="top" align="left">
- <a name="itemname3" id="itemname4"></a><b>New Hibernate 3.6.x and 4.x maven provided libraries</b></td>
+ <a name="itemname3" id="itemname4"></a><b>Hibernate 3.6.x and 4.x maven provided libraries</b></td>
<td valign="top">
<p>When you start a project and you need to add Hibernate as your JPA provider, adding the Hibernate dependencies manually one by one can be a chore.
Now if your project is Facet enabled, adding both the JBoss Maven and the JPA Facet will give you access to new JPA library providers for the Hibernate platform.
Modified: trunk/documentation/whatsnew/openshift/openshift-news-2.3.0.Beta3.html
===================================================================
--- trunk/documentation/whatsnew/openshift/openshift-news-2.3.0.Beta3.html 2012-05-21 02:22:08 UTC (rev 41194)
+++ trunk/documentation/whatsnew/openshift/openshift-news-2.3.0.Beta3.html 2012-05-21 06:04:09 UTC (rev 41195)
@@ -29,7 +29,7 @@
<p align="right">
<a href="../index.html">< Main Index</a> <a
- href="../cdi/cdi-news-3.3.0.Beta3.html">CDI Tools ></a>
+ href="../maven/maven-news-3.3.0.Beta3.html">Maven Tools ></a>
</p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
Modified: trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.Beta3.html
===================================================================
--- trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.Beta3.html 2012-05-21 02:22:08 UTC (rev 41194)
+++ trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.Beta3.html 2012-05-21 06:04:09 UTC (rev 41195)
@@ -25,7 +25,7 @@
<p align="right">
<a href="../index.html">< Main Index</a>
-<a href="../hibernate/hibernate-news-3.3.0.Beta3.html">Hibernate Tools ></a>
+<a href="../central/central-news-1.0.0.Beta3.html">JBoss Central ></a>
</p>
<table border="0" cellpadding="10" cellspacing="0">
13 years, 10 months