JBoss Tools SVN: r42127 - in trunk/tests: features/org.jboss.tools.test.feature and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2012-06-20 19:22:53 -0400 (Wed, 20 Jun 2012)
New Revision: 42127
Added:
trunk/tests/tests/org.jboss.tools.tests.test/
Removed:
trunk/tests/tests/org.jboss.tools.tests.tests/
Modified:
trunk/tests/features/org.jboss.tools.test.feature/feature.xml
trunk/tests/pom.xml
trunk/tests/tests/org.jboss.tools.tests.test/.project
trunk/tests/tests/org.jboss.tools.tests.test/META-INF/MANIFEST.MF
trunk/tests/tests/org.jboss.tools.tests.test/pom.xml
trunk/tests/tests/pom.xml
Log:
renamed org.jboss.tests.tests to org.jboss.tests.test to follow the common name pattern for test plugins. it also included into feature for consistency
Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2012-06-20 23:22:36 UTC (rev 42126)
+++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2012-06-20 23:22:53 UTC (rev 42127)
@@ -24,6 +24,12 @@
version="0.0.0"/>
<plugin
+ id="org.jboss.tools.tests.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
id="org.jboss.tools.ui.bot.ext"
download-size="0"
install-size="0"
Modified: trunk/tests/pom.xml
===================================================================
--- trunk/tests/pom.xml 2012-06-20 23:22:36 UTC (rev 42126)
+++ trunk/tests/pom.xml 2012-06-20 23:22:53 UTC (rev 42127)
@@ -14,8 +14,8 @@
<packaging>pom</packaging>
<modules>
<module>plugins</module>
+ <module>tests</module>
<module>features</module>
<module>site</module>
- <module>tests</module>
</modules>
</project>
Modified: trunk/tests/tests/org.jboss.tools.tests.test/.project
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests.tests/.project 2012-06-20 16:07:38 UTC (rev 42114)
+++ trunk/tests/tests/org.jboss.tools.tests.test/.project 2012-06-20 23:22:53 UTC (rev 42127)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.tests.tests</name>
+ <name>org.jboss.tools.tests.test</name>
<comment></comment>
<projects>
</projects>
Modified: trunk/tests/tests/org.jboss.tools.tests.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests.tests/META-INF/MANIFEST.MF 2012-06-20 16:07:38 UTC (rev 42114)
+++ trunk/tests/tests/org.jboss.tools.tests.test/META-INF/MANIFEST.MF 2012-06-20 23:22:53 UTC (rev 42127)
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tests for test utils
-Bundle-SymbolicName: org.jboss.tools.tests.tests
+Bundle-SymbolicName: org.jboss.tools.tests.test
Bundle-Version: 3.2.0.qualifier
Bundle-Vendor: JBoss by Red Hat
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/tests/tests/org.jboss.tools.tests.test/pom.xml
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests.tests/pom.xml 2012-06-20 16:07:38 UTC (rev 42114)
+++ trunk/tests/tests/org.jboss.tools.tests.test/pom.xml 2012-06-20 23:22:53 UTC (rev 42127)
@@ -8,6 +8,6 @@
<version>3.2.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.tests.tests</groupId>
- <artifactId>org.jboss.tools.tests.tests</artifactId>
+ <artifactId>org.jboss.tools.tests.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
</project>
Modified: trunk/tests/tests/pom.xml
===================================================================
--- trunk/tests/tests/pom.xml 2012-06-20 23:22:36 UTC (rev 42126)
+++ trunk/tests/tests/pom.xml 2012-06-20 23:22:53 UTC (rev 42127)
@@ -13,8 +13,8 @@
<packaging>pom</packaging>
<modules>
- <module>org.jboss.tools.tests.tests</module>
- <module>org.jboss.tools.ui.bot.ext.test</module>
+ <module>org.jboss.tools.tests.test</module>
+ <module>org.jboss.tools.ui.bot.ext.test</module>
</modules>
</project>
13 years, 9 months
JBoss Tools SVN: r42126 - branches/jbosstools-3.3.x/maven/docs/reference/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-06-20 19:22:36 -0400 (Wed, 20 Jun 2012)
New Revision: 42126
Modified:
branches/jbosstools-3.3.x/maven/docs/reference/en-US/Book_Info.xml
branches/jbosstools-3.3.x/maven/docs/reference/en-US/creating_a_maven_module.xml
branches/jbosstools-3.3.x/maven/docs/reference/en-US/creating_a_maven_project.xml
Log:
updated with files from trunk
Modified: branches/jbosstools-3.3.x/maven/docs/reference/en-US/Book_Info.xml
===================================================================
--- branches/jbosstools-3.3.x/maven/docs/reference/en-US/Book_Info.xml 2012-06-20 23:09:21 UTC (rev 42125)
+++ branches/jbosstools-3.3.x/maven/docs/reference/en-US/Book_Info.xml 2012-06-20 23:22:36 UTC (rev 42126)
@@ -13,7 +13,7 @@
<edition>5.0.0</edition>
- <pubsnumber>3</pubsnumber>
+ <pubsnumber>4</pubsnumber>
<abstract>
<para>
Modified: branches/jbosstools-3.3.x/maven/docs/reference/en-US/creating_a_maven_module.xml
===================================================================
--- branches/jbosstools-3.3.x/maven/docs/reference/en-US/creating_a_maven_module.xml 2012-06-20 23:09:21 UTC (rev 42125)
+++ branches/jbosstools-3.3.x/maven/docs/reference/en-US/creating_a_maven_module.xml 2012-06-20 23:22:36 UTC (rev 42126)
@@ -4,7 +4,7 @@
A Maven module is a sub-project. To create a Maven module you will need to already have a Maven project available.
</para>
<para>
- The parent project must have its <guilabel>Packaing</guilabel> option be pre-configured to <guimenuitem>pom</guimenuitem> for a module to be created and associated to it. To ensure your parent project has this option set correctly before proceeding, double-click on the <filename>pom.xml</filename> file of your parent project in the <guilabel>Project Explorer</guilabel>.
+ The parent project must have its <guilabel>Packaging</guilabel> option be pre-configured to <guimenuitem>pom</guimenuitem>, for a module to be created and associated with it. To ensure your parent project has this option set correctly before proceeding, double-click on the <filename>pom.xml</filename> file of your parent project in the <guilabel>Project Explorer</guilabel>.
</para>
<para>
In the <guilabel>Overview</guilabel> settings page that is now displayed in your workbench, confirm that the option <guibutton>Packaging</guibutton> is set to <guimenuitem>pom</guimenuitem>. If it is not, select <guimenuitem>pom</guimenuitem> from the list menu and save the changes to your <filename>pom.xml</filename> file.
@@ -115,7 +115,7 @@
Specify archetype parameters <guilabel>Group Id</guilabel> and <guilabel>Version</guilabel>. Ensure that the values you specify for these fields are unique from those set in the parent project.
</para>
<para>
- In this example, the <guilabel>Group Id</guilabel> and <guilabel>Version</guilabel> settings of the parent project used are set to <property>group_id</property> and <property>0.0.1-SNAPSHOT</property> respectively. For the module <guilabel>Group Id</guilabel> and <guilabel>Version</guilabel> settings are being specified as <property>sub_group_id</property> and <property>0.1.1-SNAPSHOT</property> respectively, to avoid conflict.
+ In this example, the <guilabel>Group Id</guilabel> and <guilabel>Version</guilabel> settings of the parent project used are set to <property>group_id</property> and <property>0.0.1-SNAPSHOT</property> respectively. For the module, <guilabel>Group Id</guilabel> and <guilabel>Version</guilabel> settings are being specified as <property>sub_group_id</property> and <property>0.1.1-SNAPSHOT</property> respectively, to avoid conflict.
</para>
<figure id="module_creation_07">
<title>Archetype parameter settings</title>
Modified: branches/jbosstools-3.3.x/maven/docs/reference/en-US/creating_a_maven_project.xml
===================================================================
--- branches/jbosstools-3.3.x/maven/docs/reference/en-US/creating_a_maven_project.xml 2012-06-20 23:09:21 UTC (rev 42125)
+++ branches/jbosstools-3.3.x/maven/docs/reference/en-US/creating_a_maven_project.xml 2012-06-20 23:22:36 UTC (rev 42126)
@@ -87,7 +87,7 @@
</mediaobject>
</figure>
<para>
- Clicking <guibutton>Finish</guibutton> will bring back to the workbench and your Maven project will appear in the <guilabel>Project Explorer</guilabel>.
+ Clicking <guibutton>Finish</guibutton> will bring you back to the workbench and your Maven project will appear in the <guilabel>Project Explorer</guilabel>.
</para>
<figure id="application_creation_06">
<title>Project in the Project Explorer</title>
13 years, 9 months
JBoss Tools SVN: r42125 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2012-06-20 19:09:21 -0400 (Wed, 20 Jun 2012)
New Revision: 42125
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProjectAsYouType.java
Log:
JBIDE-10611
https://issues.jboss.org/browse/JBIDE-10611
CDI Model for as-you-type with modified file is improved to find injected beans correctly - copy is created with modified set of all beans.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2012-06-20 23:06:12 UTC (rev 42124)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2012-06-20 23:09:21 UTC (rev 42125)
@@ -82,8 +82,9 @@
* @author Viacheslav Kabanovich
*
*/
-public class CDIProject extends CDIElement implements ICDIProject {
+public class CDIProject extends CDIElement implements ICDIProject, Cloneable {
CDICoreNature n;
+ private ICDIProject declaringProject = this;
private Map<String, StereotypeElement> stereotypes = new HashMap<String, StereotypeElement>();
private Map<IPath, StereotypeElement> stereotypesByPath = new HashMap<IPath, StereotypeElement>();
@@ -114,6 +115,25 @@
public CDIProject() {}
+ public CDIProject getModifiedCopy(IFile file, Set<IBean> beans) {
+ CDIProject p = null;
+ try {
+ p = (CDIProject)clone();
+ } catch (CloneNotSupportedException e) {
+ e.printStackTrace();
+ return null;
+ }
+ p.declaringProject = this;
+ p.allBeans = new HashSet<IBean>();
+ synchronized(this) {
+ p.allBeans.addAll(allBeans);
+ }
+ p.allBeans.removeAll(getBeans(file.getFullPath()));
+ p.allBeans.addAll(beans);
+
+ return p;
+ }
+
@Override
public CDICoreNature getNature() {
return n;
@@ -316,7 +336,7 @@
* @see org.jboss.tools.cdi.core.IBeanManager#getBeans(boolean, org.jboss.tools.cdi.core.IInjectionPoint)
*/
public Set<IBean> getBeans(boolean attemptToResolveAmbiguousDependency, IInjectionPoint injectionPoint) {
- if(injectionPoint.getDeclaringProject() != this) {
+ if(injectionPoint.getDeclaringProject() != getDeclaringProject()) {
return injectionPoint.getDeclaringProject().getBeans(attemptToResolveAmbiguousDependency, injectionPoint);
}
Set<IBean> result = new HashSet<IBean>();
@@ -1028,7 +1048,7 @@
@Override
public ICDIProject getDeclaringProject() {
- return this;
+ return declaringProject;
}
@Override
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProjectAsYouType.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProjectAsYouType.java 2012-06-20 23:06:12 UTC (rev 42124)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProjectAsYouType.java 2012-06-20 23:09:21 UTC (rev 42125)
@@ -25,6 +25,18 @@
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IPackageDeclaration;
import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
+import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor;
+import org.eclipse.jdt.ui.IWorkingCopyManager;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorReference;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.IBean;
@@ -49,6 +61,7 @@
import org.jboss.tools.cdi.internal.core.scanner.CDIBuilderDelegate;
import org.jboss.tools.cdi.internal.core.scanner.FileSet;
import org.jboss.tools.cdi.internal.core.scanner.ImplementationCollector;
+import org.jboss.tools.common.CommonPlugin;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.java.IJavaReference;
import org.jboss.tools.common.java.IParametedType;
@@ -77,13 +90,17 @@
} catch (CoreException e) {
CDICorePlugin.getDefault().logError(e);
}
+ CDIProject p = ((CDIProject)project).getModifiedCopy(file, beans);
+ if(p != null) {
+ this.project = p;
+ }
}
private void build() throws CoreException {
DefinitionContext context = project.getNature().getDefinitions().getCleanCopy();
FileSet fileSet = new FileSet();
if(file.getName().endsWith(".java")) {
- ICompilationUnit unit = EclipseUtil.getCompilationUnit(file);
+ ICompilationUnit unit = findCompilationUnit();// EclipseUtil.getCompilationUnit(file);
if(unit!=null) {
if(file.getName().equals("package-info.java")) {
IPackageDeclaration[] pkg = unit.getPackageDeclarations();
@@ -112,6 +129,48 @@
}
+ private ICompilationUnit findCompilationUnit() {
+ IWorkbench workbench = CommonPlugin.getDefault().getWorkbench();
+ if(workbench != null) {
+ IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
+ for (IWorkbenchWindow window: windows) {
+ if(window.getShell() != null) {
+ IWorkbenchPage[] pages = window.getPages();
+ for (IWorkbenchPage page: pages) {
+ IEditorReference[] rs = page.getEditorReferences();
+ for (IEditorReference r: rs) {
+ IEditorPart part = r.getEditor(false);
+ if(part != null) {
+ IFile file = getFile(part);
+ if(file != null && file.equals(this.file) && part instanceof CompilationUnitEditor) {
+ IWorkingCopyManager manager= JavaUI.getWorkingCopyManager();
+ ICompilationUnit unit= manager.getWorkingCopy(part.getEditorInput());
+ if(unit != null) {
+ try {
+ unit.reconcile(ICompilationUnit.NO_AST,
+ false /* don't force problem detection */,
+ null /* use primary owner */,
+ null /* no progress monitor */);
+ } catch (JavaModelException e) {
+ CDICorePlugin.getDefault().logError(e);
+ }
+ return unit;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ private IFile getFile(IEditorPart part) {
+ IEditorInput input = part.getEditorInput();
+ return (input instanceof IFileEditorInput) ? ((IFileEditorInput)input).getFile() : null;
+ }
+
synchronized void rebuildAnnotationTypes(List<AnnotationDefinition> ds) {
for (AnnotationDefinition d: ds) {
if(d.getResource() == null || !d.getResource().getFullPath().equals(file.getFullPath())) {
@@ -183,7 +242,7 @@
if(!typeDefinition.isVetoed()
//Type is defined in another project and modified/replaced in config in this (dependent) project
//We should reject type definition based on type, but we have to accept
- && (/*!vetoedTypes.contains(typeName) &&*/ getNature().getDefinitions().getTypeDefinition(typeName) == null && typeDefinition.getOriginalDefinition() == null)) {
+ && !(/*vetoedTypes.contains(typeName)*/false && getNature().getDefinitions().getTypeDefinition(typeName) == null && typeDefinition.getOriginalDefinition() == null)) {
if(typeDefinition.hasBeanConstructor()) {
beans.add(bean);
newClassBeans.put(typeDefinition.getType(), bean);
13 years, 9 months
JBoss Tools SVN: r42124 - branches/jbosstools-3.3.x/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-06-20 19:06:12 -0400 (Wed, 20 Jun 2012)
New Revision: 42124
Modified:
branches/jbosstools-3.3.x/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml
Log:
updated with fix from trunk
Modified: branches/jbosstools-3.3.x/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml
===================================================================
--- branches/jbosstools-3.3.x/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml 2012-06-20 23:04:34 UTC (rev 42123)
+++ branches/jbosstools-3.3.x/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml 2012-06-20 23:06:12 UTC (rev 42124)
@@ -13,7 +13,7 @@
<!-- JBDS-2212 -->
<varlistentry>
<term>
- <ulink url="https://issues.jboss.org/jira/browse/JBDS-2212">JBDS-2212<ulink>
+ <ulink url="https://issues.jboss.org/jira/browse/JBDS-2212">JBDS-2212</ulink>
</term>
<listitem>
<para>
13 years, 9 months
JBoss Tools SVN: r42123 - trunk/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-06-20 19:04:34 -0400 (Wed, 20 Jun 2012)
New Revision: 42123
Modified:
trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml
Log:
updated with files from trunk
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2012-06-20 23:04:21 UTC (rev 42122)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2012-06-20 23:04:34 UTC (rev 42123)
@@ -8,7 +8,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
<edition>5.0.0</edition>
- <pubsnumber>13</pubsnumber>
+ <pubsnumber>14</pubsnumber>
<abstract>
<para>
These release notes contain important information related to the JBoss Developer Studio. New features, known issues, resources, and other current issues are addressed here.
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml 2012-06-20 23:04:21 UTC (rev 42122)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml 2012-06-20 23:04:34 UTC (rev 42123)
@@ -9,7 +9,18 @@
<para>
Following is a list of known issues at the time of release.
</para>
- <variablelist>
+ <variablelist>
+ <!-- JBDS-2212 -->
+ <varlistentry>
+ <term>
+ <ulink url="https://issues.jboss.org/jira/browse/JBDS-2212">JBDS-2212<ulink>
+ </term>
+ <listitem>
+ <para>
+ Features of JBoss Developer Studio may show incorrect version numbers when viewing installation information. Under <menuchoice><guimenuitem>Help</guimenuitem><guimenuitem>About JBoss Developer Studio</guimenuitem><guimenuitem>Installation Details</guimenuitem><guimenuitem>Features</guimenuitem></menuchoice> some features will display a version number older than the previous release of JBoss Developer Studio. These numbers are incorrect and will be incremented correctly in the future.
+ </para>
+ </listitem>
+ </varlistentry>
<!-- JBDS-2180 -->
<varlistentry>
<term>
13 years, 9 months
JBoss Tools SVN: r42122 - branches/jbosstools-3.3.x/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-06-20 19:04:21 -0400 (Wed, 20 Jun 2012)
New Revision: 42122
Modified:
branches/jbosstools-3.3.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
branches/jbosstools-3.3.x/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml
Log:
updated with files from trunk
Modified: branches/jbosstools-3.3.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
===================================================================
--- branches/jbosstools-3.3.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2012-06-20 21:40:46 UTC (rev 42121)
+++ branches/jbosstools-3.3.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2012-06-20 23:04:21 UTC (rev 42122)
@@ -8,7 +8,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
<edition>5.0.0</edition>
- <pubsnumber>13</pubsnumber>
+ <pubsnumber>14</pubsnumber>
<abstract>
<para>
These release notes contain important information related to the JBoss Developer Studio. New features, known issues, resources, and other current issues are addressed here.
Modified: branches/jbosstools-3.3.x/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml
===================================================================
--- branches/jbosstools-3.3.x/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml 2012-06-20 21:40:46 UTC (rev 42121)
+++ branches/jbosstools-3.3.x/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml 2012-06-20 23:04:21 UTC (rev 42122)
@@ -9,7 +9,18 @@
<para>
Following is a list of known issues at the time of release.
</para>
- <variablelist>
+ <variablelist>
+ <!-- JBDS-2212 -->
+ <varlistentry>
+ <term>
+ <ulink url="https://issues.jboss.org/jira/browse/JBDS-2212">JBDS-2212<ulink>
+ </term>
+ <listitem>
+ <para>
+ Features of JBoss Developer Studio may show incorrect version numbers when viewing installation information. Under <menuchoice><guimenuitem>Help</guimenuitem><guimenuitem>About JBoss Developer Studio</guimenuitem><guimenuitem>Installation Details</guimenuitem><guimenuitem>Features</guimenuitem></menuchoice> some features will display a version number older than the previous release of JBoss Developer Studio. These numbers are incorrect and will be incremented correctly in the future.
+ </para>
+ </listitem>
+ </varlistentry>
<!-- JBDS-2180 -->
<varlistentry>
<term>
13 years, 9 months
JBoss Tools SVN: r42121 - branches/jbosstools-3.3.x.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-06-20 17:40:46 -0400 (Wed, 20 Jun 2012)
New Revision: 42121
Removed:
branches/jbosstools-3.3.x/5.0.0.GA.html
Log:
committed in wrong place; remove
Deleted: branches/jbosstools-3.3.x/5.0.0.GA.html
===================================================================
--- branches/jbosstools-3.3.x/5.0.0.GA.html 2012-06-20 21:38:54 UTC (rev 42120)
+++ branches/jbosstools-3.3.x/5.0.0.GA.html 2012-06-20 21:40:46 UTC (rev 42121)
@@ -1,153 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
- <head>
- <title>JBoss Developer Studio - Early Access - Build 5.0.0.v20120615-1714-H213-GA</title>
- <link href="https://devstudio.jboss.com/web/jbds_styles.css" rel="stylesheet" type="text/css">
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
- <!-- Google Analytics -->
- <script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-18653195-1']); // note, for Usage, use -2 suffix
- _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>
- <!-- Google Analytics -->
-
- <script type="text/javascript">
- <!--
- function toggle()
- {
- theImg=document.getElementById('screenshot');
- if (theImg.src.indexOf("540.png")>0)
- {
- theImg.src=theImg.src.replace("jbds-screenshot-browsersim-540.png","jbds-screenshot-browsersim.png");
- theImg.style.zIndex="1";
- theImg.style.position="absolute";
- theImg.style.top="-150px";
- theImg.style.left="-10px";
- }
- else
- {
- theImg.src=theImg.src.replace("jbds-screenshot-browsersim.png","jbds-screenshot-browsersim-540.png");
- theImg.style.zIndex="0";
- theImg.style.position="relative";
- theImg.style.top="0px";
- theImg.style.left="0px";
- }
- }
- -->
- </script>
- </head>
- <body>
-<div id="container">
- <div id="header">
- </div>
- <div id="content">
-
- <table width="100%">
- <tr>
- <td align="right"><small>
- <span style="font-size: x-small;">Build 5.0.0.v20120615-1714-H213-GA</span>
- </td>
- </tr>
- </table>
-
-<div class="rightsidebar" style="width:280px;padding-right:0px;padding-left:10px;z-index:-1;float:right">
- <h4>Installation :: Core Tooling</h4>
- <p style="width:260px;margin-right:15px">1. If you don't already have one installed, you will need to download and install Sun/Oracle JDK 6.0 or OpenJDK 6.0.</p>
- <p style="width:260px;margin-right:15px">2. Download the installer for your platform.</p>
- <p style="width:260px;margin-right:15px">3. Double-click the installer file to run it, or open a terminal and type <nobr><code>java -jar jbdevstudio-*.jar</code></nobr></p>
- <a href="http://www.redhat.com/promo/eap6beta/"><img src="https://devstudio.jboss.com/images/banner_JBEAP6beta.png" style="margin-left:-5px" border="0"/></a>
- <h4 style="padding-top:5px; margin-top:5px">Looking for EAP 6?</h4>
- <p style="width:260px;margin-right:15px"><a href="http://www.redhat.com/promo/eap6beta/">JBoss Enterprise Application Platform 6 Beta</a> is available now.
- <a href="http://www.redhat.com/promo/eap6beta/">Click here</a> for more information or to download your copy today!
- </li>
- </ol>
- </div>
-
-<h2 class="prime">JBoss Developer Studio 5.0 Early Access
-</h2>
-<br/>
- <p>We wish to give customers and users early access to Developer Studio so we can make the next version of JBoss Developer Studio an even better environment for
- developing on the JBoss Enterprise Platform. <a onClick="javascript: _gaq.push(['_trackPageview', this.href]);" href="readme.html">Click here for more information.</a></p>
-<p>
- Downloading anything from this site constitutes your agreement with the <a onClick="javascript: _gaq.push(['_trackPageview', this.href]);" href="readme.html">program terms</a>.</p>
-
-<div style="background-color:#eeeecc; width:580px;padding:10px;margin:0px;padding-top:0px;margin-top:0px;border:1px #aaaaaa solid;z-index:1;position:relative;float:left">
- <h2><a name="universal"></a>
- Download
- Latest Build: <span class="build">
- 5.0.0.GA
- </span></h2>
-
- <ul>
- <li class="multiplatform"><a onClick="javascript: _gaq.push(['_trackPageview', this.href]);" style="font-size: 18px;"
- href="https://devstudio.jboss.com/earlyaccess/builds/development/5.0.0.GA/jbdev...">Universal Multi-Platform Standalone</a><span class="multispec"> 385.24M (<a onClick="javascript: _gaq.push(['_trackPageview', this.href]);"
- href="https://devstudio.jboss.com/earlyaccess/builds/development/5.0.0.GA/jbdev...">MD5</a>)</li>
- <li class="multiplatform"><a onClick="javascript: _gaq.push(['_trackPageview', this.href]);" style="font-size: 18px;"
- href="https://devstudio.jboss.com/earlyaccess/builds/development/5.0.0.GA/jbdev...">Universal Multi-Platform EAP 6 Bundle</a><span class="multispec"> 494.72M (<a onClick="javascript: _gaq.push(['_trackPageview', this.href]);"
- href="https://devstudio.jboss.com/earlyaccess/builds/development/5.0.0.GA/jbdev...">MD5</a>)</li>
- <li class="note"><a name="64bnote"></a>The Visual Page Editor does not run on 64-bit Windows or Mac. While the source editor does work, visual editing & preview do not. If you require this, run the installer with a 32-bit JDK.</li>
- </ul>
-
- <p align="center"><a href="javascript:toggle()"><img border="0" id="screenshot" src="https://devstudio.jboss.com/images/jbds-screenshot-browsersim-540.png"/><br/><small>Click to enlarge</small></p>
-</div>
-<p style="clear:both"> </p>
-
-<hr/>
-
-
- <h2 class="prime">Other Downloads</h2>
-
- <h2>Sources</h2>
- <ul>
- <li class="multiplatform"><a onClick="javascript: _gaq.push(['_trackPageview', this.href]);"
- href="https://devstudio.jboss.com/earlyaccess/builds/development/5.0.0.GA/jbdev...">Sources Zip</a><span class="multispec"> 110.92M (<a onClick="javascript: _gaq.push(['_trackPageview', this.href]);"
- href="https://devstudio.jboss.com/earlyaccess/builds/development/5.0.0.GA/jbdev...">MD5</a>)</li>
- <li class="note"><a name="sourcesnote"></a>Does not include third-party code.</li>
- </ul>
-
- <h2>Update Site Zip</h2>
- <ul>
- <li class="multiplatform"><a onClick="javascript: _gaq.push(['_trackPageview', this.href]);"
- href="https://devstudio.jboss.com/earlyaccess/builds/development/5.0.0.GA/jbdev...">Update Site Zip</a><span class="multispec"> 372.28M (<a onClick="javascript: _gaq.push(['_trackPageview', this.href]);"
- href="https://devstudio.jboss.com/earlyaccess/builds/development/5.0.0.GA/jbdev...">MD5</a>)</li>
- <li class="note"><a name="sourcesnote"></a>Includes some third-party code.</li>
- </ul>
-
-</div>
-<p style="clear:both"> </p>
-
-<hr/>
- <h2>Release Notes</h2>
- <p>As this is an Early Access release, there are no release notes for JBoss Developer Studio yet available. However, the following link provides a list of issues closed in this release.
- Please note that documents pertaining to JBoss Tools may make mention of functionality not included or planned for inclusion in JBoss Developer Studio at this time.</p>
- <p>
- <ul>
- <li class="jirabug"><a href="https://issues.jboss.org/secure/IssueNavigator!executeAdvanced.jspa?jqlQu...'5.0.0.GA',+'3.3.0.GA')+and+Status+in+(Resolved,Closed)&runQuery=true&clear=true">JBoss Tools and Developer Studio - Resolved Issues</a> </li>
- <!--
- <li><a href="http://community.jboss.org/en/tools/blog/2011/12/23/jboss-tools-m5-is-com...">JBoss Tools - Release Announcement</a>
- </li>
- <li><a href="http://docs.jboss.org/tools/whatsnew/">JBoss Tools - New And Noteworthy</a>
- </li>
- <li><a href="http://sourceforge.net/projects/jboss/files/JBossTools/JBossTools3.3.0.x/...">JBoss Tools - Release Notes</a>
- </li>
--->
- </ul>
- </p>
- <h2>Feedback</h2>
- <p>The JBoss Developer Studio product team will directly assist
- with participant questions on a best effort basis at the
- <a href="https://community.jboss.org/community/jbossdevstudio?view=discussions">JBoss Developer Studio Community forum</a>.
- <p>We will then evaluate the feedback and if needed, we will report the issue in <a onClick="javascript: _gaq.push(['_trackPageview', this.href]);" href="https://jira.jboss.org/jira/secure/CreateIssue.jspa?pid=12310500&issuetype=1">JIRA</a>, then provide you a link to where the discussion can continue.</p>
- <h2>Thank you!</h2>
-
- </div>
- </div>
-</body>
-</html>
13 years, 9 months
JBoss Tools SVN: r42120 - branches/jbosstools-3.3.x.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-06-20 17:38:54 -0400 (Wed, 20 Jun 2012)
New Revision: 42120
Added:
branches/jbosstools-3.3.x/5.0.0.GA.html
Log:
new early access build - 5.0.0.GA
Added: branches/jbosstools-3.3.x/5.0.0.GA.html
===================================================================
--- branches/jbosstools-3.3.x/5.0.0.GA.html (rev 0)
+++ branches/jbosstools-3.3.x/5.0.0.GA.html 2012-06-20 21:38:54 UTC (rev 42120)
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+ <head>
+ <title>JBoss Developer Studio - Early Access - Build 5.0.0.v20120615-1714-H213-GA</title>
+ <link href="https://devstudio.jboss.com/web/jbds_styles.css" rel="stylesheet" type="text/css">
+ <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+ <!-- Google Analytics -->
+ <script type="text/javascript">
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-18653195-1']); // note, for Usage, use -2 suffix
+ _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>
+ <!-- Google Analytics -->
+
+ <script type="text/javascript">
+ <!--
+ function toggle()
+ {
+ theImg=document.getElementById('screenshot');
+ if (theImg.src.indexOf("540.png")>0)
+ {
+ theImg.src=theImg.src.replace("jbds-screenshot-browsersim-540.png","jbds-screenshot-browsersim.png");
+ theImg.style.zIndex="1";
+ theImg.style.position="absolute";
+ theImg.style.top="-150px";
+ theImg.style.left="-10px";
+ }
+ else
+ {
+ theImg.src=theImg.src.replace("jbds-screenshot-browsersim.png","jbds-screenshot-browsersim-540.png");
+ theImg.style.zIndex="0";
+ theImg.style.position="relative";
+ theImg.style.top="0px";
+ theImg.style.left="0px";
+ }
+ }
+ -->
+ </script>
+ </head>
+ <body>
+<div id="container">
+ <div id="header">
+ </div>
+ <div id="content">
+
+ <table width="100%">
+ <tr>
+ <td align="right"><small>
+ <span style="font-size: x-small;">Build 5.0.0.v20120615-1714-H213-GA</span>
+ </td>
+ </tr>
+ </table>
+
+<div class="rightsidebar" style="width:280px;padding-right:0px;padding-left:10px;z-index:-1;float:right">
+ <h4>Installation :: Core Tooling</h4>
+ <p style="width:260px;margin-right:15px">1. If you don't already have one installed, you will need to download and install Sun/Oracle JDK 6.0 or OpenJDK 6.0.</p>
+ <p style="width:260px;margin-right:15px">2. Download the installer for your platform.</p>
+ <p style="width:260px;margin-right:15px">3. Double-click the installer file to run it, or open a terminal and type <nobr><code>java -jar jbdevstudio-*.jar</code></nobr></p>
+ <a href="http://www.redhat.com/promo/eap6beta/"><img src="https://devstudio.jboss.com/images/banner_JBEAP6beta.png" style="margin-left:-5px" border="0"/></a>
+ <h4 style="padding-top:5px; margin-top:5px">Looking for EAP 6?</h4>
+ <p style="width:260px;margin-right:15px"><a href="http://www.redhat.com/promo/eap6beta/">JBoss Enterprise Application Platform 6 Beta</a> is available now.
+ <a href="http://www.redhat.com/promo/eap6beta/">Click here</a> for more information or to download your copy today!
+ </li>
+ </ol>
+ </div>
+
+<h2 class="prime">JBoss Developer Studio 5.0 Early Access
+</h2>
+<br/>
+ <p>We wish to give customers and users early access to Developer Studio so we can make the next version of JBoss Developer Studio an even better environment for
+ developing on the JBoss Enterprise Platform. <a onClick="javascript: _gaq.push(['_trackPageview', this.href]);" href="readme.html">Click here for more information.</a></p>
+<p>
+ Downloading anything from this site constitutes your agreement with the <a onClick="javascript: _gaq.push(['_trackPageview', this.href]);" href="readme.html">program terms</a>.</p>
+
+<div style="background-color:#eeeecc; width:580px;padding:10px;margin:0px;padding-top:0px;margin-top:0px;border:1px #aaaaaa solid;z-index:1;position:relative;float:left">
+ <h2><a name="universal"></a>
+ Download
+ Latest Build: <span class="build">
+ 5.0.0.GA
+ </span></h2>
+
+ <ul>
+ <li class="multiplatform"><a onClick="javascript: _gaq.push(['_trackPageview', this.href]);" style="font-size: 18px;"
+ href="https://devstudio.jboss.com/earlyaccess/builds/development/5.0.0.GA/jbdev...">Universal Multi-Platform Standalone</a><span class="multispec"> 385.24M (<a onClick="javascript: _gaq.push(['_trackPageview', this.href]);"
+ href="https://devstudio.jboss.com/earlyaccess/builds/development/5.0.0.GA/jbdev...">MD5</a>)</li>
+ <li class="multiplatform"><a onClick="javascript: _gaq.push(['_trackPageview', this.href]);" style="font-size: 18px;"
+ href="https://devstudio.jboss.com/earlyaccess/builds/development/5.0.0.GA/jbdev...">Universal Multi-Platform EAP 6 Bundle</a><span class="multispec"> 494.72M (<a onClick="javascript: _gaq.push(['_trackPageview', this.href]);"
+ href="https://devstudio.jboss.com/earlyaccess/builds/development/5.0.0.GA/jbdev...">MD5</a>)</li>
+ <li class="note"><a name="64bnote"></a>The Visual Page Editor does not run on 64-bit Windows or Mac. While the source editor does work, visual editing & preview do not. If you require this, run the installer with a 32-bit JDK.</li>
+ </ul>
+
+ <p align="center"><a href="javascript:toggle()"><img border="0" id="screenshot" src="https://devstudio.jboss.com/images/jbds-screenshot-browsersim-540.png"/><br/><small>Click to enlarge</small></p>
+</div>
+<p style="clear:both"> </p>
+
+<hr/>
+
+
+ <h2 class="prime">Other Downloads</h2>
+
+ <h2>Sources</h2>
+ <ul>
+ <li class="multiplatform"><a onClick="javascript: _gaq.push(['_trackPageview', this.href]);"
+ href="https://devstudio.jboss.com/earlyaccess/builds/development/5.0.0.GA/jbdev...">Sources Zip</a><span class="multispec"> 110.92M (<a onClick="javascript: _gaq.push(['_trackPageview', this.href]);"
+ href="https://devstudio.jboss.com/earlyaccess/builds/development/5.0.0.GA/jbdev...">MD5</a>)</li>
+ <li class="note"><a name="sourcesnote"></a>Does not include third-party code.</li>
+ </ul>
+
+ <h2>Update Site Zip</h2>
+ <ul>
+ <li class="multiplatform"><a onClick="javascript: _gaq.push(['_trackPageview', this.href]);"
+ href="https://devstudio.jboss.com/earlyaccess/builds/development/5.0.0.GA/jbdev...">Update Site Zip</a><span class="multispec"> 372.28M (<a onClick="javascript: _gaq.push(['_trackPageview', this.href]);"
+ href="https://devstudio.jboss.com/earlyaccess/builds/development/5.0.0.GA/jbdev...">MD5</a>)</li>
+ <li class="note"><a name="sourcesnote"></a>Includes some third-party code.</li>
+ </ul>
+
+</div>
+<p style="clear:both"> </p>
+
+<hr/>
+ <h2>Release Notes</h2>
+ <p>As this is an Early Access release, there are no release notes for JBoss Developer Studio yet available. However, the following link provides a list of issues closed in this release.
+ Please note that documents pertaining to JBoss Tools may make mention of functionality not included or planned for inclusion in JBoss Developer Studio at this time.</p>
+ <p>
+ <ul>
+ <li class="jirabug"><a href="https://issues.jboss.org/secure/IssueNavigator!executeAdvanced.jspa?jqlQu...'5.0.0.GA',+'3.3.0.GA')+and+Status+in+(Resolved,Closed)&runQuery=true&clear=true">JBoss Tools and Developer Studio - Resolved Issues</a> </li>
+ <!--
+ <li><a href="http://community.jboss.org/en/tools/blog/2011/12/23/jboss-tools-m5-is-com...">JBoss Tools - Release Announcement</a>
+ </li>
+ <li><a href="http://docs.jboss.org/tools/whatsnew/">JBoss Tools - New And Noteworthy</a>
+ </li>
+ <li><a href="http://sourceforge.net/projects/jboss/files/JBossTools/JBossTools3.3.0.x/...">JBoss Tools - Release Notes</a>
+ </li>
+-->
+ </ul>
+ </p>
+ <h2>Feedback</h2>
+ <p>The JBoss Developer Studio product team will directly assist
+ with participant questions on a best effort basis at the
+ <a href="https://community.jboss.org/community/jbossdevstudio?view=discussions">JBoss Developer Studio Community forum</a>.
+ <p>We will then evaluate the feedback and if needed, we will report the issue in <a onClick="javascript: _gaq.push(['_trackPageview', this.href]);" href="https://jira.jboss.org/jira/secure/CreateIssue.jspa?pid=12310500&issuetype=1">JIRA</a>, then provide you a link to where the discussion can continue.</p>
+ <h2>Thank you!</h2>
+
+ </div>
+ </div>
+</body>
+</html>
13 years, 9 months
JBoss Tools SVN: r42119 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2012-06-20 16:30:33 -0400 (Wed, 20 Jun 2012)
New Revision: 42119
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
Log:
Seam test project is not generated even if the proper option is checked https://issues.jboss.org/browse/JBIDE-12186
EJB and EAR projects are not generated when proper option is checked https://issues.jboss.org/browse/JBIDE-12184
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2012-06-20 19:50:22 UTC (rev 42118)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2012-06-20 20:30:33 UTC (rev 42119)
@@ -32,6 +32,7 @@
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
+import org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -78,6 +79,7 @@
import org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDataModelProvider;
import org.jboss.tools.seam.internal.core.project.facet.SeamValidatorFactory;
import org.jboss.tools.seam.ui.wizard.SeamFormWizard;
+import org.jboss.tools.seam.ui.wizard.SeamProjectWizard;
import org.jboss.tools.seam.ui.wizard.SeamWizardFactory;
import org.jboss.tools.seam.ui.wizard.SeamWizardUtils;
@@ -125,7 +127,7 @@
Arrays.asList(new Object[] {
ISeamFacetDataModelProperties.DEPLOY_AS_WAR,
ISeamFacetDataModelProperties.DEPLOY_AS_EAR }),
- getDeployAsDefaultValue());
+ ISeamFacetDataModelProperties.DEPLOY_AS_WAR);
// Database group
private IFieldEditor connProfileSelEditor;
@@ -197,7 +199,7 @@
private Object getDeployAsDefaultValue() {
String result = SeamProjectPreferences
.getStringPreference(SeamProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS);
- if (!isNewProjectWizard()) {
+ if (!isSeamProjectWizard()) {
ISelection sel = PlatformUI.getWorkbench()
.getActiveWorkbenchWindow().getSelectionService()
.getSelection();
@@ -315,9 +317,10 @@
SeamProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS,
this.jBossAsDeployAsEditor.getValueAsString());
- model.setBooleanProperty(ISeamFacetDataModelProperties.SEAM_TEMPLATES_AND_LIBRARIES_COPYING, isNewProjectWizard());
+ model.setBooleanProperty(ISeamFacetDataModelProperties.SEAM_TEMPLATES_AND_LIBRARIES_COPYING, isSeamProjectWizard() || isWebProjectWizard());
- model.setBooleanProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_LIBRARIES_COPYING, libraryListEditor.getValueAsString().equals(SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_COPY_LIBRARIES) && isNewProjectWizard());
+ model.setBooleanProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_LIBRARIES_COPYING,
+ libraryListEditor.getValueAsString().equals(SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_COPY_LIBRARIES) && (isSeamProjectWizard() || isWebProjectWizard()));
}
/*
@@ -419,11 +422,14 @@
}
});
+ Object deployAs = getDeployAsDefaultValue();
+ jBossAsDeployAsEditor.setValue(deployAs);
+
registerEditor(jBossAsDeployAsEditor, generalGroup, 3);
registerEditor(ejbProjectNameditor, generalGroup, 3);
- ejbProjectNameditor.setEnabled(getDeployAsDefaultValue().equals(ISeamFacetDataModelProperties.DEPLOY_AS_EAR));
+ ejbProjectNameditor.setEnabled(deployAs.equals(ISeamFacetDataModelProperties.DEPLOY_AS_EAR));
registerEditor(earProjectNameditor, generalGroup, 3);
- earProjectNameditor.setEnabled(getDeployAsDefaultValue().equals(ISeamFacetDataModelProperties.DEPLOY_AS_EAR));
+ earProjectNameditor.setEnabled(deployAs.equals(ISeamFacetDataModelProperties.DEPLOY_AS_EAR));
List<String> providers = new ArrayList<String>();
providers.add(SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_COPY_LIBRARIES);
@@ -440,8 +446,10 @@
jBossAsDeployAsEditor.addPropertyChangeListener(new PropertyChangeListener(){
public void propertyChange(PropertyChangeEvent arg0) {
Boolean value = jBossAsDeployAsEditor.getValue() == ISeamFacetDataModelProperties.DEPLOY_AS_EAR;
- ejbProjectNameditor.setEnabled(value.booleanValue());
- earProjectNameditor.setEnabled(value.booleanValue());
+ if(!isWebProjectWizard()){
+ ejbProjectNameditor.setEnabled(value.booleanValue());
+ earProjectNameditor.setEnabled(value.booleanValue());
+ }
}
});
@@ -493,13 +501,24 @@
registerEditor(testProjectNameditor, generationGroup, 3);
registerEditor(testsPkgNameditor, generationGroup, 3);
- if(!isNewProjectWizard()){
+ if(!isSeamProjectWizard()){
createTestProjectCheckboxeditor.setValue(false);
createTestProjectCheckboxeditor.setEnabled(false);
testProjectNameditor.setEnabled(false);
testsPkgNameditor.setEnabled(false);
+ if(!isWebProjectWizard()){
+ libraryListEditor.setValue(providers.get(1));
+ libraryListEditor.setEnabled(false);
+ }
}
+ if(isWebProjectWizard()){
+ ejbProjectNameditor.setValue("");
+ ejbProjectNameditor.setEnabled(false);
+ earProjectNameditor.setValue("");
+ earProjectNameditor.setEnabled(false);
+ }
+
setControl(root);
if (validatorDelegate == null) {
@@ -517,7 +536,7 @@
validatorDelegate.addValidatorForProperty(sessionBeanPkgNameditor
.getName(), new PackageNameValidator(
sessionBeanPkgNameditor.getName(), "session beans")); //$NON-NLS-1$
- if (isNewProjectWizard()) {
+ if (isSeamProjectWizard()) {
validatorDelegate.addValidatorForProperty(
IFacetDataModelProperties.FACET_PROJECT_NAME,
new ProjectNamesDuplicationValidator(
@@ -629,11 +648,17 @@
}
}
- private boolean isNewProjectWizard() {
- // ModifyFacetedProjectWizard or NewProjectDataModelFacetWizard
- return getWizard() == null
- || getWizard() instanceof NewProjectDataModelFacetWizard;
+ private boolean isSeamProjectWizard() {
+ return getWizard() instanceof SeamProjectWizard;
}
+
+ private boolean isWebProjectWizard(){
+ IWizard wizard = getWizard();
+ if(wizard != null){
+ return wizard.getClass().equals(WebProjectWizard.class);
+ }
+ return false;
+ }
/**
*
@@ -654,8 +679,10 @@
sessionBeanPkgNameditor.setValue(getSessionPkgName(seamProjectName));
entityBeanPkgNameditor.setValue(getEntityPkgName(seamProjectName));
testsPkgNameditor.setValue(getTestPkgName(seamProjectName));
- ejbProjectNameditor.setValue(getEJBProjectName(seamProjectName));
- earProjectNameditor.setValue(getEARProjectName(seamProjectName));
+ if(!isWebProjectWizard()){
+ ejbProjectNameditor.setValue(getEJBProjectName(seamProjectName));
+ earProjectNameditor.setValue(getEARProjectName(seamProjectName));
+ }
testProjectNameditor.setValue(getTestProjectName(seamProjectName));
model.setStringProperty(
@@ -733,11 +760,13 @@
if("".equals(testsPkgNameditor.getValueAsString()))
testsPkgNameditor.setValue(getTestPkgName(seamProjectName));
- if("".equals(ejbProjectNameditor.getValueAsString()))
- ejbProjectNameditor.setValue(getEJBProjectName(seamProjectName));
+ if(!isWebProjectWizard()){
+ if("".equals(ejbProjectNameditor.getValueAsString()))
+ ejbProjectNameditor.setValue(getEJBProjectName(seamProjectName));
- if("".equals(earProjectNameditor.getValueAsString()))
- earProjectNameditor.setValue(getEARProjectName(seamProjectName));
+ if("".equals(earProjectNameditor.getValueAsString()))
+ earProjectNameditor.setValue(getEARProjectName(seamProjectName));
+ }
if("".equals(testProjectNameditor.getValueAsString()))
testProjectNameditor.setValue(getTestProjectName(seamProjectName));
@@ -852,13 +881,15 @@
}
private boolean canTestProjectBeCreated() {
- String seamRuntimeName = jBossSeamHomeEditor.getValueAsString();
- SeamRuntime seamRuntime = SeamRuntimeManager.getInstance().findRuntimeByName(seamRuntimeName);
- if (seamRuntime != null) {
- // bootstrap folder was removed in Seam 2.3.0.Beta1 from WFK 2.0 ER4
- // See https://issues.jboss.org/browse/JBIDE-11611
- File bootstrap = new File(seamRuntime.getHomeDir(), "bootstrap");
- return bootstrap.exists();
+ if(isSeamProjectWizard()){
+ String seamRuntimeName = jBossSeamHomeEditor.getValueAsString();
+ SeamRuntime seamRuntime = SeamRuntimeManager.getInstance().findRuntimeByName(seamRuntimeName);
+ if (seamRuntime != null) {
+ // bootstrap folder was removed in Seam 2.3.0.Beta1 from WFK 2.0 ER4
+ // See https://issues.jboss.org/browse/JBIDE-11611
+ File bootstrap = new File(seamRuntime.getHomeDir(), "bootstrap");
+ return bootstrap.exists();
+ }
}
return false;
}
@@ -901,7 +932,7 @@
}
}
- if (ISeamFacetDataModelProperties.DEPLOY_AS_EAR.equals(deployAs)) {
+ if (ISeamFacetDataModelProperties.DEPLOY_AS_EAR.equals(deployAs) && !isWebProjectWizard()) {
final String earProjectName = earProjectNameditor.getValueAsString();
status = ProjectCreationDataModelProviderNew
.validateName(earProjectName);
13 years, 9 months
JBoss Tools SVN: r42118 - tags.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-06-20 15:50:22 -0400 (Wed, 20 Jun 2012)
New Revision: 42118
Added:
tags/jbosstools-3.3.0.Final/
Log:
tag revision 42011 as 3.3.0.Final
13 years, 9 months