JBoss Tools SVN: r40812 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-05-07 04:38:10 -0400 (Mon, 07 May 2012)
New Revision: 40812
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/DownloadRuntimeDialog.java
Log:
JBIDE-11737 - Change disclaimer text in Download Runtime dialog
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/DownloadRuntimeDialog.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/DownloadRuntimeDialog.java 2012-05-05 00:06:49 UTC (rev 40811)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/DownloadRuntimeDialog.java 2012-05-07 08:38:10 UTC (rev 40812)
@@ -126,37 +126,17 @@
disclaimerComposite.setText("Warning");
new Label(disclaimerComposite, SWT.NONE).setText("This is a community project and, as such is not supported with an SLA.");
Link link = new Link(disclaimerComposite, SWT.NONE);
- link.setText("Any questions or problems can be raised through the <a>JBoss AS 7 User Forum</a> where the community will provide their best efforts to assist.");
- Link link1 = new Link(disclaimerComposite, SWT.NONE);
- link1.setText("This project is included in the JBoss Enterprise Application Platform for which a <a>support subscription</a> is available.");
-
+ link.setText("If you're looking for fully supported, certified, enterprise middleware try JBoss Enterprise Middleware products. <a>Show Details</a>");
+
link.addSelectionListener( new SelectionAdapter( ) {
public void widgetSelected( SelectionEvent e )
{
String text = e.text;
- if ("JBoss AS 7 User Forum".equals(text)) {
+ if ("Show Details".equals(text)) {
IWorkbenchBrowserSupport support = PlatformUI.getWorkbench()
.getBrowserSupport();
try {
- URL url = new URL("http://community.jboss.org/en/jbossas/as7_users?view=discussions"); //$NON-NLS-1$
- support.getExternalBrowser().openURL(url);
- } catch (Exception e1) {
- ProjectExamplesActivator.log(e1);
- }
- }
-
- }
- } );
- link1.addSelectionListener( new SelectionAdapter( ) {
-
- public void widgetSelected( SelectionEvent e )
- {
- String text = e.text;
- if ("support subscription".equals(text)) {
- IWorkbenchBrowserSupport support = PlatformUI.getWorkbench()
- .getBrowserSupport();
- try {
URL url = new URL("http://www.redhat.com/jboss/"); //$NON-NLS-1$
support.getExternalBrowser().openURL(url);
} catch (Exception e1) {
12 years, 8 months
- 1
- 0
JBoss Tools SVN: r40811 - in trunk/seam: plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-05-04 20:06:49 -0400 (Fri, 04 May 2012)
New Revision: 40811
Added:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamLibFileSetProvider.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntime.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23ProjectCreator.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.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.ui/src/org/jboss/tools/seam/ui/dialog/WarFileSetProvider.java
trunk/seam/tests/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java
Log:
https://issues.jboss.org/browse/JBIDE-11490 use *list files from Seam runtime to pick up the list of required jars
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntime.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntime.java 2012-05-04 23:17:23 UTC (rev 40810)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntime.java 2012-05-05 00:06:49 UTC (rev 40811)
@@ -133,6 +133,27 @@
}
/**
+ * Calculate path to seam-gen/build-scripts
+ *
+ * @return absolute path to seam-gen/build-scripts folder
+ */
+ public String getBuildScriptsDir() {
+ return getSeamGenDir() + "/build-scripts"; //$NON-NLS-1$
+ }
+
+ public String getDeployedJarsEarListFile() {
+ return getBuildScriptsDir() + "/deployed-jars-ear.list"; //$NON-NLS-1$
+ }
+
+ public String getDeployedJarsEarWarListFile() {
+ return getBuildScriptsDir() + "/deployed-jars-ear-war.list"; //$NON-NLS-1$
+ }
+
+ public String getDeployedJarsWarListFile() {
+ return getBuildScriptsDir() + "/deployed-jars-war.list"; //$NON-NLS-1$
+ }
+
+ /**
* Calculate path to lib folder
*
* @return absolute path to lib folder
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java 2012-05-04 23:17:23 UTC (rev 40810)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java 2012-05-05 00:06:49 UTC (rev 40811)
@@ -11,6 +11,11 @@
package org.jboss.tools.seam.internal.core.project.facet;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Properties;
+import java.util.Set;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -24,6 +29,8 @@
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.tools.jst.web.server.RegistrationHelper;
import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.project.facet.SeamRuntime;
+import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
/**
* @author Alexey Kazakov
@@ -56,8 +63,8 @@
* @see org.jboss.tools.seam.internal.core.project.facet.Seam2FacetInstallDelegate#getProjectCreator(org.eclipse.wst.common.frameworks.datamodel.IDataModel, org.eclipse.core.resources.IProject)
*/
@Override
- protected SeamProjectCreator getProjectCreator(IDataModel model, IProject project) {
- return new Seam23ProjectCreator(model, project);
+ protected SeamProjectCreator getProjectCreator(IDataModel model, IProject project, SeamFacetAbstractInstallDelegate seamFacetInstallDelegate) {
+ return new Seam23ProjectCreator(model, project, seamFacetInstallDelegate);
}
/*
@@ -69,6 +76,88 @@
return JBOOS_WAR_WEBINF_SET;
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.internal.core.project.facet.Seam2FacetInstallDelegate#getEarLibFileSet()
+ */
+ @Override
+ public AntCopyUtils.FileSet getEarLibFileSet() {
+ return getEarLibFileSet(facetModel);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.internal.core.project.facet.Seam2FacetInstallDelegate#getWarLibFileSet()
+ */
+ @Override
+ public AntCopyUtils.FileSet getWarLibFileSet() {
+ return getWarLibFileSet(facetModel);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.internal.core.project.facet.Seam2FacetInstallDelegate#getWarLibFileSetForEar()
+ */
+ @Override
+ public AntCopyUtils.FileSet getWarLibFileSetForEar() {
+ return getWarLibFileSetForEar(facetModel);
+ }
+
+ public static AntCopyUtils.FileSet getEarLibFileSet(IDataModel model) {
+ SeamRuntime runtime = getSeamRuntime(model);
+ String path = runtime.getDeployedJarsEarListFile();
+ return getFileSetOfJars(path);
+ }
+
+ public static AntCopyUtils.FileSet getWarLibFileSet(IDataModel model) {
+ SeamRuntime runtime = getSeamRuntime(model);
+ String path = runtime.getDeployedJarsWarListFile();
+ return getFileSetOfJars(path);
+ }
+
+ public static AntCopyUtils.FileSet getWarLibFileSetForEar(IDataModel model) {
+ SeamRuntime runtime = getSeamRuntime(model);
+ String path = runtime.getDeployedJarsEarWarListFile();
+ return getFileSetOfJars(path);
+ }
+
+ private static AntCopyUtils.FileSet getFileSetOfJars(String path) {
+ AntCopyUtils.FileSet fileSet = new AntCopyUtils.FileSet();
+ File listFile = new File(path);
+ if(listFile.exists()) {
+ FileInputStream fis = null;
+ try {
+ Properties list = new Properties();
+ fis = new FileInputStream(listFile);
+ list.load(fis);
+ Set<String> jarList = list.stringPropertyNames();
+ for (String jar : jarList) {
+ fileSet.include(jar);
+ }
+ } catch (FileNotFoundException e) {
+ SeamCorePlugin.getDefault().logError(e);
+ } catch (IOException e) {
+ SeamCorePlugin.getDefault().logError(e);
+ } finally {
+ if(fis!=null) {
+ try {
+ fis.close();
+ } catch (IOException e) {
+ }
+ }
+ }
+ } else {
+ SeamCorePlugin.getDefault().logError(path + " doesn't exist. Can't get the list of the JARs to copy to the project.");
+ }
+ return fileSet;
+ }
+
+ private static SeamRuntime getSeamRuntime(IDataModel model) {
+ Object runtimeName = model.getProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME);
+ SeamRuntime runtime = SeamRuntimeManager.getInstance().findRuntimeByName(runtimeName.toString());
+ return runtime;
+ }
+
/**
* Copies and deploys the driver jar from connection profile to the server.
* @param project
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23ProjectCreator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23ProjectCreator.java 2012-05-04 23:17:23 UTC (rev 40810)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23ProjectCreator.java 2012-05-05 00:06:49 UTC (rev 40811)
@@ -22,8 +22,8 @@
*/
public class Seam23ProjectCreator extends Seam2ProjectCreator {
- public Seam23ProjectCreator(IDataModel model, IProject seamWebProject) {
- super(model, seamWebProject);
+ public Seam23ProjectCreator(IDataModel model, IProject seamWebProject, SeamLibFileSetProvider seamLibFileSetProvider) {
+ super(model, seamWebProject, seamLibFileSetProvider);
}
/*
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2012-05-04 23:17:23 UTC (rev 40810)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2012-05-05 00:06:49 UTC (rev 40811)
@@ -36,12 +36,12 @@
import org.w3c.dom.Element;
// TODO: why not just *one* global filter set to avoid any missing names ? (assert for it in our unittests!
-public class Seam2FacetInstallDelegate extends SeamFacetAbstractInstallDelegate{
+public class Seam2FacetInstallDelegate extends SeamFacetAbstractInstallDelegate {
public static final AntCopyUtils.FileSet JBOSS_EAR_CONTENT = new AntCopyUtils.FileSet()
.include("jboss-seam.jar"); //$NON-NLS-1$
- public static final AntCopyUtils.FileSet JBOSS_EAR_LIB = new AntCopyUtils.FileSet()
+ public static final AntCopyUtils.FileSet SEAM2_JBOSS_EAR_LIB = new AntCopyUtils.FileSet()
.include("antlr-runtime.jar") //$NON-NLS-1$
.include("commons-beanutils.*\\.jar") //$NON-NLS-1$
.include("drools-compiler.*\\.jar") //$NON-NLS-1$
@@ -53,7 +53,7 @@
.include("jbpm-jpdl.*\\.jar") //$NON-NLS-1$
.include("richfaces-api.*\\.jar"); //$NON-NLS-1$
- public static final AntCopyUtils.FileSet JBOSS_WAR_LIB_FILESET_WAR_CONFIG = new AntCopyUtils.FileSet()
+ public static final AntCopyUtils.FileSet SEAM2_JBOSS_WAR_LIB_FILESET_WAR_CONFIG = new AntCopyUtils.FileSet()
.include("ajax4jsf.*\\.jar") //$NON-NLS-1$
.include("richfaces.*\\.jar")
.include("antlr-runtime.*\\.jar") //$NON-NLS-1$
@@ -86,7 +86,7 @@
.include("jfreechart.*\\.jar") //$NON-NLS-1$
.include("jcommon.*\\.jar"); //$NON-NLS-1$
- public static final AntCopyUtils.FileSet JBOSS_WAR_LIB_FILESET_EAR_CONFIG = new AntCopyUtils.FileSet()
+ public static final AntCopyUtils.FileSet SEAM2_JBOSS_WAR_LIB_FILESET_EAR_CONFIG = new AntCopyUtils.FileSet()
.include("richfaces-impl\\.jar") //$NON-NLS-1$
.include("richfaces-ui\\.jar") //$NON-NLS-1$
.include("commons-digester\\.jar") //$NON-NLS-1$
@@ -106,6 +106,33 @@
/*
* (non-Javadoc)
+ * @see org.jboss.tools.seam.internal.core.project.facet.SeamFacetAbstractInstallDelegate#getEarLibFileSet()
+ */
+ @Override
+ public AntCopyUtils.FileSet getEarLibFileSet() {
+ return SEAM2_JBOSS_EAR_LIB;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.internal.core.project.facet.SeamFacetAbstractInstallDelegate#getWarLibFileSet()
+ */
+ @Override
+ public AntCopyUtils.FileSet getWarLibFileSet() {
+ return SEAM2_JBOSS_WAR_LIB_FILESET_WAR_CONFIG;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.internal.core.project.facet.SeamFacetAbstractInstallDelegate#getWarLibFileSetForEar()
+ */
+ @Override
+ public AntCopyUtils.FileSet getWarLibFileSetForEar() {
+ return SEAM2_JBOSS_WAR_LIB_FILESET_EAR_CONFIG;
+ }
+
+ /*
+ * (non-Javadoc)
* @see org.jboss.tools.seam.internal.core.project.facet.SeamFacetAbstractInstallDelegate#doExecuteForEjb(org.eclipse.core.resources.IProject, org.eclipse.wst.common.project.facet.core.IProjectFacetVersion, org.eclipse.wst.common.frameworks.datamodel.IDataModel, org.eclipse.core.runtime.IProgressMonitor)
*/
@Override
@@ -133,20 +160,20 @@
final File droolsLibFolder = new File(seamHomePath, DROOLS_LIB_SEAM_RELATED_PATH);
if(isWarConfiguration(model)) {
if (!SeamCorePlugin.getDefault().hasM2Facet(project) && shouldCopyLibraries(model)) {
- AntCopyUtils.copyFiles(seamHomeFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG).dir(seamHomeFolder)));
- AntCopyUtils.copyFiles(seamLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG).dir(seamLibFolder)));
+ AntCopyUtils.copyFiles(seamHomeFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getWarLibFileSet()).dir(seamHomeFolder)));
+ AntCopyUtils.copyFiles(seamLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getWarLibFileSet()).dir(seamLibFolder)));
}
final IContainer source = warActionSrcRootFolder.getUnderlyingFolder();
File actionsSrc = new File(project.getLocation().toFile(), source.getFullPath().removeFirstSegments(1).toString());
AntCopyUtils.copyFileToFolder(new File(seamGenResFolder, "seam.properties"), actionsSrc, true); //$NON-NLS-1$
if (!SeamCorePlugin.getDefault().hasM2Facet(project) && shouldCopyLibraries(model)) {
- AntCopyUtils.copyFiles(droolsLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG).dir(droolsLibFolder)));
+ AntCopyUtils.copyFiles(droolsLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getWarLibFileSet()).dir(droolsLibFolder)));
}
} else {
if (!SeamCorePlugin.getDefault().hasM2Facet(project) && shouldCopyLibraries(model)) {
- AntCopyUtils.copyFiles(seamHomeFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_EAR_CONFIG).dir(seamHomeFolder)));
- AntCopyUtils.copyFiles(seamLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_EAR_CONFIG).dir(seamLibFolder)));
- AntCopyUtils.copyFiles(droolsLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_EAR_CONFIG).dir(droolsLibFolder)));
+ AntCopyUtils.copyFiles(seamHomeFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getWarLibFileSetForEar()).dir(seamHomeFolder)));
+ AntCopyUtils.copyFiles(seamLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getWarLibFileSetForEar()).dir(seamLibFolder)));
+ AntCopyUtils.copyFiles(droolsLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getWarLibFileSetForEar()).dir(droolsLibFolder)));
}
}
}
@@ -165,7 +192,7 @@
AntCopyUtils.copyFiles(seamHomeFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamHomeFolder)), false);
if(shouldCopyLibraries(model)){
AntCopyUtils.copyFiles(seamLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamLibFolder)), false);
- AntCopyUtils.copyFiles(seamLibFolder, earLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_LIB).dir(seamLibFolder)), false);
+ AntCopyUtils.copyFiles(seamLibFolder, earLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getEarLibFileSet()).dir(seamLibFolder)), false);
AntCopyUtils.copyFiles(droolsLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(droolsLibFolder)), false);
}
AntCopyUtils.copyFiles(seamGenResFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamGenResFolder)), false);
@@ -302,10 +329,9 @@
// Security
addSecurityConstraint(webApp);
}
-
+
@Override
- protected SeamProjectCreator getProjectCreator(IDataModel model,
- IProject project) {
- return new Seam2ProjectCreator(model,project);
+ protected SeamProjectCreator getProjectCreator(IDataModel model, IProject project, SeamFacetAbstractInstallDelegate seamFacetInstallDelegate) {
+ return new Seam2ProjectCreator(model,project, this);
}
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java 2012-05-04 23:17:23 UTC (rev 40810)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java 2012-05-05 00:06:49 UTC (rev 40811)
@@ -77,8 +77,8 @@
* @param model Seam facet data model
* @param seamWebProject Seam web project
*/
- public Seam2ProjectCreator(IDataModel model, IProject seamWebProject) {
- super(model, seamWebProject);
+ public Seam2ProjectCreator(IDataModel model, IProject seamWebProject, SeamLibFileSetProvider seamLibFileSetProvider) {
+ super(model, seamWebProject, seamLibFileSetProvider);
viewFilterSetCollection.addFilterSet(SeamFacetFilterSetFactory.createHibernateDialectFilterSet(model));
droolsLibFolder = new File(seamHomePath, Seam2FacetInstallDelegate.DROOLS_LIB_SEAM_RELATED_PATH);
}
@@ -93,7 +93,7 @@
if (!SeamCorePlugin.getDefault().hasM2Facet(seamWebProject) && shouldCopyLibrariesAndTemplates(model) && shouldCopyLibraries(model)) {
File earContentsFolder = new File(earProjectFolder, "EarContent"); //$NON-NLS-1$
File earLibFolder = new File(earContentsFolder, "lib"); //$NON-NLS-1$
- AntCopyUtils.copyFiles(seamLibFolder, earLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(Seam2FacetInstallDelegate.JBOSS_EAR_LIB).dir(seamLibFolder)));
+ AntCopyUtils.copyFiles(seamLibFolder, earLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(seamLibFileSetProvider.getEarLibFileSet()).dir(seamLibFolder)));
}
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2012-05-04 23:17:23 UTC (rev 40810)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2012-05-05 00:06:49 UTC (rev 40811)
@@ -106,8 +106,7 @@
* @author eskimo
*
*/
-public abstract class SeamFacetAbstractInstallDelegate implements ILogListener,
- IDelegate,ISeamFacetDataModelProperties {
+public abstract class SeamFacetAbstractInstallDelegate implements ILogListener, IDelegate, ISeamFacetDataModelProperties, SeamLibFileSetProvider {
public static final String MOJARRA_1_2 = "Mojarra-1.2"; //$NON-NLS-1$
public static final String ORG_JBOSS_JBOSSFACES_JSF_CONFIG_NAME = "org.jboss.jbossfaces.JSF_CONFIG_NAME"; //$NON-NLS-1$
@@ -129,6 +128,7 @@
public static String SEAM_LIB_RELATED_PATH = "lib"; //$NON-NLS-1$
public static final String DEV_WAR_PROFILE = "dev-war"; //$NON-NLS-1$
public static final String DEV_EAR_PROFILE = "dev"; //$NON-NLS-1$
+ protected IDataModel facetModel;
public static AntCopyUtils.FileSet JBOOS_EJB_WEB_INF_CLASSES_SET = new AntCopyUtils.FileSet()
.include("import\\.sql") //$NON-NLS-1$
@@ -195,12 +195,13 @@
// untouched, this abstract class just listen to eclipse log and show an
// error dialog if there were records logged from seam.core plugin
startListening();
+ IDataModel model = (IDataModel) config;
+ facetModel = model;
doExecute(project,fv,config,monitor);
- IDataModel model = (IDataModel) config;
boolean createEarProjects = model.getBooleanProperty(ISeamFacetDataModelProperties.CREATE_EAR_PROJECTS);
if (createEarProjects) {
// Create ear, ejb, test projects JBIDE-3782
- getProjectCreator(model, project).execute(monitor);
+ getProjectCreator(model, project, this).execute(monitor);
}
} finally {
stopListening();
@@ -1321,7 +1322,7 @@
return (WebApp)modelObject;
}
- protected abstract SeamProjectCreator getProjectCreator(IDataModel model, IProject project);
+ protected abstract SeamProjectCreator getProjectCreator(IDataModel model, IProject project, SeamFacetAbstractInstallDelegate seamFacetInstallDelegate);
protected boolean shouldCopyLibrariesAndTemplates(IDataModel model){
return model.getBooleanProperty(ISeamFacetDataModelProperties.SEAM_TEMPLATES_AND_LIBRARIES_COPYING);
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2012-05-04 23:17:23 UTC (rev 40810)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2012-05-05 00:06:49 UTC (rev 40811)
@@ -31,6 +31,7 @@
import org.eclipse.jst.jsf.facesconfig.util.FacesConfigArtifactEdit;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.jboss.tools.seam.internal.core.project.facet.AntCopyUtils.FileSet;
/**
* Install delegate for seam facet version 1.2
@@ -311,8 +312,22 @@
}
@Override
- protected SeamProjectCreator getProjectCreator(IDataModel model,
- IProject project) {
- return new SeamProjectCreator(model,project);
+ protected SeamProjectCreator getProjectCreator(IDataModel model, IProject project, SeamFacetAbstractInstallDelegate seamFacetInstallDelegate) {
+ return new SeamProjectCreator(model, project, seamFacetInstallDelegate);
}
+
+ @Override
+ public FileSet getEarLibFileSet() {
+ return JBOSS_EAR_CONTENT;
+ }
+
+ @Override
+ public FileSet getWarLibFileSet() {
+ return JBOSS_WAR_LIB_FILESET_WAR_CONFIG;
+ }
+
+ @Override
+ public FileSet getWarLibFileSetForEar() {
+ return JBOSS_WAR_LIB_FILESET_EAR_CONFIG;
+ }
}
\ No newline at end of file
Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamLibFileSetProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamLibFileSetProvider.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamLibFileSetProvider.java 2012-05-05 00:06:49 UTC (rev 40811)
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.seam.internal.core.project.facet;
+
+/**
+ * @author Alexey Kazakov
+ */
+public interface SeamLibFileSetProvider {
+
+ AntCopyUtils.FileSet getEarLibFileSet();
+
+ AntCopyUtils.FileSet getWarLibFileSet();
+
+ AntCopyUtils.FileSet getWarLibFileSetForEar();
+}
\ No newline at end of file
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamLibFileSetProvider.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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 2012-05-04 23:17:23 UTC (rev 40810)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2012-05-05 00:06:49 UTC (rev 40811)
@@ -85,6 +85,7 @@
protected IDataModel model;
protected IProject seamWebProject;
+ protected SeamLibFileSetProvider seamLibFileSetProvider;
protected SeamRuntime seamRuntime;
protected String seamHomePath;
protected File seamHomeFolder;
@@ -141,9 +142,10 @@
* @param model Seam facet data model
* @param seamWebProject Seam web project
*/
- public SeamProjectCreator(IDataModel model, IProject seamWebProject) {
+ public SeamProjectCreator(IDataModel model, IProject seamWebProject, SeamLibFileSetProvider seamLibFileSetProvider) {
this.model = model;
this.seamWebProject = seamWebProject;
+ this.seamLibFileSetProvider = seamLibFileSetProvider;
earProjectName = model.getStringProperty(ISeamFacetDataModelProperties.SEAM_EAR_PROJECT);
ejbProjectName = model.getStringProperty(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT);
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/dialog/WarFileSetProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/dialog/WarFileSetProvider.java 2012-05-04 23:17:23 UTC (rev 40810)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/dialog/WarFileSetProvider.java 2012-05-05 00:06:49 UTC (rev 40811)
@@ -44,13 +44,13 @@
if (SeamVersion.SEAM_1_2.equals(version)) {
return SeamFacetInstallDelegate.JBOSS_WAR_LIB_FILESET_WAR_CONFIG;
} else {
- return Seam2FacetInstallDelegate.JBOSS_WAR_LIB_FILESET_WAR_CONFIG;
+ return Seam2FacetInstallDelegate.SEAM2_JBOSS_WAR_LIB_FILESET_WAR_CONFIG;
}
} else {
if (SeamVersion.SEAM_1_2.equals(version)) {
return SeamFacetInstallDelegate.JBOSS_WAR_LIB_FILESET_EAR_CONFIG;
} else {
- return Seam2FacetInstallDelegate.JBOSS_WAR_LIB_FILESET_EAR_CONFIG;
+ return Seam2FacetInstallDelegate.SEAM2_JBOSS_WAR_LIB_FILESET_EAR_CONFIG;
}
}
}
Modified: trunk/seam/tests/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2012-05-04 23:17:23 UTC (rev 40810)
+++ trunk/seam/tests/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2012-05-05 00:06:49 UTC (rev 40811)
@@ -4,9 +4,7 @@
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import junit.framework.TestCase;
@@ -30,9 +28,14 @@
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
import org.jboss.tools.seam.core.project.facet.SeamVersion;
+import org.jboss.tools.seam.internal.core.project.facet.AntCopyUtils.FileSet;
import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
+import org.jboss.tools.seam.internal.core.project.facet.Seam23FacetInstallDelegate;
+import org.jboss.tools.seam.internal.core.project.facet.Seam23ProjectCreator;
+import org.jboss.tools.seam.internal.core.project.facet.Seam2FacetInstallDelegate;
import org.jboss.tools.seam.internal.core.project.facet.Seam2ProjectCreator;
import org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDataModelProvider;
+import org.jboss.tools.seam.internal.core.project.facet.SeamLibFileSetProvider;
import org.jboss.tools.seam.internal.core.project.facet.SeamProjectCreator;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
@@ -243,12 +246,52 @@
SeamVersion seamVersion = SeamVersion.parseFromString(seamVersionString);
SeamProjectCreator creator = null;
if(seamVersion == SeamVersion.SEAM_1_2) {
- creator = new SeamProjectCreator(config, proj);
+ creator = new SeamProjectCreator(config, proj, new SeamLibFileSetProvider() {
+ @Override
+ public FileSet getEarLibFileSet() {
+ return null;
+ }
+ @Override
+ public FileSet getWarLibFileSet() {
+ return null;
+ }
+ @Override
+ public FileSet getWarLibFileSetForEar() {
+ return null;
+ }
+ });
} else if(seamVersion == SeamVersion.SEAM_2_0 ||
seamVersion == SeamVersion.SEAM_2_1 ||
- seamVersion == SeamVersion.SEAM_2_2 ||
- seamVersion == SeamVersion.SEAM_2_3) {
- creator = new Seam2ProjectCreator(config, proj);
+ seamVersion == SeamVersion.SEAM_2_2) {
+ creator = new Seam2ProjectCreator(config, proj, new SeamLibFileSetProvider() {
+ @Override
+ public FileSet getEarLibFileSet() {
+ return Seam2FacetInstallDelegate.SEAM2_JBOSS_EAR_LIB;
+ }
+ @Override
+ public FileSet getWarLibFileSet() {
+ return Seam2FacetInstallDelegate.SEAM2_JBOSS_WAR_LIB_FILESET_WAR_CONFIG;
+ }
+ @Override
+ public FileSet getWarLibFileSetForEar() {
+ return Seam2FacetInstallDelegate.SEAM2_JBOSS_WAR_LIB_FILESET_WAR_CONFIG;
+ }
+ });
+ } else if(seamVersion == SeamVersion.SEAM_2_3) {
+ creator = new Seam23ProjectCreator(config, proj, new SeamLibFileSetProvider() {
+ @Override
+ public FileSet getEarLibFileSet() {
+ return Seam23FacetInstallDelegate.getEarLibFileSet(config);
+ }
+ @Override
+ public FileSet getWarLibFileSet() {
+ return Seam23FacetInstallDelegate.getWarLibFileSet(config);
+ }
+ @Override
+ public FileSet getWarLibFileSetForEar() {
+ return Seam23FacetInstallDelegate.getWarLibFileSetForEar(config);
+ }
+ });
} else {
throw new RuntimeException("Can't get seam version from seam facet model");
}
12 years, 8 months
- 1
- 0
JBoss Tools SVN: r40810 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-05-04 19:17:23 -0400 (Fri, 04 May 2012)
New Revision: 40810
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
Log:
JBIDE-11731
https://issues.jboss.org/browse/JBIDE-11731
Error message for beans.xml validation are modified.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java 2012-05-04 23:09:47 UTC (rev 40809)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java 2012-05-04 23:17:23 UTC (rev 40810)
@@ -185,7 +185,7 @@
typepath = typepath + "/" + typeNode.getTypeName(); //$NON-NLS-1$
attr = typeValidator.getTypeElementName();
}
- IType type = getType(beansXml, typeNode, typeValidator.getUnknownTypeErrorMessage(), typeValidator.getUnknownTypeErrorMessageId(), typepath, attr);
+ IType type = getType(beansXml, typeNode, typeValidator, typepath, attr);
if(type!=null) {
if(!type.isBinary()) {
validator.getValidationContext().addLinkedCoreResource(CDICoreValidator.SHORT_ID, beansXml.getFullPath().toOSString(), type.getPath(), false);
@@ -198,23 +198,14 @@
}
}
}
- if(!typeValidator.validateKindOfType(type)) {
+ String typeError = typeValidator.validateType(context, type);
+ if(typeError != null) {
IMarker marker = validator.addError(typeValidator.getIllegalTypeErrorMessage(), CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML,
- new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml, typeValidator.getIllegalTypeErrorMessageId());
+ new String[]{typeNode.getTypeName()}, typeNode.getLength(), typeNode.getStartOffset(), beansXml, typeValidator.getIllegalTypeErrorMessageId());
if(marker != null) bindMarkerToModel(marker, typepath, typeValidator.getTypeElementName());
- } else if(type.isBinary()) {
- if(!typeValidator.validateBinaryType(type)) {
- IMarker marker = validator.addError(typeValidator.getIllegalTypeErrorMessage(), CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML,
- new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml, typeValidator.getIllegalTypeErrorMessageId());
- if(marker != null) bindMarkerToModel(marker, typepath, typeValidator.getTypeElementName());
+ if(type.isBinary()) {
+ continue;
}
- continue;
- } else {
- if(!typeValidator.validateSourceType(context, type)) {
- IMarker marker = validator.addError(typeValidator.getIllegalTypeErrorMessage(), CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML,
- new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml, typeValidator.getIllegalTypeErrorMessageId());
- if(marker != null) bindMarkerToModel(marker, typepath, typeValidator.getTypeElementName());
- }
}
TypeNode node = uniqueTypes.get(typeNode.getTypeName());
if(node!=null) {
@@ -266,23 +257,29 @@
return null;
}
- private IType getType(IFile beansXml, TypeNode node, String errorMessage, int errorMessageId, String xmodelpath, String attr) {
+ private IType getType(IFile beansXml, TypeNode node, TypeValidator typeValidator, String xmodelpath, String attr) {
IType type = null;
- if(node.getTypeName()!=null) {
+ String typeName = node.getTypeName();
+ if(typeName!=null && typeName.trim().length() > 0) {
try {
IJavaProject javaProject = getJavaProject(beansXml);
if(javaProject!=null) {
- type = EclipseJavaUtil.findType(javaProject, node.getTypeName());
+ type = EclipseJavaUtil.findType(javaProject, typeName);
}
} catch (JavaModelException e) {
CDICorePlugin.getDefault().logError(e);
return null;
}
+ } else {
+ IMarker marker = validator.addError(typeValidator.getEmptyTypeErrorMessage(), CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML,
+ new String[]{node.getTypeName()}, node.getLength(), node.getStartOffset(), beansXml, typeValidator.getUnknownTypeErrorMessageId());
+ bindMarkerToModel(marker, xmodelpath, attr);
+ return null;
}
if(type==null) {
addLinkedResourcesForUnknownType(beansXml, node.getTypeName());
- IMarker marker = validator.addError(errorMessage, CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML,
- new String[]{}, node.getLength(), node.getStartOffset(), beansXml, errorMessageId);
+ IMarker marker = validator.addError(typeValidator.getUnknownTypeErrorMessage(), CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML,
+ new String[]{node.getTypeName()}, node.getLength(), node.getStartOffset(), beansXml, typeValidator.getUnknownTypeErrorMessageId());
bindMarkerToModel(marker, xmodelpath, attr);
}
return type;
@@ -414,22 +411,14 @@
private static interface TypeValidator {
- boolean validateSourceType(CDICoreValidator.CDIValidationContext context, IType type);
+ String validateType(CDICoreValidator.CDIValidationContext context, IType type) throws JavaModelException;
- boolean validateBinaryType(IType type) throws JavaModelException;
-
- /**
- * Validates if the type represens class/annotation/...
- * @param type
- * @return
- * @throws JavaModelException
- */
- boolean validateKindOfType(IType type) throws JavaModelException;
-
String getTypeElementName();
String getParrentElementname();
+ String getEmptyTypeErrorMessage();
+
String getUnknownTypeErrorMessage();
int getUnknownTypeErrorMessageId();
@@ -447,6 +436,28 @@
return "class"; //$NON-NLS-1$
}
+ public String validateType(CDICoreValidator.CDIValidationContext context, IType type) throws JavaModelException {
+ if(!validateKindOfType(type)) {
+ return getIllegalTypeErrorMessage();
+ }
+ if(type.isBinary()) {
+ if(!validateBinaryType(type)) {
+ return getIllegalTypeErrorMessage();
+ }
+ } else if(!validateSourceType(context, type)) {
+ return getIllegalTypeErrorMessage();
+ }
+ return null;
+ }
+
+ abstract public boolean validateSourceType(CDICoreValidator.CDIValidationContext context, IType type);
+
+ /**
+ * Validates if the type represens class/annotation/...
+ * @param type
+ * @return
+ * @throws JavaModelException
+ */
public boolean validateKindOfType(IType type) throws JavaModelException {
return type.isClass();
}
@@ -475,6 +486,10 @@
return "alternatives"; //$NON-NLS-1$
}
+ public String getEmptyTypeErrorMessage() {
+ return CDIValidationMessages.EMPTY_ALTERNATIVE_BEAN_CLASS_NAME;
+ }
+
public String getUnknownTypeErrorMessage() {
return CDIValidationMessages.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME;
}
@@ -522,6 +537,10 @@
return "alternatives"; //$NON-NLS-1$
}
+ public String getEmptyTypeErrorMessage() {
+ return CDIValidationMessages.EMPTY_ALTERNATIVE_ANNOTATION_NAME;
+ }
+
public String getUnknownTypeErrorMessage() {
return CDIValidationMessages.UNKNOWN_ALTERNATIVE_ANNOTATION_NAME;
}
@@ -559,6 +578,10 @@
return "decorators"; //$NON-NLS-1$
}
+ public String getEmptyTypeErrorMessage() {
+ return CDIValidationMessages.EMPTY_DECORATOR_BEAN_CLASS_NAME;
+ }
+
public String getUnknownTypeErrorMessage() {
return CDIValidationMessages.UNKNOWN_DECORATOR_BEAN_CLASS_NAME;
}
@@ -596,6 +619,10 @@
return "interceptors"; //$NON-NLS-1$
}
+ public String getEmptyTypeErrorMessage() {
+ return CDIValidationMessages.EMPTY_INTERCEPTOR_CLASS_NAME;
+ }
+
public String getUnknownTypeErrorMessage() {
return CDIValidationMessages.UNKNOWN_INTERCEPTOR_CLASS_NAME;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java 2012-05-04 23:09:47 UTC (rev 40809)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java 2012-05-04 23:17:23 UTC (rev 40810)
@@ -137,14 +137,18 @@
public static String ILLEGAL_INJECTING_USERTRANSACTION_TYPE;
public static String ILLEGAL_INJECTING_INJECTIONPOINT_TYPE;
public static String ILLEGAL_QUALIFIER_IN_STEREOTYPE;
+ public static String EMPTY_ALTERNATIVE_BEAN_CLASS_NAME;
public static String UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME;
public static String ILLEGAL_ALTERNATIVE_BEAN_CLASS;
+ public static String EMPTY_ALTERNATIVE_ANNOTATION_NAME;
public static String UNKNOWN_ALTERNATIVE_ANNOTATION_NAME;
public static String ILLEGAL_ALTERNATIVE_ANNOTATION;
public static String DUPLICATE_ALTERNATIVE_TYPE;
+ public static String EMPTY_DECORATOR_BEAN_CLASS_NAME;
public static String UNKNOWN_DECORATOR_BEAN_CLASS_NAME;
public static String ILLEGAL_DECORATOR_BEAN_CLASS;
public static String DUPLICATE_DECORATOR_CLASS;
+ public static String EMPTY_INTERCEPTOR_CLASS_NAME;
public static String UNKNOWN_INTERCEPTOR_CLASS_NAME;
public static String ILLEGAL_INTERCEPTOR_CLASS;
public static String DUPLICATE_INTERCEPTOR_CLASS;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2012-05-04 23:09:47 UTC (rev 40809)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2012-05-04 23:17:23 UTC (rev 40810)
@@ -119,16 +119,20 @@
#Beans.xml
-UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME=There is no class with the specified name [JSR-299 �5.1.1]
-ILLEGAL_ALTERNATIVE_BEAN_CLASS=<class> element must specify the name of an alternative bean class [JSR-299 �5.1.1]
-UNKNOWN_ALTERNATIVE_ANNOTATION_NAME=There is no annotation with the specified name [JSR-299 �5.1.1]
-ILLEGAL_ALTERNATIVE_ANNOTATION=<stereotype> element must specify the name of an @Alternative stereotype annotation [JSR-299 �5.1.1]
+EMPTY_ALTERNATIVE_BEAN_CLASS_NAME=<class> element must specify the name of an alternative bean class [JSR-299 �5.1.1]
+UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME=There is no class "{0}" [JSR-299 �5.1.1]
+ILLEGAL_ALTERNATIVE_BEAN_CLASS="{0}" is not an alternative bean class [JSR-299 �5.1.1]
+EMPTY_ALTERNATIVE_ANNOTATION_NAME=<stereotype> element must specify the name of an @Alternative stereotype annotation [JSR-299 �5.1.1]
+UNKNOWN_ALTERNATIVE_ANNOTATION_NAME=There is no annotation "{0}" [JSR-299 �5.1.1]
+ILLEGAL_ALTERNATIVE_ANNOTATION= "{0}" is not @Alternative stereotype annotation [JSR-299 �5.1.1]
DUPLICATE_ALTERNATIVE_TYPE=The same type cannot be listed more than once under the <alternatives> element [JSR-299 �5.1.1]
-UNKNOWN_DECORATOR_BEAN_CLASS_NAME=There is no class with the specified name [JSR-299 �8.2]
-ILLEGAL_DECORATOR_BEAN_CLASS=<class> element must specify the name of a decorator bean class [JSR-299 �8.2]
+EMPTY_DECORATOR_BEAN_CLASS_NAME=<class> element must specify the name of a decorator bean class [JSR-299 �8.2]
+UNKNOWN_DECORATOR_BEAN_CLASS_NAME=There is no class "{0}" [JSR-299 �8.2]
+ILLEGAL_DECORATOR_BEAN_CLASS="{0}" is not a decorator bean class [JSR-299 �8.2]
DUPLICATE_DECORATOR_CLASS=The same class cannot be listed more then once under the <decorators> element [JSR-299 �8.2]
-UNKNOWN_INTERCEPTOR_CLASS_NAME=There is no class with the specified name [JSR-299 �9.4]
-ILLEGAL_INTERCEPTOR_CLASS=<class> element must specify the name of an interceptor class [JSR-299 �9.4]
+EMPTY_INTERCEPTOR_CLASS_NAME=<class> element must specify the name of an interceptor class [JSR-299 �9.4]
+UNKNOWN_INTERCEPTOR_CLASS_NAME=There is no class "{0}" [JSR-299 �9.4]
+ILLEGAL_INTERCEPTOR_CLASS="{0}" is not an interceptor class [JSR-299 �9.4]
DUPLICATE_INTERCEPTOR_CLASS=The same class cannot be listed more then once under the <interceptors> element [JSR-299 �9.4]
#Messages for Progress Monitor
12 years, 8 months
- 1
- 0
JBoss Tools SVN: r40809 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-05-04 19:09:47 -0400 (Fri, 04 May 2012)
New Revision: 40809
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/BeansXmlValidationTest.java
Log:
JBIDE-11731
https://issues.jboss.org/browse/JBIDE-11731
Error message for beans.xml validation are modified.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/BeansXmlValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/BeansXmlValidationTest.java 2012-05-04 21:55:43 UTC (rev 40808)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/BeansXmlValidationTest.java 2012-05-04 23:09:47 UTC (rev 40809)
@@ -12,6 +12,7 @@
package org.jboss.tools.cdi.core.test.tck.validation;
import org.eclipse.core.resources.IFile;
+import org.eclipse.osgi.util.NLS;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
@@ -29,9 +30,9 @@
public void testBeansXMLInBin() throws Exception {
IFile file = tckProject.getFile("JavaSource/META-INF/beans.xml");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME, false, 6);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, NLS.bind(CDIValidationMessages.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME, "cdi.test.alternative.Unxisting"), false, 6);
file = tckProject.getFile("WebContent/WEB-INF/classes/META-INF/beans.xml");
- AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME, 6);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, NLS.bind(CDIValidationMessages.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME, "cdi.test.alternative.Unxisting"), 6);
}
/**
@@ -42,8 +43,8 @@
*/
public void testNoAlternativeClassWithSpecifiedName() throws Exception {
IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME, false, 7);
- AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME, 19);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, NLS.bind(CDIValidationMessages.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME, "org.jboss.jsr299.tck.tests.policy.broken.incorrect.name.NonExistingClass"), false, 7);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, NLS.bind(CDIValidationMessages.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME, "org.jboss.jsr299.tck.tests.policy.broken.same.type.twice.Dog"), 19);
}
/**
@@ -53,8 +54,8 @@
*/
public void testIllegalAlternativeClassWithSpecifiedName() throws Exception {
IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_ALTERNATIVE_BEAN_CLASS, 4);
- AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.ILLEGAL_ALTERNATIVE_BEAN_CLASS, 19);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, NLS.bind(CDIValidationMessages.ILLEGAL_ALTERNATIVE_BEAN_CLASS, "org.jboss.jsr299.tck.tests.policy.broken.not.policy.Cat"), 4);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, NLS.bind(CDIValidationMessages.ILLEGAL_ALTERNATIVE_BEAN_CLASS, "org.jboss.jsr299.tck.tests.policy.broken.same.type.twice.Dog"), 19);
}
/**
@@ -65,8 +66,8 @@
*/
public void testNoAlternativeAnnotationWithSpecifiedName() throws Exception {
IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.UNKNOWN_ALTERNATIVE_ANNOTATION_NAME, 12);
- AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.UNKNOWN_ALTERNATIVE_ANNOTATION_NAME, 17);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, NLS.bind(CDIValidationMessages.UNKNOWN_ALTERNATIVE_ANNOTATION_NAME, "org.jboss.jsr299.tck.tests.policy.broken.not.policy.stereotype.NotExistingStereotype"), 12);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, NLS.bind(CDIValidationMessages.UNKNOWN_ALTERNATIVE_ANNOTATION_NAME, "org.jboss.jsr299.tck.tests.jbt.validation.beansxml.AlternativeStereotype"), 17);
}
/**
@@ -76,8 +77,8 @@
*/
public void testIllegalAlternativeAnnotationWithSpecifiedName() throws Exception {
IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_ALTERNATIVE_ANNOTATION, 15);
- AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.ILLEGAL_ALTERNATIVE_ANNOTATION, 17);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, NLS.bind(CDIValidationMessages.ILLEGAL_ALTERNATIVE_ANNOTATION, "org.jboss.jsr299.tck.tests.policy.broken.not.policy.stereotype.Mock"), 15);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, NLS.bind(CDIValidationMessages.ILLEGAL_ALTERNATIVE_ANNOTATION, "org.jboss.jsr299.tck.tests.jbt.validation.beansxml.AlternativeStereotype"), 17);
}
/**
@@ -99,8 +100,8 @@
*/
public void testNonExistantDecoratorClassInBeansXmlNotOK() throws Exception {
IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.UNKNOWN_DECORATOR_BEAN_CLASS_NAME, 34);
- AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.UNKNOWN_DECORATOR_BEAN_CLASS_NAME, BAR_DECORATOR_LINE);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, NLS.bind(CDIValidationMessages.UNKNOWN_DECORATOR_BEAN_CLASS_NAME, "com.acme.NonExistantDecoratorClass"), 34);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, NLS.bind(CDIValidationMessages.UNKNOWN_DECORATOR_BEAN_CLASS_NAME, "org.jboss.jsr299.tck.tests.decorators.resolution.BarDecorator"), BAR_DECORATOR_LINE);
}
/**
@@ -110,8 +111,8 @@
*/
public void testEnabledDecoratorNotADecorator() throws Exception {
IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_DECORATOR_BEAN_CLASS, 37);
- AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.ILLEGAL_DECORATOR_BEAN_CLASS, BAR_DECORATOR_LINE);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, NLS.bind(CDIValidationMessages.ILLEGAL_DECORATOR_BEAN_CLASS, "org.jboss.jsr299.tck.tests.decorators.definition.broken.enabledDecoratorIsNotDecorator.TimestampLogger"), 37);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, NLS.bind(CDIValidationMessages.ILLEGAL_DECORATOR_BEAN_CLASS, "org.jboss.jsr299.tck.tests.decorators.resolution.BarDecorator"), BAR_DECORATOR_LINE);
}
/**
@@ -132,8 +133,8 @@
*/
public void testNonExistantClassInBeansXmlNotOk() throws Exception {
IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.UNKNOWN_INTERCEPTOR_CLASS_NAME, FOO_LINE);
- AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.UNKNOWN_INTERCEPTOR_CLASS_NAME, CAT_INTERCEPTOR_LINE);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, NLS.bind(CDIValidationMessages.UNKNOWN_INTERCEPTOR_CLASS_NAME, "com.acme.Foo"), FOO_LINE);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, NLS.bind(CDIValidationMessages.UNKNOWN_INTERCEPTOR_CLASS_NAME, "org.jboss.jsr299.tck.tests.jbt.validation.interceptors.CatInterceptor"), CAT_INTERCEPTOR_LINE);
}
/**
@@ -143,8 +144,8 @@
*/
public void testNonInterceptorClassInBeansXmlNotOk() throws Exception {
IFile file = tckProject.getFile("WebContent/WEB-INF/beans.xml");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_INTERCEPTOR_CLASS, NON_INTERCEPTOR_LINE);
- AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.ILLEGAL_INTERCEPTOR_CLASS, CAT_INTERCEPTOR_LINE);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, NLS.bind(CDIValidationMessages.ILLEGAL_INTERCEPTOR_CLASS, "org.jboss.jsr299.tck.tests.interceptors.definition.broken.nonInterceptorClassInBeansXml.Foo"), NON_INTERCEPTOR_LINE);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, NLS.bind(CDIValidationMessages.ILLEGAL_INTERCEPTOR_CLASS, "org.jboss.jsr299.tck.tests.jbt.validation.interceptors.CatInterceptor"), CAT_INTERCEPTOR_LINE);
}
/**
12 years, 8 months
- 1
- 0
JBoss Tools SVN: r40808 - trunk/download.jboss.org/jbosstools/updates/webtools/juno.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-04 17:55:43 -0400 (Fri, 04 May 2012)
New Revision: 40808
Modified:
trunk/download.jboss.org/jbosstools/updates/webtools/juno/.gitignore
trunk/download.jboss.org/jbosstools/updates/webtools/juno/index.html
trunk/download.jboss.org/jbosstools/updates/webtools/juno/site.xml
Log:
push updated Webtools adapter Beta3 to download.jboss.org/jbosstools/updates/webtools/juno
Modified: trunk/download.jboss.org/jbosstools/updates/webtools/juno/.gitignore
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/webtools/juno/.gitignore 2012-05-04 19:20:35 UTC (rev 40807)
+++ trunk/download.jboss.org/jbosstools/updates/webtools/juno/.gitignore 2012-05-04 21:55:43 UTC (rev 40808)
@@ -3,7 +3,5 @@
content.jar
features/
plugins/
-site.properties site.xml
web/
site.properties
-site.xml
Modified: trunk/download.jboss.org/jbosstools/updates/webtools/juno/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/webtools/juno/index.html 2012-05-04 19:20:35 UTC (rev 40807)
+++ trunk/download.jboss.org/jbosstools/updates/webtools/juno/index.html 2012-05-04 21:55:43 UTC (rev 40808)
@@ -30,8 +30,8 @@
<tr class="light-row" style="height: 30px">
<td class="bodyText">
<p class="bodyText">This is the <b>Nightly Build</b>
- Update Site for JBoss Tools - Web Tools.
-<p align="center"><span style="padding:4px;color:white;background-color:red;font-weight:bold">NOTE:This site was built using Indigo (Eclipse 3.7.2), but SHOULD work with Juno (Eclipse 4.2M6+) too.</span></p>
+ Update Site for JBoss Tools - Web Tools.
+ <p align="center"><span style="padding:4px;color:white;background-color:red;font-weight:bold">NOTE:This site was built using Indigo (Eclipse 3.7.2), but SHOULD work with Juno (Eclipse 4.2M6+) too.</span></p>
<blockquote style="border: 1px dashed #1778be; padding: 2px">
<ol>
<li>To <a class="link"
@@ -81,20 +81,20 @@
</th>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.archives.feature_3.2.1.v20120503-1259-H887-CR1.jar" style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td>
- <td><span style="font-size:x-small">3.2.1.v20120503-1259-H887-CR1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.archives.feature_3.2.1.v20120504-0235-H64-Beta3.jar" style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td>
+ <td><span style="font-size:x-small">3.2.1.v20120504-0235-H64-Beta3</span></td>
<td></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20120503-1439-H1297-CR1.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
- <td><span style="font-size:x-small">2.3.0.v20120503-1439-H1297-CR1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20120504-0300-H103-Beta3.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20120504-0300-H103-Beta3</span></td>
<td><span style="font-size:x-small">
|
org.eclipse.wst.server.core.serverAdapter</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.jmx.feature_1.2.0.v20120503-1250-H807-CR1.jar" style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
- <td><span style="font-size:x-small">1.2.0.v20120503-1250-H807-CR1</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.jmx.feature_1.2.0.v20120504-0232-H50-Beta3.jar" style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20120504-0232-H50-Beta3</span></td>
<td></td>
</tr>
<tr style="background-color:#DDDDDD">
Modified: trunk/download.jboss.org/jbosstools/updates/webtools/juno/site.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/webtools/juno/site.xml 2012-05-04 19:20:35 UTC (rev 40807)
+++ trunk/download.jboss.org/jbosstools/updates/webtools/juno/site.xml 2012-05-04 21:55:43 UTC (rev 40808)
@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
<site>
<category-def label="JBoss Application Server Adapters" name="org.eclipse.wst.server.core.serverAdapter">
</category-def>
- <feature url="features/org.jboss.ide.eclipse.as.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.feature" version="0.0.0">
- <category name="org.eclipse.wst.server.core.serverAdapter"/>
- </feature>
- <feature url="features/org.jboss.ide.eclipse.archives.feature_0.0.0.jar" id="org.jboss.ide.eclipse.archives.feature" version="0.0.0"></feature>
- <feature url="features/org.jboss.tools.jmx.feature_0.0.0.jar" id="org.jboss.tools.jmx.feature" version="0.0.0"></feature>
+ <feature url="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20120504-0300-H103-Beta3.jar" id="org.jboss.ide.eclipse.as.feature" version="2.3.0.v20120504-0300-H103-Beta3"><category name="org.eclipse.wst.server.core.serverAdapter"></category></feature>
+ <feature url="features/org.jboss.ide.eclipse.archives.feature_3.2.1.v20120504-0235-H64-Beta3.jar" id="org.jboss.ide.eclipse.archives.feature" version="3.2.1.v20120504-0235-H64-Beta3"></feature>
+ <feature url="features/org.jboss.tools.jmx.feature_1.2.0.v20120504-0232-H50-Beta3.jar" id="org.jboss.tools.jmx.feature" version="1.2.0.v20120504-0232-H50-Beta3"></feature>
-</site>
+</site>
\ No newline at end of file
12 years, 8 months
- 1
- 0
JBoss Tools SVN: r40807 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-05-04 15:20:35 -0400 (Fri, 04 May 2012)
New Revision: 40807
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java
Log:
JBIDE-11301
https://issues.jboss.org/browse/JBIDE-11301
Method ParametedType.findParameter is made thread safe.
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java 2012-05-04 18:57:24 UTC (rev 40806)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java 2012-05-04 19:20:35 UTC (rev 40807)
@@ -278,8 +278,8 @@
void buildParameters() {
if(signaturesByName == null && type != null) {
- signaturesByName = new HashMap<String, String>();
- parametersBySignature = new HashMap<String, ParametedType>();
+ Map<String, String> sbn = new HashMap<String, String>();
+ Map<String, ParametedType> pbs = new HashMap<String, ParametedType>();
ITypeParameter[] ps = null;
try {
ps = type.getTypeParameters();
@@ -290,10 +290,12 @@
String paramName = ps[i].getElementName();
if(parameterTypes.size() > i) {
ParametedType p = parameterTypes.get(i);
- signaturesByName.put(paramName, p.getSignature());
- parametersBySignature.put(p.getSignature(), p);
+ sbn.put(paramName, p.getSignature());
+ pbs.put(p.getSignature(), p);
}
}
+ signaturesByName = sbn;
+ parametersBySignature = pbs;
}
}
12 years, 8 months
- 1
- 0
JBoss Tools SVN: r40806 - branches/jbosstools-3.3.0.Beta3/build/aggregate/webtools-site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-04 14:57:24 -0400 (Fri, 04 May 2012)
New Revision: 40806
Modified:
branches/jbosstools-3.3.0.Beta3/build/aggregate/webtools-site/index-template.html
branches/jbosstools-3.3.0.Beta3/build/aggregate/webtools-site/index.html
Log:
tweak copy in template and regen'd site
Modified: branches/jbosstools-3.3.0.Beta3/build/aggregate/webtools-site/index-template.html
===================================================================
--- branches/jbosstools-3.3.0.Beta3/build/aggregate/webtools-site/index-template.html 2012-05-04 18:57:14 UTC (rev 40805)
+++ branches/jbosstools-3.3.0.Beta3/build/aggregate/webtools-site/index-template.html 2012-05-04 18:57:24 UTC (rev 40806)
@@ -31,7 +31,7 @@
<td class="bodyText">
<p class="bodyText">This is the <b>${update.site.description}</b>
Update Site for ${update.site.name}.
- <p align="center"><span style="padding:4px;color:white;background-color:red;font-weight:bold">NOTE:This site was built using Indigo (Eclipse 3.7.2), but SHOULD work with Juno (Eclipse 4.2M6).</p>
+ <p align="center"><span style="padding:4px;color:white;background-color:red;font-weight:bold">NOTE:This site was built using Indigo (Eclipse 3.7.2), but SHOULD work with Juno (Eclipse 4.2M6+) too.</span></p>
<blockquote style="border: 1px dashed #1778be; padding: 2px">
<ol>
<li>To <a class="link"
Modified: branches/jbosstools-3.3.0.Beta3/build/aggregate/webtools-site/index.html
===================================================================
--- branches/jbosstools-3.3.0.Beta3/build/aggregate/webtools-site/index.html 2012-05-04 18:57:14 UTC (rev 40805)
+++ branches/jbosstools-3.3.0.Beta3/build/aggregate/webtools-site/index.html 2012-05-04 18:57:24 UTC (rev 40806)
@@ -31,7 +31,7 @@
<td class="bodyText">
<p class="bodyText">This is the <b>Nightly Build</b>
Update Site for JBoss Tools - Web Tools.
- <p align="center"><span style="padding:4px;color:white;background-color:red;font-weight:bold">NOTE:This site was built using Indigo (Eclipse 3.7.2), but SHOULD work with Juno (Eclipse 4.2M6).</p>
+ <p align="center"><span style="padding:4px;color:white;background-color:red;font-weight:bold">NOTE:This site was built using Indigo (Eclipse 3.7.2), but SHOULD work with Juno (Eclipse 4.2M6+) too.</span></p>
<blockquote style="border: 1px dashed #1778be; padding: 2px">
<ol>
<li>To <a class="link"
12 years, 8 months
- 1
- 0
JBoss Tools SVN: r40805 - branches/jbosstools-3.3.0.Beta3/build/aggregate/webtools-site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-04 14:57:14 -0400 (Fri, 04 May 2012)
New Revision: 40805
Added:
branches/jbosstools-3.3.0.Beta3/build/aggregate/webtools-site/index-template.html
Modified:
branches/jbosstools-3.3.0.Beta3/build/aggregate/webtools-site/index.html
Log:
add override template for webtools; regen site
Copied: branches/jbosstools-3.3.0.Beta3/build/aggregate/webtools-site/index-template.html (from rev 40803, branches/jbosstools-3.3.0.Beta3/build/aggregate/webtools-site/index.html)
===================================================================
--- branches/jbosstools-3.3.0.Beta3/build/aggregate/webtools-site/index-template.html (rev 0)
+++ branches/jbosstools-3.3.0.Beta3/build/aggregate/webtools-site/index-template.html 2012-05-04 18:57:14 UTC (rev 40805)
@@ -0,0 +1,137 @@
+<html>
+<head>
+<title>${update.site.name} - ${update.site.description} Update Site${update.site.version}</title>
+<style>
+@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
+</style>
+</head>
+<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<center>
+<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
+ cellspacing="0" cellpadding="0" width="920" class="bodyText">
+ <tr>
+ <td colspan="3"><img
+ src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
+ </tr>
+ <tr>
+ <td>      </td>
+ <td>      </td>
+ <td>      </td>
+ </tr>
+ <tr>
+ <td>      </td>
+ <td>
+ <h2 class="title">${update.site.name} - ${update.site.description} Update Site</h2>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span>Latest Build${update.site.version}</span></td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">This is the <b>${update.site.description}</b>
+ Update Site for ${update.site.name}.
+ <p align="center"><span style="padding:4px;color:white;background-color:red;font-weight:bold">NOTE:This site was built using Indigo (Eclipse 3.7.2), but SHOULD work with Juno (Eclipse 4.2M6).</p>
+ <blockquote style="border: 1px dashed #1778be; padding: 2px">
+ <ol>
+ <li>To <a class="link"
+ href="http://www.jboss.org/tools/download/installation/update_3_3">install</a>
+ from this site, start up Eclipse 3.7 (or 4.2), then do:
+ <ul>
+ <code><strong>Help > Install New Software... ></strong></code>
+ </ul>
+ </li>
+ <li>Copy this site's URL into Eclipse, and hit Enter.</li>
+ <li>When the site loads, select the features to install,
+ or click the <code><strong>Select All</strong></code> button.</li>
+ <li>To properly resolve all dependencies, check
+ <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
+
+ <li>Click <code><strong>Next</strong></code>, agree to the license
+ terms, and install.</li>
+
+ <p class="bodyText">
+ You can also download JBoss Tools as individual zips for
+ offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.<br /> If you downloaded this site as a zip, see
+ <a href="README.installation.txt">Installation README</a>.
+ See also <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.
+ </p>
+ </ol>
+ </blockquote>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td>      </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ ${site.contents}
+ </td>
+ <td></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span> Installation
+ Types</span></td>
+ </tr>
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">Depending on how close to the bleeding edge
+ you like to be, there are several types of releases available.</p>
+ <br />
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Stable Releases</h4>
+
+ <p><a href="https://www.jboss.org/tools/download/stable.html">Stable
+ releases</a> are - as indicated by their name - stable.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Development Milestones</h4>
+
+ <p><a href="https://www.jboss.org/tools/download/dev.html">Development
+ builds</a>, released once per milestone and only a few times a year, are
+ fairly stable, but there may be some things which do not yet work.
+ If you would like to try one of these milestones, we'd greatly
+ appreciate the assistance in testing and <a
+ href="https://jira.jboss.org/jira/browse/JBIDE">reporting of
+ issues in our issue tracker</a>.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Nightly Builds</h4>
+
+ <p>The <a
+ href="https://www.jboss.org/tools/download/nightly.html">bleeding
+ edge</a> contains the latest and greatest new features, but nothing is
+ stable or guaranteed - yet. If you're using a Milestone and need a
+ fix, you can update to the latest Nightly, or wait for the next
+ Milestone.</p><br/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+</center>
+</html>
Modified: branches/jbosstools-3.3.0.Beta3/build/aggregate/webtools-site/index.html
===================================================================
--- branches/jbosstools-3.3.0.Beta3/build/aggregate/webtools-site/index.html 2012-05-04 18:57:12 UTC (rev 40804)
+++ branches/jbosstools-3.3.0.Beta3/build/aggregate/webtools-site/index.html 2012-05-04 18:57:14 UTC (rev 40805)
@@ -31,11 +31,12 @@
<td class="bodyText">
<p class="bodyText">This is the <b>Nightly Build</b>
Update Site for JBoss Tools - Web Tools.
+ <p align="center"><span style="padding:4px;color:white;background-color:red;font-weight:bold">NOTE:This site was built using Indigo (Eclipse 3.7.2), but SHOULD work with Juno (Eclipse 4.2M6).</p>
<blockquote style="border: 1px dashed #1778be; padding: 2px">
<ol>
<li>To <a class="link"
href="http://www.jboss.org/tools/download/installation/update_3_3">install</a>
- from this site, start up Eclipse 3.7, then do:
+ from this site, start up Eclipse 3.7 (or 4.2), then do:
<ul>
<code><strong>Help > Install New Software... ></strong></code>
</ul>
@@ -80,20 +81,20 @@
</th>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.archives.feature_3.2.1.v20120502-0834-H62-Beta3.jar" style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td>
- <td><span style="font-size:x-small">3.2.1.v20120502-0834-H62-Beta3</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.archives.feature_3.2.1.v20120504-0235-H64-Beta3.jar" style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td>
+ <td><span style="font-size:x-small">3.2.1.v20120504-0235-H64-Beta3</span></td>
<td></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20120503-0045-H101-Beta3.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
- <td><span style="font-size:x-small">2.3.0.v20120503-0045-H101-Beta3</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20120504-0300-H103-Beta3.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20120504-0300-H103-Beta3</span></td>
<td><span style="font-size:x-small">
|
org.eclipse.wst.server.core.serverAdapter</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.jmx.feature_1.2.0.v20120502-0841-H48-Beta3.jar" style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
- <td><span style="font-size:x-small">1.2.0.v20120502-0841-H48-Beta3</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.jmx.feature_1.2.0.v20120504-0232-H50-Beta3.jar" style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20120504-0232-H50-Beta3</span></td>
<td></td>
</tr>
<tr style="background-color:#DDDDDD">
12 years, 8 months
- 1
- 0
JBoss Tools SVN: r40804 - trunk/build/aggregate/webtools-site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-04 14:57:12 -0400 (Fri, 04 May 2012)
New Revision: 40804
Added:
trunk/build/aggregate/webtools-site/index-template.html
Modified:
trunk/build/aggregate/webtools-site/index.html
Log:
add override template for webtools; regen site
Copied: trunk/build/aggregate/webtools-site/index-template.html (from rev 40802, trunk/build/aggregate/webtools-site/index.html)
===================================================================
--- trunk/build/aggregate/webtools-site/index-template.html (rev 0)
+++ trunk/build/aggregate/webtools-site/index-template.html 2012-05-04 18:57:12 UTC (rev 40804)
@@ -0,0 +1,137 @@
+<html>
+<head>
+<title>${update.site.name} - ${update.site.description} Update Site${update.site.version}</title>
+<style>
+@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
+</style>
+</head>
+<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<center>
+<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
+ cellspacing="0" cellpadding="0" width="920" class="bodyText">
+ <tr>
+ <td colspan="3"><img
+ src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
+ </tr>
+ <tr>
+ <td>      </td>
+ <td>      </td>
+ <td>      </td>
+ </tr>
+ <tr>
+ <td>      </td>
+ <td>
+ <h2 class="title">${update.site.name} - ${update.site.description} Update Site</h2>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span>Latest Build${update.site.version}</span></td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">This is the <b>${update.site.description}</b>
+ Update Site for ${update.site.name}.
+ <p align="center"><span style="padding:4px;color:white;background-color:red;font-weight:bold">NOTE:This site was built using Indigo (Eclipse 3.7.2), but SHOULD work with Juno (Eclipse 4.2M6+) too.</span></p>
+ <blockquote style="border: 1px dashed #1778be; padding: 2px">
+ <ol>
+ <li>To <a class="link"
+ href="http://www.jboss.org/tools/download/installation/update_3_3">install</a>
+ from this site, start up Eclipse 3.7 (or 4.2), then do:
+ <ul>
+ <code><strong>Help > Install New Software... ></strong></code>
+ </ul>
+ </li>
+ <li>Copy this site's URL into Eclipse, and hit Enter.</li>
+ <li>When the site loads, select the features to install,
+ or click the <code><strong>Select All</strong></code> button.</li>
+ <li>To properly resolve all dependencies, check
+ <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
+
+ <li>Click <code><strong>Next</strong></code>, agree to the license
+ terms, and install.</li>
+
+ <p class="bodyText">
+ You can also download JBoss Tools as individual zips for
+ offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.<br /> If you downloaded this site as a zip, see
+ <a href="README.installation.txt">Installation README</a>.
+ See also <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.
+ </p>
+ </ol>
+ </blockquote>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td>      </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ ${site.contents}
+ </td>
+ <td></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span> Installation
+ Types</span></td>
+ </tr>
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">Depending on how close to the bleeding edge
+ you like to be, there are several types of releases available.</p>
+ <br />
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Stable Releases</h4>
+
+ <p><a href="https://www.jboss.org/tools/download/stable.html">Stable
+ releases</a> are - as indicated by their name - stable.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Development Milestones</h4>
+
+ <p><a href="https://www.jboss.org/tools/download/dev.html">Development
+ builds</a>, released once per milestone and only a few times a year, are
+ fairly stable, but there may be some things which do not yet work.
+ If you would like to try one of these milestones, we'd greatly
+ appreciate the assistance in testing and <a
+ href="https://jira.jboss.org/jira/browse/JBIDE">reporting of
+ issues in our issue tracker</a>.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Nightly Builds</h4>
+
+ <p>The <a
+ href="https://www.jboss.org/tools/download/nightly.html">bleeding
+ edge</a> contains the latest and greatest new features, but nothing is
+ stable or guaranteed - yet. If you're using a Milestone and need a
+ fix, you can update to the latest Nightly, or wait for the next
+ Milestone.</p><br/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+</center>
+</html>
Modified: trunk/build/aggregate/webtools-site/index.html
===================================================================
--- trunk/build/aggregate/webtools-site/index.html 2012-05-04 18:57:04 UTC (rev 40803)
+++ trunk/build/aggregate/webtools-site/index.html 2012-05-04 18:57:12 UTC (rev 40804)
@@ -30,8 +30,8 @@
<tr class="light-row" style="height: 30px">
<td class="bodyText">
<p class="bodyText">This is the <b>Nightly Build</b>
- Update Site for JBoss Tools - Web Tools.
-<p align="center"><span style="padding:4px;color:white;background-color:red;font-weight:bold">NOTE:This site was built using Indigo (Eclipse 3.7.2), but SHOULD work with Juno (Eclipse 4.2M6+) too.</span></p>
+ Update Site for JBoss Tools - Web Tools.
+ <p align="center"><span style="padding:4px;color:white;background-color:red;font-weight:bold">NOTE:This site was built using Indigo (Eclipse 3.7.2), but SHOULD work with Juno (Eclipse 4.2M6+) too.</span></p>
<blockquote style="border: 1px dashed #1778be; padding: 2px">
<ol>
<li>To <a class="link"
12 years, 8 months
- 1
- 0
JBoss Tools SVN: r40803 - branches/jbosstools-3.3.0.Beta3/build/aggregate.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-04 14:57:04 -0400 (Fri, 04 May 2012)
New Revision: 40803
Modified:
branches/jbosstools-3.3.0.Beta3/build/aggregate/build.xml
Log:
allow individual aggregates to override the template file (eg., for webtools site which can will for now be used for both Indigo and Juno)
Modified: branches/jbosstools-3.3.0.Beta3/build/aggregate/build.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta3/build/aggregate/build.xml 2012-05-04 18:57:04 UTC (rev 40802)
+++ branches/jbosstools-3.3.0.Beta3/build/aggregate/build.xml 2012-05-04 18:57:04 UTC (rev 40803)
@@ -544,8 +544,11 @@
<antcallback target="generate.directory.xml" return="directory.xml.html"/>
+ <condition property="index-template.html" value="${output.dir}/index-template.html" else="${basedir}/index-template.html">
+ <available file="${output.dir}/index-template.html" />
+ </condition>
<copy todir="${output.dir}" overwrite="true">
- <fileset file="${basedir}/index-template.html" />
+ <fileset file="${index-template.html}" />
<mapper type="merge" to="index.html" />
<filterchain>
<expandproperties />
12 years, 8 months
- 1
- 0