JBoss Tools SVN: r35189 - branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-09-29 22:12:33 -0400 (Thu, 29 Sep 2011)
New Revision: 35189
Modified:
branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/installation.xml
Log:
TOOLSDOC-250 in progress, backing up to server
Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/installation.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/installation.xml 2011-09-30 01:18:37 UTC (rev 35188)
+++ branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/installation.xml 2011-09-30 02:12:33 UTC (rev 35189)
@@ -1,4 +1,4 @@
-<chapter id="installation">
+ace<chapter id="installation">
<?dbhtml filename="getting_started.html"?>
<chapterinfo>
<keywordset>
@@ -693,7 +693,7 @@
</para>
<important>
<para>
- For best performance ensure you have created the JBoss SOA server you wish to deploy the examples to before undertaking these steps.
+ For best performance ensure you have created the JBoss SOA server you wish to deploy the examples to before undertaking these steps. If you import the examples before creating the server, follow <xref linkend="server_after_imported_example" />.
</para>
</important>
<itemizedlist>
@@ -800,6 +800,69 @@
<para>
After you have imported the projects you want, they will be ready for use with no additional changes if the server you are going to test them on was created ahead of time. To use an example, deploy the project that is not suffixed with <emphasis>_test</emphasis>. After a successful deployment, run the ESB or JMS message testers within the <emphasis>_test</emphasis> project of the deployed example.
</para>
+ <formalpara id="server_after_imported_example">
+ <title>Creating the server after an example has been imported</title>
+ <para>
+ If you import an example before creating the server it will be deployed to, you will need to undertake the following steps in order to manually correct the project build path:
+ </para>
+ </formalpara>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Right-click on the example project and select <menuchoice><guimenuitem>Build Path</guimenuitem><guimenuitem>Configure Build Path</guimenuitem></menuchoice> from the context menu
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Select the <guilabel>Libraries</guilabel> tab on the <guilabel>Java Build Path</guilabel> property page
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Select the
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+
+ </para>
+ </listitem>
+ </itemizedlist>
</section>
<section>
12 years, 7 months
JBoss Tools SVN: r35188 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-29 21:18:37 -0400 (Thu, 29 Sep 2011)
New Revision: 35188
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
Log:
removed syncExec call
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2011-09-30 00:58:21 UTC (rev 35187)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2011-09-30 01:18:37 UTC (rev 35188)
@@ -439,16 +439,7 @@
class TextFocusListener extends FocusAdapter {
public void focusLost(FocusEvent e) {
if (JSPTextEditor.super.isDirty()) {
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- try {
- Thread.sleep(200);
- } catch (InterruptedException exc) {
- JspEditorPlugin.getPluginLog().logError(exc);
- }
save();
- }
- });
}
}
}
12 years, 7 months
JBoss Tools SVN: r35187 - in trunk: cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-09-29 20:58:21 -0400 (Thu, 29 Sep 2011)
New Revision: 35187
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Gamme.java
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Game.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Generator.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/HomePage.xhtml
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/index.jsp
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/tck/NamedBeanRefactoringTest.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllImportantTests.java
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractRefactorTest.java
Log:
Updated NamedBeanRefactoringTest https://issues.jboss.org/browse/JBIDE-9791
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Game.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Game.java 2011-09-30 00:05:27 UTC (rev 35186)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Game.java 2011-09-30 00:58:21 UTC (rev 35187)
@@ -1,97 +0,0 @@
-package org.jboss.jsr299.tck.tests.jbt.refactoring;
-
-import java.io.Serializable;
-
-//import javax.annotation.PostConstruct;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.naming.NamingException;
-
-@SessionScoped
-@Named
-public class Game implements Serializable
-{
- private static final long serialVersionUID = 12L;
-
- @Named("myInner")
- public static class MyInner {
-
- }
- private int number;
- private int guess;
- private int smallest;
- private int biggest;
- private int remainingGuesses;
-
- @Inject @MaxNumber private int maxNumber;
-
- @Inject private int[] maxNumber2;
-
- @Inject Generator[] generator;
-
- @Inject @Random Instance<Integer> randomNumber;
-
- public Game() throws NamingException {}
-
- public int getNumber()
- {
- return number + 9;
- }
-
- public int getGuess()
- {
- return guess;
- }
-
- public void setGuess(int guess)
- {
- String s = "#{another.kkk}";
- this.guess = guess;
- }
-
- public int getSmallest()
- {
- return smallest;
- }
-
- public int getBiggest()
- {
- return biggest;
- }
-
- public int getRemainingGuesses()
- {
- return remainingGuesses;
- }
-
- public boolean check()
- {
- if (guess>number)
- {
- biggest = guess - 1;
- }
- if (guess<number)
- {
- smallest = guess + 1;
- }
- remainingGuesses--;
- return (guess == number);
- }
-
-// @PostConstruct
- public void reset()
- {
- this.smallest = 0;
- this.guess = 0;
- this.remainingGuesses = 10;
- this.biggest = maxNumber;
- this.number = randomNumber.get();
- }
-}
-
-@Named("myLocal")
-class MyLocal {
-
-}
Copied: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Gamme.java (from rev 35158, trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Game.java)
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Gamme.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Gamme.java 2011-09-30 00:58:21 UTC (rev 35187)
@@ -0,0 +1,97 @@
+package org.jboss.jsr299.tck.tests.jbt.refactoring;
+
+import java.io.Serializable;
+
+//import javax.annotation.PostConstruct;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.naming.NamingException;
+
+@SessionScoped
+@Named
+public class Gamme implements Serializable
+{
+ private static final long serialVersionUID = 12L;
+
+ @Named("myInner")
+ public static class MyInner {
+
+ }
+ private int number;
+ private int guess;
+ private int smallest;
+ private int biggest;
+ private int remainingGuesses;
+
+ @Inject @MaxNumber private int maxNumber;
+
+ @Inject private int[] maxNumber2;
+
+ @Inject Generator[] generator;
+
+ @Inject @Random Instance<Integer> randomNumber;
+
+ public Gamme() throws NamingException {}
+
+ public int getNumber()
+ {
+ return number + 9;
+ }
+
+ public int getGuess()
+ {
+ return guess;
+ }
+
+ public void setGuess(int guess)
+ {
+ String s = "#{another.kkk}";
+ this.guess = guess;
+ }
+
+ public int getSmallest()
+ {
+ return smallest;
+ }
+
+ public int getBiggest()
+ {
+ return biggest;
+ }
+
+ public int getRemainingGuesses()
+ {
+ return remainingGuesses;
+ }
+
+ public boolean check()
+ {
+ if (guess>number)
+ {
+ biggest = guess - 1;
+ }
+ if (guess<number)
+ {
+ smallest = guess + 1;
+ }
+ remainingGuesses--;
+ return (guess == number);
+ }
+
+// @PostConstruct
+ public void reset()
+ {
+ this.smallest = 0;
+ this.guess = 0;
+ this.remainingGuesses = 10;
+ this.biggest = maxNumber;
+ this.number = randomNumber.get();
+ }
+}
+
+@Named("myLocal")
+class MyLocal {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Gamme.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Generator.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Generator.java 2011-09-30 00:05:27 UTC (rev 35186)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Generator.java 2011-09-30 00:58:21 UTC (rev 35187)
@@ -17,7 +17,7 @@
java.util.Random getRandom()
{
- String s = "#{game}";
+ String s = "#{gamme}";
return random;
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/HomePage.xhtml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/HomePage.xhtml 2011-09-30 00:05:27 UTC (rev 35186)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/HomePage.xhtml 2011-09-30 00:58:21 UTC (rev 35187)
@@ -18,10 +18,10 @@
<input wicket:id="inputGuess" type="text" size="3"/>
<input wicket:id="GuessButton" type="submit" value="Guess"/>
<input wicket:id="RestartButton" type="submit" value="Reset"/>
- <h:commandButton id="GuessButton" value="Guess" action="#{game.check}" disabled="false"/>
+ <h:commandButton id="GuessButton" value="Guess" action="#{gamme.check}" disabled="false"/>
</div>
<div>
- <h:commandButton id="RestartButton" value="Reset" action="#{game.reset}" immediate="true"/>
+ <h:commandButton id="RestartButton" value="Reset" action="#{gamme.reset}" immediate="true"/>
</div>
</form>
</body>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/index.jsp
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/index.jsp 2011-09-30 00:05:27 UTC (rev 35186)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/index.jsp 2011-09-30 00:58:21 UTC (rev 35187)
@@ -11,7 +11,7 @@
<body>
<f:view>
<h3>
- <h:outputText value="#{game.biggest}" />!
+ <h:outputText value="#{gamme.biggest}" />!
</h3>
</f:view>
</body>
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-09-30 00:05:27 UTC (rev 35186)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-09-30 00:58:21 UTC (rev 35187)
@@ -37,6 +37,7 @@
import org.jboss.tools.cdi.core.test.tck.InjectionPointWithNewQualifierTest;
import org.jboss.tools.cdi.core.test.tck.InterceptorDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.NameDefinitionTest;
+import org.jboss.tools.cdi.core.test.tck.NamedBeanRefactoringTest;
import org.jboss.tools.cdi.core.test.tck.ObserverMethodResolutionTest;
import org.jboss.tools.cdi.core.test.tck.ProducerMethodDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.QualifierDefinitionTest;
@@ -122,6 +123,9 @@
suite.addTestSuite(CoreValidationTest.class);
suite.addTestSuite(ELValidationTest.class);
suite.addTestSuite(IncrementalValidationTest.class);
+
+ // Refactoring test
+ suite.addTestSuite(NamedBeanRefactoringTest.class);
suiteAll.addTestSuite(TwoWebContentFoldersTest.class);
suiteAll.addTestSuite(RemoveJarFromClasspathTest.class);
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NamedBeanRefactoringTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NamedBeanRefactoringTest.java 2011-09-30 00:05:27 UTC (rev 35186)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NamedBeanRefactoringTest.java 2011-09-30 00:58:21 UTC (rev 35187)
@@ -3,11 +3,7 @@
import java.util.ArrayList;
import java.util.Set;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
@@ -15,65 +11,53 @@
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.internal.core.refactoring.RenameNamedBeanProcessor;
import org.jboss.tools.tests.AbstractRefactorTest;
+import org.jboss.tools.tests.AbstractRefactorTest.TestChangeStructure;
+import org.jboss.tools.tests.AbstractRefactorTest.TestTextChange;
-public class NamedBeanRefactoringTest extends AbstractRefactorTest {
- private static final String PROJECT_NAME = "/tests/jbt/refactoring";
- private static final String FILE_NAME1 = "JavaSource/org/jboss/jsr299/tck/tests/jbt/refactoring/Game.java";
+public class NamedBeanRefactoringTest extends TCKTest {
+ private static final String FILE_NAME1 = "JavaSource/org/jboss/jsr299/tck/tests/jbt/refactoring/Gamme.java";
private static final String FILE_NAME2 = "JavaSource/org/jboss/jsr299/tck/tests/jbt/refactoring/Generator.java";
- private static final String FILE_NAME3 = "WebContent/HomePage.xhtml";
- private static final String FILE_NAME4 = "WebContent/index.jsp";
- static IProject project;
+ private static final String FILE_NAME3 = "WebContent/tests/jbt/refactoring/HomePage.xhtml";
+ private static final String FILE_NAME4 = "WebContent/tests/jbt/refactoring/index.jsp";
+
+ private static final String newName = "abcde";
+ private static final int NUM_OF_CHAR = 5;
- public NamedBeanRefactoringTest() {
- super("Named Bean Refactoring Test");
- }
-
- public static Test suite() {
- return new TestSuite(NamedBeanRefactoringTest.class);
- }
-
- public void testNamedBeanRename() throws Exception {
- IProject project = TCKTest.importPreparedProject(PROJECT_NAME);
- doTest(project);
- TCKTest.cleanProject(PROJECT_NAME);
- }
-
- public void doTest(IProject project) throws CoreException {
- final String newName = "abcd";
+ public void testNamedBeanRename() throws CoreException {
+
ArrayList<TestChangeStructure> list = new ArrayList<TestChangeStructure>();
- TestChangeStructure structure = new TestChangeStructure(project
- .getProject(), FILE_NAME1);
- TestTextChange change = new TestTextChange(328, 4, newName);
+ TestChangeStructure structure = new TestChangeStructure(tckProject, FILE_NAME1);
+ TestTextChange change = new TestTextChange(328, NUM_OF_CHAR, newName);
structure.addTextChange(change);
list.add(structure);
- structure = new TestChangeStructure(project, FILE_NAME2);
- change = new TestTextChange(526, 4, newName);
+ structure = new TestChangeStructure(tckProject, FILE_NAME2);
+ change = new TestTextChange(526, NUM_OF_CHAR, newName);
structure.addTextChange(change);
list.add(structure);
- structure = new TestChangeStructure(project, FILE_NAME3);
- change = new TestTextChange(789, 4, newName);
+ structure = new TestChangeStructure(tckProject, FILE_NAME3);
+ change = new TestTextChange(789, NUM_OF_CHAR, newName);
structure.addTextChange(change);
- change = new TestTextChange(923, 4, newName);
+ change = new TestTextChange(924, NUM_OF_CHAR, newName);
structure.addTextChange(change);
list.add(structure);
- structure = new TestChangeStructure(project, FILE_NAME4);
- change = new TestTextChange(293, 4, newName);
+ structure = new TestChangeStructure(tckProject, FILE_NAME4);
+ change = new TestTextChange(293, NUM_OF_CHAR, newName);
structure.addTextChange(change);
list.add(structure);
- IFile sourceFile = project.getProject().getFile(FILE_NAME1);
+ IFile sourceFile = tckProject.getProject().getFile(FILE_NAME1);
- IBean bean = getBean(sourceFile, "game");
+ IBean bean = getBean(sourceFile, "gamme");
assertNotNull("Can't get the bean.", bean);
RenameNamedBeanProcessor processor = new RenameNamedBeanProcessor(bean);
processor.setNewName(newName);
- checkRename(processor, list);
+ AbstractRefactorTest.checkRename(processor, list);
}
private IBean getBean(IFile file, String name) {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllImportantTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllImportantTests.java 2011-09-30 00:05:27 UTC (rev 35186)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllImportantTests.java 2011-09-30 00:58:21 UTC (rev 35187)
@@ -68,7 +68,6 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide2362Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.MessageResolutionInPreviewTabTest;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.MozDirtyTest_JBIDE5105;
-import org.jboss.tools.jsf.vpe.jsf.test.jbide.MultipleWebRootFoldersTest_JBIDE9753;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.NullPointerWithStyleProperty_JBIDE5193;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnCssClassTest_JBIDE4775;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnInJarPackageFragment_JBIDE5682;
@@ -106,7 +105,7 @@
suite.addTestSuite(UnclosedELExpressionTest.class);
suite.addTestSuite(TestContextPathResolution.class);
suite.addTestSuite(JBIDE5920Test.class);
- suite.addTestSuite(MultipleWebRootFoldersTest_JBIDE9753.class);
+ //suite.addTestSuite(MultipleWebRootFoldersTest_JBIDE9753.class);
suite.addTestSuite(RenderFacetAndInsertChildrenTest.class);
suite.addTestSuite(EditFontFamilyTest_JBIDE5872.class);
suite.addTestSuite(ChangeMessageBundleTest_JBIDE5818.class);
Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractRefactorTest.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractRefactorTest.java 2011-09-30 00:05:27 UTC (rev 35186)
+++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractRefactorTest.java 2011-09-30 00:58:21 UTC (rev 35187)
@@ -32,7 +32,7 @@
super(name);
}
- protected void checkRename(RenameProcessor processor, List<TestChangeStructure> changeList) throws CoreException{
+ public static void checkRename(RenameProcessor processor, List<TestChangeStructure> changeList) throws CoreException{
JobUtils.waitForIdle(2000);
// Test before renaming
@@ -63,7 +63,7 @@
checkChanges(rootChange, changeList);
}
- protected void checkMove(RefactoringProcessor processor, IResource oldObject, IResource destinationObject, MoveParticipant participant, List<TestChangeStructure> changeList) throws CoreException {
+ public static void checkMove(RefactoringProcessor processor, IResource oldObject, IResource destinationObject, MoveParticipant participant, List<TestChangeStructure> changeList) throws CoreException {
JobUtils.waitForIdle(2000);
// Test before moving
@@ -92,7 +92,7 @@
checkChanges(rootChange, changeList);
}
- protected void checkRename(RefactoringProcessor processor, IResource oldObject, String newName, RenameParticipant participant, List<TestChangeStructure> changeList) throws CoreException {
+ public static void checkRename(RefactoringProcessor processor, IResource oldObject, String newName, RenameParticipant participant, List<TestChangeStructure> changeList) throws CoreException {
JobUtils.waitForIdle(2000);
// Test before renaming
@@ -121,7 +121,7 @@
checkChanges(rootChange, changeList);
}
- private void checkBeforeRefactoring(List<TestChangeStructure> changeList){
+ public static void checkBeforeRefactoring(List<TestChangeStructure> changeList){
for(TestChangeStructure changeStructure : changeList){
IFile file = changeStructure.getProject().getFile(changeStructure.getFileName());
String content = null;
@@ -138,9 +138,10 @@
}
}
- private void checkChanges(CompositeChange rootChange, List<TestChangeStructure> changeList) throws CoreException {
+ public static void checkChanges(CompositeChange rootChange, List<TestChangeStructure> changeList) throws CoreException {
assertNotNull("Root change is null",rootChange);
- assertEquals("There is unexpected number of changes",changeList.size(), rootChange.getChildren().length);
+
+ int numberOfChanges = rootChange.getChildren().length;
for(int i = 0; i < rootChange.getChildren().length;i++){
TextFileChange fileChange = (TextFileChange)rootChange.getChildren()[i];
@@ -167,9 +168,10 @@
assertEquals("There is unexpected change in resource - "+file.getName(),change.getText(), content.substring(change.getOffset(), change.getOffset()+change.getLength()));
}
}
+ assertEquals("There is unexpected number of changes",changeList.size(), numberOfChanges);
}
- protected TestChangeStructure findChange(List<TestChangeStructure> changeList, IFile file){
+ public static TestChangeStructure findChange(List<TestChangeStructure> changeList, IFile file){
for(TestChangeStructure tcs : changeList){
if(tcs.getFileName().equals("/"+file.getFullPath().removeFirstSegments(1).toString()))
return tcs;
@@ -178,7 +180,7 @@
}
- public class TestChangeStructure{
+ public static class TestChangeStructure{
private IProject project;
private String fileName;
ArrayList<TestTextChange> textChanges = new ArrayList<TestTextChange>();
@@ -211,7 +213,7 @@
}
- public class TestTextChange{
+ public static class TestTextChange{
private int offset;
private int length;
private String text;
12 years, 7 months
JBoss Tools SVN: r35186 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test: projects/CDIConfigTest/src/org/jboss/beans/test06 and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-29 20:05:27 -0400 (Thu, 29 Sep 2011)
New Revision: 35186
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test06/MyBean3.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test06/MyImpl.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test06/MyInterface.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/seam-beans.xml
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test07/MyBean1.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java
Log:
JBIDE-9795
https://issues.jboss.org/browse/JBIDE-9795
Test added to seam config for virtual field producer with type that is interface.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/seam-beans.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/seam-beans.xml 2011-09-29 23:50:02 UTC (rev 35185)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/META-INF/seam-beans.xml 2011-09-30 00:05:27 UTC (rev 35186)
@@ -155,4 +155,12 @@
</s:value>
</test06:MyType1>
+<!-- Test 06-4 -->
+<test06:MyInterface>
+ <s:Produces/>
+ <s:value>
+ <test06:MyImpl></test06:MyImpl>
+ </s:value>
+</test06:MyInterface>
+
</beans>
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test06/MyBean3.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test06/MyBean3.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test06/MyBean3.java 2011-09-30 00:05:27 UTC (rev 35186)
@@ -0,0 +1,24 @@
+package org.jboss.beans.test06;
+
+import javax.inject.Inject;
+
+/**
+ * Test 06-4.
+ *
+ * Sources contain simple bean class MyBean3
+ * with injection point of type MyInterface
+ * Seam config xml contains declaration:
+ * <test06:MyInterface>
+ * <s:Produces/>
+ * <s:value>
+ * <test06:MyImpl></test06:MyImpl>
+ * </s:value>
+ * </test06:MyInterface>
+ * ASSERT: Model contains one bean of type MyInterface with qualifier Default.
+ * ASSERT: Injection point field 'i' in MyBean3 is resolved to that bean.
+ */
+public class MyBean3 {
+
+ @Inject MyInterface i;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test06/MyBean3.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test06/MyImpl.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test06/MyImpl.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test06/MyImpl.java 2011-09-30 00:05:27 UTC (rev 35186)
@@ -0,0 +1,5 @@
+package org.jboss.beans.test06;
+
+@MyQualifier("myImpl1")
+public class MyImpl implements MyInterface {
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test06/MyImpl.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test06/MyInterface.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test06/MyInterface.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test06/MyInterface.java 2011-09-30 00:05:27 UTC (rev 35186)
@@ -0,0 +1,5 @@
+package org.jboss.beans.test06;
+
+public interface MyInterface {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test06/MyInterface.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test07/MyBean1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test07/MyBean1.java 2011-09-29 23:50:02 UTC (rev 35185)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/test07/MyBean1.java 2011-09-30 00:05:27 UTC (rev 35186)
@@ -1,4 +1,4 @@
-package org.jboss.beans.test01;
+package org.jboss.beans.test07;
import javax.inject.Named;
/**
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java 2011-09-29 23:50:02 UTC (rev 35185)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamBeansTest.java 2011-09-30 00:05:27 UTC (rev 35186)
@@ -649,8 +649,8 @@
*
* ASSERT: Model contains 1 bean with type MyType1 and qualifier MyQualifier.
* ASSERT: Qualifier has value member equal to "two".
- * ASSERT: Injection point field 'two' in MyBean1 is resolved to that bean.
- * ASSERT: Injection point field 'one' in MyBean1 is resolved to 2 beans.
+ * ASSERT: Injection point field 'two' in MyBean2 is resolved to that bean.
+ * ASSERT: Injection point field 'one' in MyBean2 is resolved to 2 beans.
* ASSERT: One of them is the above-mentioned MyType1 bean.
* ASSERT: The other of them is a bean with type MyType1 InlineBeanQualifier qualifier.
*/
@@ -715,6 +715,29 @@
// assertEquals(inlineIndex1, inlineIndex2);
}
+ public void testVirtualFieldProducerForInterface() {
+ Set<IBean> beans = cdiProject.getBeans(false, "org.jboss.beans.test06.MyInterface",
+ new String[]{CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME});
+ assertEquals(1, beans.size());
+ IBean b = beans.iterator().next();
+ assertTrue(b instanceof IClassBean); // we keep it as a class bean
+
+ Set<IBean> beans1 = cdiProject.getBeans(false, "org.jboss.beans.test06.MyBean3", new String[0]);
+ assertEquals(1, beans1.size());
+ IBean b1 = beans1.iterator().next();
+
+ Set<IInjectionPoint> is = b1.getInjectionPoints();
+ assertEquals(1, is.size());
+ IInjectionPoint i = is.iterator().next();
+
+ assertNotNull(i);
+
+ Set<IBean> beansI = cdiProject.getBeans(false, i);
+ assertEquals(1, beansI.size());
+ assertTrue(beansI.contains(b));
+
+ }
+
/**
* Test 06-3.
* Uses sources of tests 06-1 and 06-2.
12 years, 7 months
JBoss Tools SVN: r35185 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-29 19:50:02 -0400 (Thu, 29 Sep 2011)
New Revision: 35185
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
Log:
Added comments
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2011-09-29 23:37:48 UTC (rev 35184)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2011-09-29 23:50:02 UTC (rev 35185)
@@ -128,13 +128,19 @@
}
public Set<CDICoreNature> getCDIProjects() {
- return dependsOn;
+ return getCDIProjects(false);
}
public CDIExtensionManager getExtensionManager() {
return extensions;
}
+ /**
+ * Returns all the project that are included into classpath of this project.
+ * @param hierarchy If false then return the projects explicitly included into the project classpath.
+ * If true then all the project from the entire hierarchy will be returned.
+ * @return
+ */
public Set<CDICoreNature> getCDIProjects(boolean hierarchy) {
if(hierarchy) {
if(dependsOn.isEmpty()) return dependsOn;
@@ -252,6 +258,10 @@
return result;
}
+ /**
+ * Returns all the CDI projects that include this project into their class path.
+ * @return
+ */
public Set<CDICoreNature> getDependentProjects() {
return usedBy;
}
12 years, 7 months
JBoss Tools SVN: r35184 - in trunk: vpe/tests and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-29 19:37:48 -0400 (Thu, 29 Sep 2011)
New Revision: 35184
Modified:
trunk/build/pom.xml
trunk/vpe/tests/pom.xml
Log:
coverage profiles should be moved from build/pom.xml to component/tests/pom.xml. vpe component coverage report is fixed.
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2011-09-29 23:33:20 UTC (rev 35183)
+++ trunk/build/pom.xml 2011-09-29 23:37:48 UTC (rev 35184)
@@ -181,19 +181,6 @@
</profile>
<profile>
- <id>vpe-tests</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <modules>
- <module>libs</module>
- <module>../vpe/tests</module>
- <module>reports/emma-coverage</module>
- </modules>
- </profile>
-
-
- <profile>
<id>vpe-bootstrap</id>
<modules>
<module>../tests</module>
@@ -205,19 +192,6 @@
</profile>
<profile>
- <id>vpe-bootstrap-tests</id>
- <modules>
- <module>libs</module>
- <module>../tests</module>
- <module>../common</module>
- <module>../jst</module>
- <module>../xulrunner</module>
- <module>../vpe</module>
- <module>reports/emma-coverage</module>
- </modules>
- </profile>
-
- <profile>
<id>jsf</id>
<activation>
<activeByDefault>true</activeByDefault>
@@ -390,28 +364,6 @@
</profile>
<profile>
- <id>cdi-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../common</module>
- <module>../jst</module>
- <module>../cdi</module>
- </modules>
- </profile>
-
- <profile>
- <id>cdi-botstrap-tests</id>
- <modules>
- <module>libs</module>
- <module>../tests</module>
- <module>../common</module>
- <module>../jst</module>
- <module>../cdi</module>
- <module>reports/emma-coverage</module>
- </modules>
- </profile>
-
- <profile>
<id>birt</id>
<activation>
<activeByDefault>true</activeByDefault>
Modified: trunk/vpe/tests/pom.xml
===================================================================
--- trunk/vpe/tests/pom.xml 2011-09-29 23:33:20 UTC (rev 35183)
+++ trunk/vpe/tests/pom.xml 2011-09-29 23:37:48 UTC (rev 35184)
@@ -6,21 +6,58 @@
<artifactId>vpe</artifactId>
<version>3.3.0-SNAPSHOT</version>
</parent>
+
<groupId>org.jboss.tools.vpe</groupId>
<artifactId>tests</artifactId>
-
<name>vpe.tests</name>
<packaging>pom</packaging>
- <modules>
- <module>org.jboss.tools.vpe.docbook.test</module>
- <module>org.jboss.tools.vpe.ui.test</module>
- <module>org.jboss.tools.vpe.html.test</module>
- <module>org.jboss.tools.vpe.spring.test</module>
- <module>org.jboss.tools.vpe.jsp.test</module>
- <module>org.jboss.tools.vpe.test</module>
- <module>org.jboss.tools.vpe.ui.bot.test</module>
- <module>org.jboss.tools.vpe.xulrunner.test</module>
- </modules>
+
+ <profiles>
+ <profile>
+ <id>vpe-tests-libs</id>
+ <activation>
+ <property>
+ <name>coverage</name>
+ </property>
+ </activation>
+ <modules>
+ <module>../../build/libs</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>vpe-tests-deafult</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>coverage</name>
+ </property>
+ </activation>
+ <modules>
+ <module>org.jboss.tools.vpe.docbook.test</module>
+ <module>org.jboss.tools.vpe.ui.test</module>
+ <module>org.jboss.tools.vpe.html.test</module>
+ <module>org.jboss.tools.vpe.spring.test</module>
+ <module>org.jboss.tools.vpe.jsp.test</module>
+ <module>org.jboss.tools.vpe.test</module>
+ <module>org.jboss.tools.vpe.ui.bot.test</module>
+ <module>org.jboss.tools.vpe.xulrunner.test</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>vpe-tests-coverage-report</id>
+ <activation>
+ <property>
+ <name>coverage</name>
+ </property>
+ </activation>
+ <modules>
+ <module>../../build/reports/emma-coverage</module>
+ </modules>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
12 years, 7 months
JBoss Tools SVN: r35183 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: src/org/jboss/tools/cdi/core/test/tck/lookup and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-29 19:33:20 -0400 (Thu, 29 Sep 2011)
New Revision: 35183
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/NotBean.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/ResolutionByNameTest.java
Log:
JBIDE-9795
https://issues.jboss.org/browse/JBIDE-9795
Test added.
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/NotBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/NotBean.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/NotBean.java 2011-09-29 23:33:20 UTC (rev 35183)
@@ -0,0 +1,15 @@
+package org.jboss.jsr299.tck.tests.jbt.lookup;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+@Named("abstractClass")
+public abstract class NotBean {
+
+ @Produces
+ @Named("producerInAbstractClass") NotBean b;
+
+ @Inject @Named("abstractClass") NotBean f1;
+ @Inject @Named("producerInAbstractClass") NotBean f2;
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/NotBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/ResolutionByNameTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/ResolutionByNameTest.java 2011-09-29 23:18:08 UTC (rev 35182)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/ResolutionByNameTest.java 2011-09-29 23:33:20 UTC (rev 35183)
@@ -16,9 +16,16 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.jdt.core.IField;
+import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IClassBean;
+import org.jboss.tools.cdi.core.IInjectionPoint;
+import org.jboss.tools.cdi.core.IInjectionPointField;
+import org.jboss.tools.cdi.core.IProducer;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
import org.jboss.tools.cdi.internal.core.impl.CDIProject;
+import org.jboss.tools.common.java.IAnnotationDeclaration;
/**
* @author Alexey Kazakov
@@ -62,4 +69,43 @@
old = ((CDIProject)cdiProject).replaceBeanXML(old);
}
}
+
+ /**
+ * Abstract class NotBean is annotated @Named("abstractClass")
+ * There is no bean with bean name "abstractClass" for EL or injections,
+ * but instance of IClassBean created for NotBean can be obtained through
+ * its members available in model (e.g. producers)
+ *
+ * @throws CoreException
+ */
+ public void testAbstractClassAnnotatedNamed() throws CoreException {
+ String abstractClass = "abstractClass";
+ Set<IBean> beans = cdiProject.getBeans(abstractClass, false);
+ assertTrue(beans.isEmpty());
+
+ beans = cdiProject.getBeans("producerInAbstractClass", false);
+ assertEquals(1, beans.size());
+ IBean b = beans.iterator().next();
+ assertTrue(b instanceof IProducer);
+
+ IClassBean cb = ((IProducer)b).getClassBean();
+ assertNotNull(cb);
+ IAnnotationDeclaration named = cb.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
+ assertEquals(abstractClass, named.getMemberValue(null));
+
+ Set<IInjectionPoint> injections = cdiProject.getInjections("org.jboss.jsr299.tck.tests.jbt.lookup.NotBean");
+ assertEquals(2, injections.size());
+ for (IInjectionPoint p: injections) {
+ assertTrue(p instanceof IInjectionPointField);
+ IField f = ((IInjectionPointField)p).getField();
+ Set<IBean> bs = cdiProject.getBeans(false, p);
+ if("f1".endsWith(f.getElementName())) {
+ assertEquals("Injection field f1 cannot be resolved to abstract class bean.", 0, bs.size());
+ } else if("f2".endsWith(f.getElementName())) {
+ assertEquals("Injection field f2 should be resolved to producer.", 1, bs.size());
+ } else {
+ fail("Unexpected field: " + f.getElementName());
+ }
+ }
+ }
}
\ No newline at end of file
12 years, 7 months
JBoss Tools SVN: r35182 - trunk/vpe/plugins/org.jboss.tools.xulrunner.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-29 19:18:08 -0400 (Thu, 29 Sep 2011)
New Revision: 35182
Added:
trunk/vpe/plugins/org.jboss.tools.xulrunner/.classpath
trunk/vpe/plugins/org.jboss.tools.xulrunner/src/
Modified:
trunk/vpe/plugins/org.jboss.tools.xulrunner/.project
trunk/vpe/plugins/org.jboss.tools.xulrunner/build.properties
Log:
fix for
[ERROR] Failed to execute goal org.eclipse.tycho:tycho-source-plugin:0.12.0:plugin-source (plugin-source) on project org.jboss.tools.xulrunner: no source folders found in build.properties -> [Help 1]
Added: trunk/vpe/plugins/org.jboss.tools.xulrunner/.classpath
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.xulrunner/.classpath (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.xulrunner/.classpath 2011-09-29 23:18:08 UTC (rev 35182)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/vpe/plugins/org.jboss.tools.xulrunner/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/vpe/plugins/org.jboss.tools.xulrunner/.project
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.xulrunner/.project 2011-09-29 21:53:25 UTC (rev 35181)
+++ trunk/vpe/plugins/org.jboss.tools.xulrunner/.project 2011-09-29 23:18:08 UTC (rev 35182)
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
Modified: trunk/vpe/plugins/org.jboss.tools.xulrunner/build.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.xulrunner/build.properties 2011-09-29 21:53:25 UTC (rev 35181)
+++ trunk/vpe/plugins/org.jboss.tools.xulrunner/build.properties 2011-09-29 23:18:08 UTC (rev 35182)
@@ -5,4 +5,6 @@
about.html,\
jboss_about.png,\
plugin.properties
-jars.compile.order =
+jars.compile.order = .
+source.. = src/
+output.. = bin/
12 years, 7 months
JBoss Tools SVN: r35181 - branches/jbosstools-3.2.x/ws/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-09-29 17:53:25 -0400 (Thu, 29 Sep 2011)
New Revision: 35181
Modified:
branches/jbosstools-3.2.x/ws/docs/reference/en-US/Book_Info.xml
branches/jbosstools-3.2.x/ws/docs/reference/en-US/JBoss_Web_Services_User_Guide.xml
branches/jbosstools-3.2.x/ws/docs/reference/en-US/proc-jbt-test_web_service_prelim.xml
branches/jbosstools-3.2.x/ws/docs/reference/en-US/proc-jbt-web_service_test_view.xml
Log:
updated for 4.1.1
Modified: branches/jbosstools-3.2.x/ws/docs/reference/en-US/Book_Info.xml
===================================================================
--- branches/jbosstools-3.2.x/ws/docs/reference/en-US/Book_Info.xml 2011-09-29 21:53:19 UTC (rev 35180)
+++ branches/jbosstools-3.2.x/ws/docs/reference/en-US/Book_Info.xml 2011-09-29 21:53:25 UTC (rev 35181)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
- <pubsnumber>11</pubsnumber>
+ <pubsnumber>12</pubsnumber>
<abstract>
<para>The JBoss Web Services User Guide explains how to use the JBoss Web Services module to implement web services in Java.</para>
</abstract>
Modified: branches/jbosstools-3.2.x/ws/docs/reference/en-US/JBoss_Web_Services_User_Guide.xml
===================================================================
--- branches/jbosstools-3.2.x/ws/docs/reference/en-US/JBoss_Web_Services_User_Guide.xml 2011-09-29 21:53:19 UTC (rev 35180)
+++ branches/jbosstools-3.2.x/ws/docs/reference/en-US/JBoss_Web_Services_User_Guide.xml 2011-09-29 21:53:25 UTC (rev 35181)
@@ -12,7 +12,7 @@
<xi:include href="preference.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<!--<xi:include href="webproject.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>-->
<xi:include href="sample_web_service_wizards.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-<xi:include href="resteasy_simple_project_example.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<!--<xi:include href="resteasy_simple_project_example.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />-->
<xi:include href="web_service_test_view.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
Modified: branches/jbosstools-3.2.x/ws/docs/reference/en-US/proc-jbt-test_web_service_prelim.xml
===================================================================
--- branches/jbosstools-3.2.x/ws/docs/reference/en-US/proc-jbt-test_web_service_prelim.xml 2011-09-29 21:53:19 UTC (rev 35180)
+++ branches/jbosstools-3.2.x/ws/docs/reference/en-US/proc-jbt-test_web_service_prelim.xml 2011-09-29 21:53:25 UTC (rev 35181)
@@ -37,14 +37,14 @@
<itemizedlist>
<listitem>
<para>
- <xref linkend="proc-jbt-export-war_export"/> for the <application>RestfulSample</application> project; or
+ <xref linkend="proc-jbt-export-war_export"/> for the <application>RestfulSample</application> project <!--; or <-->
</para>
</listitem>
- <listitem>
+ <!-- <listitem>
<para>
<xref linkend="proc-jbt-new_project_example"/> for the <application>RESTEasy</application> sample project.
</para>
- </listitem>
+ </listitem> -->
</itemizedlist>
</para>
</step>
Modified: branches/jbosstools-3.2.x/ws/docs/reference/en-US/proc-jbt-web_service_test_view.xml
===================================================================
--- branches/jbosstools-3.2.x/ws/docs/reference/en-US/proc-jbt-web_service_test_view.xml 2011-09-29 21:53:19 UTC (rev 35180)
+++ branches/jbosstools-3.2.x/ws/docs/reference/en-US/proc-jbt-web_service_test_view.xml 2011-09-29 21:53:25 UTC (rev 35181)
@@ -90,7 +90,7 @@
</row>
<row>
<entry>Toolbar button - Invoke</entry>
- <entry>Once the WSDL file has been selected, the service can be invoked by clicking this button. Reponse details will be displayed in the <guilabel>Response Details</guilabel> panel.</entry>
+ <entry>Once the WSDL file has been selected, the service can be invoked by clicking this button. Response details will be displayed in the <guilabel>Response Details</guilabel> panel.</entry>
</row>
</tbody>
</tgroup>
@@ -146,7 +146,7 @@
</row>
<row>
<entry>Response body</entry>
- <entry>The JAX-WS and JAX-RS response bodies will be displayed in this box. The raw text returned form the web service invocation can be displayed by clicking the <guibutton>Show Raw</guibutton> button. The output will be embedded in a html browser by clicking the <guibutton>Show in Browser</guibutton> button. The output can alternatively be displayed in the Eclipse editor as xml or raw text (depending on the response content type) by clicking the <guibutton>Show in Editor</guibutton> button.</entry>
+ <entry>The JAX-WS and JAX-RS response bodies will be displayed in this box. The raw text returned from the web service invocation can be displayed by clicking the <guibutton>Show Raw</guibutton> button. The output will be embedded in a html browser by clicking the <guibutton>Show in Browser</guibutton> button. The output can alternatively be displayed in the Eclipse editor as xml or raw text (depending on the response content type) by clicking the <guibutton>Show in Editor</guibutton> button.</entry>
</row>
<row>
<entry>Parameters</entry>
12 years, 7 months
JBoss Tools SVN: r35180 - trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-29 17:53:19 -0400 (Thu, 29 Sep 2011)
New Revision: 35180
Added:
trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringConstant.java
Removed:
trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/util/
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringFormSelectTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringTextAreaTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringUrlTemplate.java
Log:
code cleanup: renamed and moved Spring class up one level
Copied: trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringConstant.java (from rev 35122, trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/util/Spring.java)
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringConstant.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringConstant.java 2011-09-29 21:53:19 UTC (rev 35180)
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.spring.template;
+
+
+/**
+ * @author Yahor Radtsevich (yradtsevich)
+ *
+ */
+public class SpringConstant {
+
+ private SpringConstant() {
+ }
+
+ public static final String ATTR_CSS_CLASS = "cssClass"; //$NON-NLS-1$
+ public static final String ATTR_CSS_STYLE = "cssStyle"; //$NON-NLS-1$
+ public static final String ATTR_DISABLED = "disabled"; //$NON-NLS-1$
+ public static final String ATTR_ID = "id"; //$NON-NLS-1$
+ public static final String ATTR_ITEMS = "items"; //$NON-NLS-1$
+ public static final String ATTR_ITEM_LABEL = "itemLabel"; //$NON-NLS-1$
+ public static final String ATTR_PATH = "path"; //$NON-NLS-1$
+ public static final String ATTR_MULTIPLE = "multiple"; //$NON-NLS-1$
+ public static final String ATTR_NAME = "name"; //$NON-NLS-1$
+ public static final String ATTR_VALUE = "value"; //$NON-NLS-1$
+ public static final String ATTR_VAR = "var"; //$NON-NLS-1$
+
+ public static final String VALUE_TRUE = "true"; //$NON-NLS-1$
+ public static final String VALUE_FALSE = "false"; //$NON-NLS-1$
+
+ public static final String TAG_SPRING_PARAM = "spring:param"; //$NON-NLS-1$
+}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringFormSelectTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringFormSelectTemplate.java 2011-09-29 21:52:55 UTC (rev 35179)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringFormSelectTemplate.java 2011-09-29 21:53:19 UTC (rev 35180)
@@ -18,7 +18,6 @@
import org.jboss.tools.vpe.editor.template.VpeCreationData;
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.editor.util.VisualDomUtil;
-import org.jboss.tools.vpe.spring.template.util.Spring;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.w3c.dom.Element;
@@ -33,9 +32,9 @@
public class SpringFormSelectTemplate extends VpeAbstractTemplate {
public static final Map<String, String> COMMON_SPRING_FORM_ATTRIBUTES_MAP
= new HashMap<String, String>() {{
- put(Spring.ATTR_ID, HTML.ATTR_ID);
- put(Spring.ATTR_CSS_STYLE, HTML.ATTR_STYLE);
- put(Spring.ATTR_CSS_CLASS, HTML.ATTR_CLASS);
+ put(SpringConstant.ATTR_ID, HTML.ATTR_ID);
+ put(SpringConstant.ATTR_CSS_STYLE, HTML.ATTR_STYLE);
+ put(SpringConstant.ATTR_CSS_CLASS, HTML.ATTR_CLASS);
put(HTML.ATTR_SIZE, HTML.ATTR_SIZE);
}};
@@ -50,19 +49,19 @@
VisualDomUtil.copyAttributes(sourceElement, select, COMMON_SPRING_FORM_ATTRIBUTES_MAP);
- if (Spring.VALUE_TRUE.equals(sourceElement.getAttribute(Spring.ATTR_DISABLED))) {
+ if (SpringConstant.VALUE_TRUE.equals(sourceElement.getAttribute(SpringConstant.ATTR_DISABLED))) {
select.setAttribute(HTML.ATTR_DISABLED, HTML.ATTR_DISABLED);
}
- if (!Spring.VALUE_FALSE.equals(sourceElement.getAttribute(Spring.ATTR_MULTIPLE))) {
+ if (!SpringConstant.VALUE_FALSE.equals(sourceElement.getAttribute(SpringConstant.ATTR_MULTIPLE))) {
select.setAttribute(HTML.ATTR_MULTIPLE, HTML.ATTR_MULTIPLE);
}
- if (sourceElement.hasAttribute(Spring.ATTR_ITEMS)) {
+ if (sourceElement.hasAttribute(SpringConstant.ATTR_ITEMS)) {
// an inner 'option' tag has to be generated
- String optionBody = sourceElement.getAttribute(Spring.ATTR_ITEMS);
- if (sourceElement.hasAttribute(Spring.ATTR_ITEM_LABEL)) {
- optionBody += '.' + sourceElement.getAttribute(Spring.ATTR_ITEM_LABEL);
+ String optionBody = sourceElement.getAttribute(SpringConstant.ATTR_ITEMS);
+ if (sourceElement.hasAttribute(SpringConstant.ATTR_ITEM_LABEL)) {
+ optionBody += '.' + sourceElement.getAttribute(SpringConstant.ATTR_ITEM_LABEL);
}
nsIDOMElement option = visualDocument.createElement(HTML.TAG_OPTION);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringTextAreaTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringTextAreaTemplate.java 2011-09-29 21:52:55 UTC (rev 35179)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringTextAreaTemplate.java 2011-09-29 21:53:19 UTC (rev 35180)
@@ -18,7 +18,6 @@
import org.jboss.tools.vpe.editor.util.Constants;
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.editor.util.VisualDomUtil;
-import org.jboss.tools.vpe.spring.template.util.Spring;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNode;
@@ -44,21 +43,21 @@
*/
textarea.setAttribute(
HTML.ATTR_CLASS,
- (sourceElement.hasAttribute(Spring.ATTR_CSS_CLASS)
- ? sourceElement.getAttribute(Spring.ATTR_CSS_CLASS)
+ (sourceElement.hasAttribute(SpringConstant.ATTR_CSS_CLASS)
+ ? sourceElement.getAttribute(SpringConstant.ATTR_CSS_CLASS)
: Constants.EMPTY));
textarea.setAttribute(
HTML.ATTR_STYLE,
- (sourceElement.hasAttribute(Spring.ATTR_CSS_STYLE)
- ? sourceElement.getAttribute(Spring.ATTR_CSS_STYLE)
+ (sourceElement.hasAttribute(SpringConstant.ATTR_CSS_STYLE)
+ ? sourceElement.getAttribute(SpringConstant.ATTR_CSS_STYLE)
: Constants.EMPTY));
/*
* Add value of the 'path' attribute to the textarea.
* No children are allowed for the form:textarea.
*/
- if (sourceElement.hasAttribute(Spring.ATTR_PATH)) {
+ if (sourceElement.hasAttribute(SpringConstant.ATTR_PATH)) {
textarea.appendChild(visualDocument.createTextNode(sourceElement
- .getAttribute(Spring.ATTR_PATH)));
+ .getAttribute(SpringConstant.ATTR_PATH)));
}
final VpeCreationData creationData = new VpeCreationData(textarea);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringUrlTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringUrlTemplate.java 2011-09-29 21:52:55 UTC (rev 35179)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringUrlTemplate.java 2011-09-29 21:53:19 UTC (rev 35180)
@@ -13,7 +13,6 @@
import org.jboss.tools.vpe.editor.template.VpeCreationData;
import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
import org.jboss.tools.vpe.editor.util.VisualDomUtil;
-import org.jboss.tools.vpe.spring.template.util.Spring;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.w3c.dom.Element;
@@ -34,9 +33,9 @@
nsIDOMDocument visualDocument) {
Element sourceElement = (Element) sourceNode;
nsIDOMElement urlContainer = VisualDomUtil.createBorderlessContainer(visualDocument);
- if (sourceElement.hasAttribute(Spring.ATTR_VALUE) &&
- !sourceElement.hasAttribute(Spring.ATTR_VAR)) {
- String valueAttribute = sourceElement.getAttribute(Spring.ATTR_VALUE);
+ if (sourceElement.hasAttribute(SpringConstant.ATTR_VALUE) &&
+ !sourceElement.hasAttribute(SpringConstant.ATTR_VAR)) {
+ String valueAttribute = sourceElement.getAttribute(SpringConstant.ATTR_VALUE);
StringBuilder url = new StringBuilder(valueAttribute);
boolean hasParams = valueAttribute.contains("?"); //$NON-NLS-1$
@@ -45,7 +44,7 @@
Node childNode = childNodes.item(i);
String childTemplateName = VpeTemplateManager.getInstance()
.getTemplateName(pageContext, childNode);
- if (Spring.TAG_SPRING_PARAM.equals(childTemplateName)) {
+ if (SpringConstant.TAG_SPRING_PARAM.equals(childTemplateName)) {
url.append(hasParams ? '&' : '?');
hasParams = true;
appendParam(url, (Element) childNode);
@@ -60,10 +59,10 @@
* @param paramElement
*/
private void appendParam(StringBuilder url, Element paramElement) {
- if (paramElement.hasAttribute(Spring.ATTR_NAME)) {
- url.append(paramElement.getAttribute(Spring.ATTR_NAME));
- if (paramElement.hasAttribute(Spring.ATTR_VALUE)) {
- url.append('=').append(paramElement.getAttribute(Spring.ATTR_VALUE));
+ if (paramElement.hasAttribute(SpringConstant.ATTR_NAME)) {
+ url.append(paramElement.getAttribute(SpringConstant.ATTR_NAME));
+ if (paramElement.hasAttribute(SpringConstant.ATTR_VALUE)) {
+ url.append('=').append(paramElement.getAttribute(SpringConstant.ATTR_VALUE));
}
}
}
12 years, 7 months