JBoss Tools SVN: r32670 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/actions/xpl.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-07-06 17:00:20 -0400 (Wed, 06 Jul 2011)
New Revision: 32670
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/actions/xpl/SelectAnnotationRulerAction.java
Log:
https://issues.jboss.org/browse/JBIDE-9209
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/actions/xpl/SelectAnnotationRulerAction.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/actions/xpl/SelectAnnotationRulerAction.java 2011-07-06 18:05:31 UTC (rev 32669)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/actions/xpl/SelectAnnotationRulerAction.java 2011-07-06 21:00:20 UTC (rev 32670)
@@ -64,6 +64,9 @@
@Override
public void update() {
+ if(fTextEditor.getDocumentProvider() == null)
+ return;
+
findAnnotation();
setEnabled(true);
if (fHasCorrection) {
14 years, 5 months
JBoss Tools SVN: r32669 - in trunk: seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-07-06 14:05:31 -0400 (Wed, 06 Jul 2011)
New Revision: 32669
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddNewSeamRuntimeMarkerResolution.java
Log:
https://issues.jboss.org/browse/JBIDE-9209
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java 2011-07-06 17:57:44 UTC (rev 32668)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java 2011-07-06 18:05:31 UTC (rev 32669)
@@ -121,7 +121,7 @@
}
public String getDescription() {
- return null;
+ return label;
}
public Image getImage() {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java 2011-07-06 17:57:44 UTC (rev 32668)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java 2011-07-06 18:05:31 UTC (rev 32669)
@@ -64,7 +64,7 @@
@Override
public String getDescription() {
- return null;
+ return label;
}
@Override
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java 2011-07-06 17:57:44 UTC (rev 32668)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java 2011-07-06 18:05:31 UTC (rev 32669)
@@ -54,7 +54,7 @@
}
public String getDescription() {
- return null;
+ return label;
}
public Image getImage() {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java 2011-07-06 17:57:44 UTC (rev 32668)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java 2011-07-06 18:05:31 UTC (rev 32669)
@@ -64,7 +64,7 @@
}
public String getDescription() {
- return null;
+ return label;
}
public Image getImage() {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2011-07-06 17:57:44 UTC (rev 32668)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2011-07-06 18:05:31 UTC (rev 32669)
@@ -140,7 +140,7 @@
@Override
public String getDescription() {
- return null;
+ return label;
}
@Override
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java 2011-07-06 17:57:44 UTC (rev 32668)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java 2011-07-06 18:05:31 UTC (rev 32669)
@@ -93,7 +93,7 @@
@Override
public String getDescription() {
- return null;
+ return label;
}
@Override
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java 2011-07-06 17:57:44 UTC (rev 32668)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java 2011-07-06 18:05:31 UTC (rev 32669)
@@ -86,7 +86,7 @@
}
public String getDescription() {
- return null;
+ return label;
}
public Image getImage() {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2011-07-06 17:57:44 UTC (rev 32668)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2011-07-06 18:05:31 UTC (rev 32669)
@@ -131,7 +131,7 @@
public String getDescription() {
- return null;
+ return label;
}
public Image getImage() {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java 2011-07-06 17:57:44 UTC (rev 32668)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java 2011-07-06 18:05:31 UTC (rev 32669)
@@ -141,7 +141,7 @@
public String getDescription() {
- return null;
+ return label;
}
public Image getImage() {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java 2011-07-06 17:57:44 UTC (rev 32668)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java 2011-07-06 18:05:31 UTC (rev 32669)
@@ -85,7 +85,7 @@
}
public String getDescription() {
- return null;
+ return label;
}
public Image getImage() {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2011-07-06 17:57:44 UTC (rev 32668)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2011-07-06 18:05:31 UTC (rev 32669)
@@ -114,7 +114,7 @@
}
public String getDescription() {
- return null;
+ return label;
}
public Image getImage() {
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java 2011-07-06 17:57:44 UTC (rev 32668)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java 2011-07-06 18:05:31 UTC (rev 32669)
@@ -261,7 +261,7 @@
}
public String getDescription() {
- return null;
+ return label;
}
public Image getImage() {
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddNewSeamRuntimeMarkerResolution.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddNewSeamRuntimeMarkerResolution.java 2011-07-06 17:57:44 UTC (rev 32668)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddNewSeamRuntimeMarkerResolution.java 2011-07-06 18:05:31 UTC (rev 32669)
@@ -96,7 +96,7 @@
}
public String getDescription() {
- return null;
+ return label;
}
public Image getImage() {
14 years, 5 months
JBoss Tools SVN: r32668 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-07-06 13:57:44 -0400 (Wed, 06 Jul 2011)
New Revision: 32668
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2CompositeAttrsProposal.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2CompositeComponentProposal.java
Log:
https://issues.jboss.org/browse/JBIDE-9209
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2CompositeAttrsProposal.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2CompositeAttrsProposal.java 2011-07-06 17:43:42 UTC (rev 32667)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2CompositeAttrsProposal.java 2011-07-06 17:57:44 UTC (rev 32668)
@@ -21,7 +21,9 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IMarkerResolution;
+import org.eclipse.ui.IMarkerResolution2;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.ide.IDE;
import org.jboss.tools.jsf.JSFModelPlugin;
@@ -36,7 +38,7 @@
*
*/
-public class JSF2CompositeAttrsProposal implements IMarkerResolution {
+public class JSF2CompositeAttrsProposal implements IMarkerResolution2 {
private IResource resource;
private String componentPath = null;
private String[] attrs = null;
@@ -72,4 +74,14 @@
}
}
+ @Override
+ public String getDescription() {
+ return getLabel();
+ }
+
+ @Override
+ public Image getImage() {
+ return null;
+ }
+
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2CompositeComponentProposal.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2CompositeComponentProposal.java 2011-07-06 17:43:42 UTC (rev 32667)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2CompositeComponentProposal.java 2011-07-06 17:57:44 UTC (rev 32668)
@@ -20,7 +20,9 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IMarkerResolution;
+import org.eclipse.ui.IMarkerResolution2;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.ide.IDE;
import org.jboss.tools.jsf.JSFModelPlugin;
@@ -33,7 +35,7 @@
*
*/
-public class JSF2CompositeComponentProposal implements IMarkerResolution {
+public class JSF2CompositeComponentProposal implements IMarkerResolution2 {
private IResource resource;
private String componentPath = null;
private String[] attrs = null;
@@ -67,4 +69,14 @@
}
}
+ @Override
+ public String getDescription() {
+ return getLabel();
+ }
+
+ @Override
+ public Image getImage() {
+ return null;
+ }
+
}
14 years, 5 months
JBoss Tools SVN: r32667 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-07-06 13:43:42 -0400 (Wed, 06 Jul 2011)
New Revision: 32667
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddSetterMarkerResolution.java
Log:
https://issues.jboss.org/browse/JBIDE-9209
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddSetterMarkerResolution.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddSetterMarkerResolution.java 2011-07-06 17:35:11 UTC (rev 32666)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddSetterMarkerResolution.java 2011-07-06 17:43:42 UTC (rev 32667)
@@ -131,7 +131,7 @@
}
public String getDescription() {
- return null;
+ return label;
}
public Image getImage() {
14 years, 5 months
JBoss Tools SVN: r32666 - in trunk/forge: plugins and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-07-06 13:35:11 -0400 (Wed, 06 Jul 2011)
New Revision: 32666
Modified:
trunk/forge/plugins/org.jboss.tools.forge.core/pom.xml
trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml
trunk/forge/plugins/org.jboss.tools.forge.ui/pom.xml
trunk/forge/plugins/pom.xml
trunk/forge/pom.xml
Log:
this commit fixes continuous build problems with resolving forge.core plugin. it also contains fix for forge/plugins groupId which is changed from forge.plugins to just plugins to conform with other modules.
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/pom.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/pom.xml 2011-07-06 16:49:40 UTC (rev 32665)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/pom.xml 2011-07-06 17:35:11 UTC (rev 32666)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools.forge</groupId>
- <artifactId>forge.plugins</artifactId>
+ <artifactId>plugins</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.forge.plugins</groupId>
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml 2011-07-06 16:49:40 UTC (rev 32665)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml 2011-07-06 17:35:11 UTC (rev 32666)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools.forge</groupId>
- <artifactId>forge.plugins</artifactId>
+ <artifactId>plugins</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.forge.plugins</groupId>
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/pom.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/pom.xml 2011-07-06 16:49:40 UTC (rev 32665)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/pom.xml 2011-07-06 17:35:11 UTC (rev 32666)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools.forge</groupId>
- <artifactId>forge.plugins</artifactId>
+ <artifactId>plugins</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.forge.plugins</groupId>
Modified: trunk/forge/plugins/pom.xml
===================================================================
--- trunk/forge/plugins/pom.xml 2011-07-06 16:49:40 UTC (rev 32665)
+++ trunk/forge/plugins/pom.xml 2011-07-06 17:35:11 UTC (rev 32666)
@@ -8,13 +8,14 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.forge</groupId>
- <artifactId>forge.plugins</artifactId>
+ <artifactId>plugins</artifactId>
<name>forge.plugins</name>
<packaging>pom</packaging>
<modules>
- <module>org.jboss.tools.forge.runtime</module>
- <module>org.jboss.tools.forge.ui</module>
+ <module>org.jboss.tools.forge.core</module>
+ <module>org.jboss.tools.forge.runtime</module>
+ <module>org.jboss.tools.forge.ui</module>
</modules>
</project>
Modified: trunk/forge/pom.xml
===================================================================
--- trunk/forge/pom.xml 2011-07-06 16:49:40 UTC (rev 32665)
+++ trunk/forge/pom.xml 2011-07-06 17:35:11 UTC (rev 32666)
@@ -11,7 +11,7 @@
<groupId>org.jboss.tools</groupId>
<artifactId>forge</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <name>forge.all</name>
+ <name>forge.all</name>
<packaging>pom</packaging>
<modules>
<module>features</module>
14 years, 5 months
JBoss Tools SVN: r32665 - trunk/as.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-07-06 12:49:40 -0400 (Wed, 06 Jul 2011)
New Revision: 32665
Modified:
trunk/as/pom.xml
Log:
parent pom relativePath restored
Modified: trunk/as/pom.xml
===================================================================
--- trunk/as/pom.xml 2011-07-06 16:25:11 UTC (rev 32664)
+++ trunk/as/pom.xml 2011-07-06 16:49:40 UTC (rev 32665)
@@ -5,6 +5,7 @@
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.2-SNAPSHOT</version>
+ <relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>as</artifactId>
14 years, 5 months
JBoss Tools SVN: r32664 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: projects/TwoWebContentFolders and 14 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-06 12:25:11 -0400 (Wed, 06 Jul 2011)
New Revision: 32664
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.classpath
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.project
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/.jsdtscope
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.jdt.core.prefs
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.common.component
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/META-INF/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/beans.xml
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/cdi-api.jar
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/javax.inject.jar
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/jboss-interceptor-api.jar
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/seam-config-xml.jar
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/web.xml
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/META-INF/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/lib/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/seam-beans.xml
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/web.xml
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/build/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/build/classes/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/build/classes/test/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/build/classes/test/AlternativeBean.class
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/build/classes/test/BeanA.class
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/BeanA.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
Log:
JBIDE-9289
https://issues.jboss.org/browse/JBIDE-9289
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.classpath
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.classpath (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.classpath 2011-07-06 16:25:11 UTC (rev 32664)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_21">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.web"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.project
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.project (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.project 2011-07-06 16:25:11 UTC (rev 32664)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>TwoWebContentFolders</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.cdi.core.cdibuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ <nature>org.jboss.tools.cdi.core.cdinature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/.jsdtscope
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/.jsdtscope (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/.jsdtscope 2011-07-06 16:25:11 UTC (rev 32664)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.jdt.core.prefs 2011-07-06 16:25:11 UTC (rev 32664)
@@ -0,0 +1,8 @@
+#Tue Jul 05 11:41:26 PDT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.common.component 2011-07-06 16:25:11 UTC (rev 32664)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="TwoWebContentFolders">
+ <wb-resource deploy-path="/" source-path="/WebContent"/>
+ <wb-resource deploy-path="/" source-path="/WebContent2"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+ <property name="context-root" value="TwoWebContentFolders"/>
+ <property name="java-output-path" value="/TwoWebContentFolders/build/classes"/>
+ </wb-module>
+</project-modules>
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-07-06 16:25:11 UTC (rev 32664)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="Apache Tomcat v6.0"/>
+ <fixed facet="wst.jsdt.web"/>
+ <fixed facet="jst.web"/>
+ <fixed facet="java"/>
+ <installed facet="java" version="1.6"/>
+ <installed facet="jst.web" version="2.5"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-07-06 16:25:11 UTC (rev 32664)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-07-06 16:25:11 UTC (rev 32664)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/META-INF/MANIFEST.MF 2011-07-06 16:25:11 UTC (rev 32664)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/beans.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/beans.xml (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/beans.xml 2011-07-06 16:25:11 UTC (rev 32664)
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd">
+<alternatives>
+ <class>test.AlternativeBean</class>
+</alternatives>
+</beans>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/beans.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/cdi-api.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/cdi-api.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/javax.inject.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/javax.inject.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/jboss-interceptor-api.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/jboss-interceptor-api.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/seam-config-xml.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/seam-config-xml.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/web.xml (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/web.xml 2011-07-06 16:25:11 UTC (rev 32664)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
+ <display-name>TwoWebContentFolders</display-name>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/web.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/META-INF/MANIFEST.MF (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/META-INF/MANIFEST.MF 2011-07-06 16:25:11 UTC (rev 32664)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/seam-beans.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/seam-beans.xml (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/seam-beans.xml 2011-07-06 16:25:11 UTC (rev 32664)
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:s="urn:java:ee"
+ xmlns:test="urn:java:test"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd">
+
+<test:BeanA>
+ <s:Named>myBeanA</s:Named>
+</test:BeanA>
+
+</beans>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/seam-beans.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/web.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/web.xml (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/web.xml 2011-07-06 16:25:11 UTC (rev 32664)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
+ <display-name>TwoWebContentFolders</display-name>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/web.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/build/classes/test/AlternativeBean.class
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/build/classes/test/AlternativeBean.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/build/classes/test/BeanA.class
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/build/classes/test/BeanA.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean.java 2011-07-06 16:25:11 UTC (rev 32664)
@@ -0,0 +1,8 @@
+package test;
+
+import javax.enterprise.inject.Alternative;
+
+@Alternative
+public class AlternativeBean {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/BeanA.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/BeanA.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/BeanA.java 2011-07-06 16:25:11 UTC (rev 32664)
@@ -0,0 +1,10 @@
+package test;
+
+public class BeanA {
+ String s = "#{myBeanA.s}";
+
+ public String getS() {
+ return s;
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/BeanA.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-07-06 16:19:13 UTC (rev 32663)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-07-06 16:25:11 UTC (rev 32664)
@@ -99,6 +99,7 @@
suite.addTestSuite(CoreValidationTest.class);
suite.addTestSuite(ELValidationTest.class);
+ suiteAll.addTestSuite(TwoWebContentFoldersTest.class);
suiteAll.addTestSuite(RemoveJarFromClasspathTest.class);
suiteAll.addTestSuite(ExtensionFactoryTest.class);
suiteAll.addTestSuite(ExtensionManagerTest.class);
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java 2011-07-06 16:25:11 UTC (rev 32664)
@@ -0,0 +1,54 @@
+package org.jboss.tools.cdi.core.test;
+
+import java.io.IOException;
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+/**
+ *
+ * @author V.Kabanovich
+ *
+ */
+public class TwoWebContentFoldersTest extends TestCase {
+ protected static String PLUGIN_ID = "org.jboss.tools.cdi.core.test";
+ IProject project = null;
+
+ public TwoWebContentFoldersTest() {}
+
+ public void setUp() throws Exception {
+ project = ResourcesUtils.importProject(PLUGIN_ID, "/projects/TwoWebContentFolders");
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ JobUtils.waitForIdle();
+ }
+
+ public void testBeansXML() throws CoreException, IOException {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(project, true);
+ Set<IBean> bs = cdi.getBeans("myBeanA", false);
+ assertEquals(1, bs.size());
+ }
+
+ public void tearDown() throws Exception {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ JobUtils.waitForIdle();
+ project.delete(true, true, null);
+ JobUtils.waitForIdle();
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 5 months
JBoss Tools SVN: r32663 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-06 12:19:13 -0400 (Wed, 06 Jul 2011)
New Revision: 32663
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java
Log:
[JBIDE-9215] added @Override to interface method #getBehaviourTypeId
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-06 16:15:49 UTC (rev 32662)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-06 16:19:13 UTC (rev 32663)
@@ -30,6 +30,8 @@
public class RSEBehaviourDelegate extends AbstractJBossBehaviourDelegate {
private PollThread pollThread = null;
+
+ @Override
public String getBehaviourTypeId() {
return RSEPublishMethod.RSE_ID;
}
14 years, 5 months
JBoss Tools SVN: r32662 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-06 12:15:49 -0400 (Wed, 06 Jul 2011)
New Revision: 32662
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java
Log:
[JBIDE-9215] added empty publishing methods again
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-06 16:08:18 UTC (rev 32661)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-06 16:15:49 UTC (rev 32662)
@@ -11,6 +11,7 @@
package org.jboss.ide.eclipse.as.core.server.internal;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.wst.server.core.IServer;
@@ -37,6 +38,14 @@
return actualBehavior.getServer();
}
+ @Override
+ public void publishStart(IProgressMonitor monitor) throws CoreException {
+ }
+
+ @Override
+ public void publishFinish(IProgressMonitor monitor) throws CoreException {
+ }
+
protected abstract void forceStop();
protected abstract IStatus gracefullStop();
14 years, 5 months
JBoss Tools SVN: r32661 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-06 12:08:18 -0400 (Wed, 06 Jul 2011)
New Revision: 32661
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java
Log:
[JBIDE-9215] removed unneeded empty publishing methods
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-06 14:55:04 UTC (rev 32660)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-06 16:08:18 UTC (rev 32661)
@@ -11,7 +11,6 @@
package org.jboss.ide.eclipse.as.core.server.internal;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.wst.server.core.IServer;
@@ -42,14 +41,6 @@
protected abstract IStatus gracefullStop();
- @Override
- public void publishStart(IProgressMonitor monitor) throws CoreException {
- }
-
- @Override
- public void publishFinish(IProgressMonitor monitor) throws CoreException {
- }
-
@Deprecated
public void serverStarting() {
setServerStarting();
14 years, 5 months