JBoss Tools SVN: r39509 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test: src/org/jboss/tools/cdi/bot/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-03-14 11:54:53 -0400 (Wed, 14 Mar 2012)
New Revision: 39509
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/launchers/CDIAllBotTests.launch
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISeam3AllBotTests.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIWizardHelper.java
Log:
CDI bot tests fixing
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/launchers/CDIAllBotTests.launch
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/launchers/CDIAllBotTests.launch 2012-03-14 15:53:56 UTC (rev 39508)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/launchers/CDIAllBotTests.launch 2012-03-14 15:54:53 UTC (rev 39509)
@@ -45,9 +45,10 @@
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
+<stringAttribute key="testApplication" value="com.jboss.jbds.product.application"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
+<booleanAttribute key="useProduct" value="false"/>
</launchConfiguration>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2012-03-14 15:53:56 UTC (rev 39508)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2012-03-14 15:54:53 UTC (rev 39509)
@@ -85,9 +85,9 @@
IBindingValidationQuickFixTest.class,
OpenOnTest.class,
FindObserverForEventTest.class,
- Seam3ResourceOpenOnTest.class,
- Seam3GenericOpenOnTest.class,
- Seam3ConfigValidationTest.class,
+// Seam3ResourceOpenOnTest.class,
+// Seam3GenericOpenOnTest.class,
+// Seam3ConfigValidationTest.class,
})
public class CDIAllBotTests extends AbstractTestSuite {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISeam3AllBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISeam3AllBotTests.java 2012-03-14 15:53:56 UTC (rev 39508)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISeam3AllBotTests.java 2012-03-14 15:54:53 UTC (rev 39509)
@@ -11,7 +11,6 @@
package org.jboss.tools.cdi.bot.test;
-import org.jboss.tools.cdi.bot.test.seam3.Seam3ConfigValidationTest;
import org.jboss.tools.cdi.bot.test.seam3.Seam3GenericOpenOnTest;
import org.jboss.tools.cdi.bot.test.seam3.Seam3ResourceOpenOnTest;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
@@ -42,7 +41,7 @@
@SuiteClasses({
Seam3ResourceOpenOnTest.class,
Seam3GenericOpenOnTest.class,
- Seam3ConfigValidationTest.class,
+// Seam3ConfigValidationTest.class,
})
public class CDISeam3AllBotTests extends AbstractTestSuite {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java 2012-03-14 15:53:56 UTC (rev 39508)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java 2012-03-14 15:54:53 UTC (rev 39509)
@@ -10,7 +10,9 @@
******************************************************************************/
package org.jboss.tools.cdi.bot.test;
+import org.jboss.tools.cdi.bot.test.beansxml.BeansXMLValidationTest;
import org.jboss.tools.cdi.bot.test.editor.BeansEditorTest;
+import org.jboss.tools.cdi.bot.test.quickfix.injection.ProblemEligibleInjectionTest;
import org.jboss.tools.cdi.bot.test.wizard.CDISupportTest;
import org.jboss.tools.cdi.bot.test.wizard.ConfigurationPresetTest;
import org.jboss.tools.cdi.bot.test.wizard.FacetTest;
@@ -47,6 +49,8 @@
CDISupportTest.class,
WizardTest.class,
BeansEditorTest.class,
+ ProblemEligibleInjectionTest.class,
+ BeansXMLValidationTest.class,
})
public class CDISmokeBotTests extends AbstractTestSuite {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java 2012-03-14 15:53:56 UTC (rev 39508)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java 2012-03-14 15:54:53 UTC (rev 39509)
@@ -37,7 +37,7 @@
@Before
public void prepareWorkspace() {
if (!projectHelper.projectExists(getProjectName())) {
- projectHelper.createCDIProjectWithCDIWizard(getProjectName());
+ projectHelper.createCDIProjectWithDynamicWizard(getProjectName());
}
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIWizardHelper.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIWizardHelper.java 2012-03-14 15:53:56 UTC (rev 39508)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIWizardHelper.java 2012-03-14 15:54:53 UTC (rev 39509)
@@ -41,7 +41,7 @@
public void createCDIComponent(CDIWizardType component, String name,
String packageName, String necessaryParam) {
createComponent(component, name, packageName, necessaryParam);
- util.waitForNonIgnoredJobs();
+// util.waitForNonIgnoredJobs();
/**
* if beans.xml is created as first component in project,
* it is not opened as default ==> there is no active editor
12 years, 8 months
- 1
- 0
JBoss Tools SVN: r39508 - in trunk/struts/tests/org.jboss.tools.struts.ui.bot.test: src/org/jboss/tools/struts/ui/bot/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-03-14 11:53:56 -0400 (Wed, 14 Mar 2012)
New Revision: 39508
Modified:
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/META-INF/MANIFEST.MF
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java
Log:
small struts bot tests fixing
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/META-INF/MANIFEST.MF 2012-03-14 15:51:08 UTC (rev 39507)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/META-INF/MANIFEST.MF 2012-03-14 15:53:56 UTC (rev 39508)
@@ -23,3 +23,4 @@
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: JBoss by Red Hat
+Import-Package: org.hamcrest
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java 2012-03-14 15:51:08 UTC (rev 39507)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java 2012-03-14 15:53:56 UTC (rev 39508)
@@ -52,7 +52,8 @@
AddRemoveStrutsCapabilities.class,
ImportStrutsProjectTest.class,
RenameStrutsConfigXmlFile.class,
- RenameTldFile.class})
+ RenameTldFile.class
+ })
public class StrutsAllBotTests {
public static final String STRUTS_PROJECT_NAME = "strutsTest";
}
\ No newline at end of file
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java 2012-03-14 15:51:08 UTC (rev 39507)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java 2012-03-14 15:53:56 UTC (rev 39508)
@@ -283,7 +283,7 @@
editor = bot.editorByTitle("inputname.jsp");
editor.show();
SWTBotJSPMultiPageEditor editorA = new SWTBotJSPMultiPageEditor(bot.editorByTitle("inputname.jsp").getReference(), new SWTWorkbenchBot());
- editorA.selectTab("Source");
+// editorA.selectTab("Source");
SWTBotStyledText st = editorA.bot().styledText();
st.selectRange(0, 0, st.getText().length());
st.setText(readResource(TutorialTest.class.getResourceAsStream("resources/inputname.jsp.gf")));
@@ -309,7 +309,7 @@
editor = bot.editorByTitle("greeting.jsp");
editor.show();
editorA = new SWTBotJSPMultiPageEditor(bot.editorByTitle("greeting.jsp").getReference(), new SWTWorkbenchBot());
- editorA.selectTab("Source");
+// editorA.selectTab("Source");
st = editorA.bot().styledText();
st.selectRange(0, 0, st.getText().length());
st.setText(readResource(TutorialTest.class.getResourceAsStream("resources/greeting.jsp.gf")));
@@ -323,7 +323,7 @@
editor = bot.editorByTitle("index.jsp");
editor.show();
editorA = new SWTBotJSPMultiPageEditor(bot.editorByTitle("index.jsp").getReference(), new SWTWorkbenchBot());
- editorA.selectTab("Source");
+// editorA.selectTab("Source");
st = bot.styledText();
st.selectRange(0, 0, st.getText().length());
st.setText(readResource(TutorialTest.class.getResourceAsStream("resources/index.jsp.gf")));
@@ -428,7 +428,7 @@
nodeContextMenu(tree, ti, "Open").click();
SWTBotJSPMultiPageEditor jspEditor = new SWTBotJSPMultiPageEditor(bot.editorByTitle("inputname.jsp").getReference(), new SWTWorkbenchBot());
- jspEditor.selectTab("Source");
+// jspEditor.selectTab("Source");
SWTBotStyledText st = jspEditor.bot().styledText();
st.selectRange(0, 0, st.getText().length());
st.setText(readResource(TutorialTest.class.getResourceAsStream("resources/inputname63.jsp.gf")));
12 years, 8 months
- 1
- 0
JBoss Tools SVN: r39507 - in trunk/build: tycho-plugins/generate-repository-facade/src/main/java/org/jboss/tools/tycho/sitegenerator and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-03-14 11:51:08 -0400 (Wed, 14 Mar 2012)
New Revision: 39507
Modified:
trunk/build/publish.sh
trunk/build/tycho-plugins/generate-repository-facade/src/main/java/org/jboss/tools/tycho/sitegenerator/GenerateRepositoryFacadeMojo.java
Log:
JBIDE-10923
Fix publish script and generate-repository-facade Maven plugin to support <artifactId>.zip
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2012-03-14 15:39:10 UTC (rev 39506)
+++ trunk/build/publish.sh 2012-03-14 15:51:08 UTC (rev 39507)
@@ -62,6 +62,11 @@
siteZip=${WORKSPACE}/sources/site/target/site_assembly.zip
else
siteZip=${WORKSPACE}/sources/site/target/repository.zip
+ # JBIDE-10923
+ currentDir=$(pwd)
+ cd ${WORKSPACE}/sources/site/target/repository
+ zip -r $siteZip .
+ cd $currentDir
fi
z=$siteZip
fi
Modified: trunk/build/tycho-plugins/generate-repository-facade/src/main/java/org/jboss/tools/tycho/sitegenerator/GenerateRepositoryFacadeMojo.java
===================================================================
--- trunk/build/tycho-plugins/generate-repository-facade/src/main/java/org/jboss/tools/tycho/sitegenerator/GenerateRepositoryFacadeMojo.java 2012-03-14 15:39:10 UTC (rev 39506)
+++ trunk/build/tycho-plugins/generate-repository-facade/src/main/java/org/jboss/tools/tycho/sitegenerator/GenerateRepositoryFacadeMojo.java 2012-03-14 15:51:08 UTC (rev 39507)
@@ -137,7 +137,7 @@
}
- File repoZipFile = new File(project.getBuild().getDirectory(), "repository.zip");
+ File repoZipFile = new File(project.getBuild().getDirectory(), project.getArtifactId() + ".zip");
repoZipFile.delete();
try {
ZipArchiver archiver = new ZipArchiver();
12 years, 8 months
- 1
- 0
JBoss Tools SVN: r39506 - trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-03-14 11:39:10 -0400 (Wed, 14 Mar 2012)
New Revision: 39506
Removed:
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/screenshots/
Log:
freemarker bot test cleanup
12 years, 8 months
- 1
- 0
JBoss Tools SVN: r39505 - in trunk/freemarker/tests: org.jboss.tools.freemarker.ui.bot.test and 27 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-03-14 11:37:43 -0400 (Wed, 14 Mar 2012)
New Revision: 39505
Added:
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/.classpath
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/.project
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/.settings/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/.settings/org.eclipse.jdt.core.prefs
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/.settings/org.jboss.ide.eclipse.as.core.prefs
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/META-INF/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/META-INF/MANIFEST.MF
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/bin/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/build.properties
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/ftl/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/ftl/pet.ftl
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/ftl/welcome.ftl
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/launcher/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/launcher/freemaker.launch
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/fm-output.txt
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/.classpath
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/.project
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/.settings/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/.settings/org.eclipse.jdt.core.prefs
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/META-INF/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/META-INF/MANIFEST.MF
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/bin/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/bin/welcome.ftl
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/build.properties
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/empty/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/ftl/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/ftl/welcome.ftl
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/resource/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/resource/welcome.ftl
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/src/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/src/org/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/src/org/jboss/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/src/org/jboss/tools/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/src/org/jboss/tools/freemarker/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/src/org/jboss/tools/freemarker/testprj/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/src/org/jboss/tools/freemarker/testprj/Activator.java
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/src/org/jboss/tools/freemarker/testprj/FMTest.java
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/screenshots/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/screenshots/FreeMarkerTest(org.jboss.tools.freemaker.ui.bot.test.FreeMarkerTest).jpeg
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/screenshots/FreeMarkerTest(org.jboss.tools.freemarker.ui.bot.test.FreeMarkerTest).jpeg
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/Activator.java
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/FreeMarkerSuite.java
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/FreeMarkerTest.java
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/Tree.java
Log:
initial freemarker bot test
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/.classpath
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/.classpath (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/.classpath 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="ftl"/>
+ <classpathentry kind="lib" path="/home/jpeterka/lib/hamcrest/hamcrest-core-1.2.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/.project
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/.project (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/.project 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.freemarker.ui.bot.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/.settings/org.eclipse.jdt.core.prefs 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,7 @@
+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
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/.settings/org.jboss.ide.eclipse.as.core.prefs
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/.settings/org.jboss.ide.eclipse.as.core.prefs (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/.settings/org.jboss.ide.eclipse.as.core.prefs 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.jboss.ide.eclipse.as.core.singledeployable.deployableList=
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/META-INF/MANIFEST.MF (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/META-INF/MANIFEST.MF 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Freemarker UI Bot Test
+Bundle-SymbolicName: org.jboss.tools.freemarker.ui.bot.test
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.jboss.tools.freemarker.ui.bot.test.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.swtbot.go;bundle-version="2.0.5",
+ org.jboss.ide.eclipse.freemarker;bundle-version="1.2.0",
+ org.jboss.tools.ui.bot.ext;bundle-version="3.2.0"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/build.properties
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/build.properties (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/build.properties 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ resources/
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/ftl/pet.ftl
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/ftl/pet.ftl (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/ftl/pet.ftl 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Page for ${pet}!</title>
+</head>
+<body>
+ ${pet} does ${number} little hops :)
+</body>
+</html>
\ No newline at end of file
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/ftl/welcome.ftl
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/ftl/welcome.ftl (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/ftl/welcome.ftl 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,10 @@
+<html>
+<head>
+ <title>Welcome!</title>
+</head>
+<body>
+ <h1>Welcome ${user}!</h1>
+ <p>Our latest product:
+ <a href="${latestProduct.url}">${latestProduct.name}</a>!
+</body>
+</html>
\ No newline at end of file
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/launcher/freemaker.launch
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/launcher/freemaker.launch (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/launcher/freemaker.launch 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/FreeMarkerTest.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":1"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.freemarker.ui.bot.test.FreeMarkerTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.freemarker.ui.bot.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx512m -Dusage_reporting_enabled=false"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/fm-output.txt
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/fm-output.txt (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/fm-output.txt 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Page for Bunny!</title>
+</head>
+<body>
+ Bunny does 6 little hops :)
+</body>
+</html>
\ No newline at end of file
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/.classpath
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/.classpath (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/.classpath 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="resource"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/.project
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/.project (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/.project 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.freemarker.testprj</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/.settings/org.eclipse.jdt.core.prefs 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,7 @@
+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
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/META-INF/MANIFEST.MF
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/META-INF/MANIFEST.MF (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/META-INF/MANIFEST.MF 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Testprj
+Bundle-SymbolicName: org.jboss.tools.freemarker.testprj
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.jboss.tools.freemarker.testprj.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.jboss.ide.eclipse.freemarker;bundle-version="1.2.0"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/bin/welcome.ftl
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/bin/welcome.ftl (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/bin/welcome.ftl 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Page for ${pet}!</title>
+</head>
+<body>
+ ${pet} does ${number} little hops :)
+</body>
+</html>
\ No newline at end of file
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/build.properties
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/build.properties (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/build.properties 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/ftl/welcome.ftl
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/ftl/welcome.ftl (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/ftl/welcome.ftl 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,10 @@
+<html>
+<head>
+ <title>Welcome!</title>
+</head>
+<body>
+ <h1>Welcome ${user}!</h1>
+ <p>Our latest product:
+ <a href="${latestProduct.url}">${latestProduct.name}</a>!
+</body>
+</html>
\ No newline at end of file
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/resource/welcome.ftl
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/resource/welcome.ftl (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/resource/welcome.ftl 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Page for ${pet}!</title>
+</head>
+<body>
+ ${pet} does ${number} little hops :)
+</body>
+</html>
\ No newline at end of file
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/src/org/jboss/tools/freemarker/testprj/Activator.java
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/src/org/jboss/tools/freemarker/testprj/Activator.java (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/src/org/jboss/tools/freemarker/testprj/Activator.java 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,50 @@
+package org.jboss.tools.freemarker.testprj;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.jboss.tools.freemarker.testprj"; //$NON-NLS-1$
+
+ // The shared instance
+ private static Activator plugin;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+}
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/src/org/jboss/tools/freemarker/testprj/FMTest.java
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/src/org/jboss/tools/freemarker/testprj/FMTest.java (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/resources/prj/org.jboss.tools.freemarker.testprj/src/org/jboss/tools/freemarker/testprj/FMTest.java 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,44 @@
+package org.jboss.tools.freemarker.testprj;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+
+public class FMTest {
+ public static void main(String[] args) throws IOException {
+ FMTest test = new FMTest();
+ test.perform();
+ }
+
+ public void perform() {
+ // Add the values in the datamodel
+ Map<String,Object> datamodel = new HashMap<String,Object>();
+ datamodel.put("pet", "Bunny");
+ datamodel.put("number", new Integer(6));
+ try {
+
+ freemarkerDo(datamodel, "welcome.ftl");
+ }
+
+ catch (Exception e) {
+ System.out.println("Exception");
+ System.out.println(e.getLocalizedMessage());
+
+ }
+ }
+
+ public void freemarkerDo(Map datamodel, String template) throws Exception {
+ Configuration cfg = new Configuration();
+ cfg.setClassForTemplateLoading(this.getClass(), "/");
+ Template tpl = cfg.getTemplate(template);
+ OutputStreamWriter output = new OutputStreamWriter(System.out);
+ tpl.process(datamodel, output);
+ }
+}
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/screenshots/FreeMarkerTest(org.jboss.tools.freemaker.ui.bot.test.FreeMarkerTest).jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/screenshots/FreeMarkerTest(org.jboss.tools.freemaker.ui.bot.test.FreeMarkerTest).jpeg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/screenshots/FreeMarkerTest(org.jboss.tools.freemarker.ui.bot.test.FreeMarkerTest).jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/screenshots/FreeMarkerTest(org.jboss.tools.freemarker.ui.bot.test.FreeMarkerTest).jpeg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/Activator.java
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/Activator.java (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/Activator.java 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,50 @@
+package org.jboss.tools.freemarker.ui.bot.test;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.jboss.tools.freemarker.ui.bot.test"; //$NON-NLS-1$
+
+ // The shared instance
+ private static Activator plugin;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+}
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/FreeMarkerSuite.java
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/FreeMarkerSuite.java (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/FreeMarkerSuite.java 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,11 @@
+package org.jboss.tools.freemarker.ui.bot.test;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+(a)RunWith(Suite.class)
+(a)SuiteClasses({FreeMarkerTest.class})
+public class FreeMarkerSuite {
+
+}
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/FreeMarkerTest.java
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/FreeMarkerTest.java (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/FreeMarkerTest.java 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,185 @@
+package org.jboss.tools.freemarker.ui.bot.test;
+
+import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellCloses;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
+import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
+import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
+import org.jboss.tools.ui.bot.ext.helper.FileHelper;
+import org.jboss.tools.ui.bot.ext.helper.ImportHelper;
+import org.jboss.tools.ui.bot.ext.helper.ResourceHelper;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.ui.bot.ext.view.ConsoleView;
+import org.jboss.tools.ui.bot.ext.view.ErrorLogView;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Freemarker ui bot test
+ * @author jpeterka
+ *
+ */
+(a)RunWith(SWTBotJunit4ClassRunner.class)
+public class FreeMarkerTest extends SWTTestExt {
+
+ private String prj = "org.jboss.tools.freemarker.testprj";
+
+ @BeforeClass
+ public static void beforeClass() {
+ eclipse.closeView(IDELabel.View.WELCOME);
+ eclipse.closeView(IDELabel.View.JBOSS_CENTRAL);
+ eclipse.closeAllEditors();
+ }
+
+ @Test
+ public void emptyTest() {
+ assertTrue(true);
+ }
+
+ @Test
+ public void FreeMarkerTest() {
+ emptyErrorLog();
+ importTestProject();
+ openFTLFileInEditor();
+ checkFreemMarkerOutput();
+ checkErrorLog();
+ }
+
+ private void importTestProject() {
+ String rpath = ResourceHelper.getResourceAbsolutePath(
+ Activator.PLUGIN_ID, "resources/prj");
+ String wpath = ResourceHelper.getWorkspaceAbsolutePath();
+ File rfile = new File(rpath);
+ File wfile = new File(wpath);
+ try {
+ FileHelper.copyFilesBinaryRecursively(rfile, wfile, null);
+ } catch (IOException e) {
+ fail("Unable to copy freemarker test project");
+ }
+ ImportHelper.importAllProjects(wpath);
+ util.waitForNonIgnoredJobs();
+ }
+
+ private void openFTLFileInEditor() {
+ SWTBotView viewOpen = open
+ .viewOpen(ActionItem.View.GeneralProjectExplorer.LABEL);
+
+ SWTBotTree tree = viewOpen.bot().tree();
+ Tree.open(viewOpen.bot(),prj, "ftl", "welcome.ftl" );
+ SWTBotEditor editor = bot.editorByTitle("welcome.ftl");
+ editor.setFocus();
+
+ SWTBotView ov = open.viewOpen(ActionItem.View.GeneralOutline.LABEL);
+ SWTBotTreeItem[] allItems = ov.bot().tree().getAllItems();
+ List<String> list = new ArrayList<String>();
+ for (SWTBotTreeItem i : allItems) {
+ list.add(i.getText());
+ }
+ assertTrue(list.contains("user"));
+ assertTrue(list.contains("latestProduct.name"));
+
+ // https://issues.jboss.org/browse/JBIDE-11287
+ // remove comment when this jira is fixed
+ //assertTrue(list.contains("latestProduct.url"));
+ }
+
+ private void emptyErrorLog() {
+ ErrorLogView el = new ErrorLogView();
+ el.delete();
+ util.waitForNonIgnoredJobs();
+ }
+
+ private void checkErrorLog() {
+ ErrorLogView el = new ErrorLogView();
+ int count = el.getRecordCount();
+ if (count > 0) {
+ el.logMessages();
+ // Ignored for now
+ // fail("Unexpected messages in Error log, see test log");
+ }
+ }
+
+ private void checkFreemMarkerOutput() {
+
+ String outputExpected = "";
+ String rpath = ResourceHelper.getResourceAbsolutePath(
+ Activator.PLUGIN_ID, "resources/fm-output.txt");
+ try {
+ outputExpected = readTextFileToString(rpath);
+ log.info("------------------------------------------");
+ log.info(outputExpected);
+ log.info("------------------------------------------");
+ } catch (IOException e) {
+ log.error(e.getMessage());
+ new RuntimeException("Unable to read from resource");
+ }
+
+ SWTBotView viewConsole = open.viewOpen(ActionItem.View.GeneralConsole.LABEL);
+ ConsoleView cv = new ConsoleView();
+ cv.clearConsole();
+
+ SWTBotView viewOpen = open
+ .viewOpen(ActionItem.View.GeneralProjectExplorer.LABEL);
+
+ SWTBotTreeItem item = Tree.select(viewOpen.bot(), prj,"src","org.jboss.tools.freemarker.testprj","FMTest.java");
+ ContextMenuHelper.clickContextMenu(viewOpen.bot().tree(),"Run As","2 Java Application");
+ SWTBotShell s = bot.shell("Progress Information");
+ bot.waitUntil(shellCloses(s));
+
+ SWTBotView consoleView = open.viewOpen(ActionItem.View.GeneralConsole.LABEL);
+ String consoleText = cv.getConsoleText(TIME_1S, TIME_10S, true);
+
+ bot.waitUntil(shellCloses(s));
+
+ assertTrue("Output equal check",consoleText.equals(outputExpected));
+ bot.sleep(TIME_10S);
+ }
+
+ private String readTextFileToString(String filePath) throws IOException {
+ BufferedReader br = null;
+ try {
+ br = new BufferedReader(new FileReader(filePath));
+ } catch (FileNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ try {
+ StringBuilder sb = new StringBuilder();
+ String line = br.readLine();
+
+ while (line != null) {
+ sb.append(line);
+ line = br.readLine();
+ if (line != null)
+ sb.append("\n");
+ }
+ String everything = sb.toString();
+ return everything;
+ } finally {
+ br.close();
+ }
+ }
+
+ @AfterClass
+ public static void aterClass() {
+ // wait for all jobs
+ util.waitForAll();
+ }
+
+}
Added: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/Tree.java
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/Tree.java (rev 0)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/src/org/jboss/tools/freemarker/ui/bot/test/Tree.java 2012-03-14 15:37:43 UTC (rev 39505)
@@ -0,0 +1,115 @@
+package org.jboss.tools.freemarker.ui.bot.test;
+
+import static org.junit.Assert.fail;
+
+import org.apache.log4j.Logger;
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+
+/**
+ * Tree extension for bad trees
+ * @author jpeterka
+ *
+ */
+public class Tree {
+
+ private static Logger log = Logger.getLogger(Tree.class);
+
+ public static SWTBotTreeItem select(SWTBot bot, String... items) {
+ SWTBotTreeItem item = expand(bot, items);
+ item.select();
+ return item;
+ }
+
+ public static SWTBotTreeItem open(SWTBot bot, String... items) {
+ SWTBotTreeItem item = select(bot, items);
+ item.doubleClick();
+ return item;
+ }
+
+ public static SWTBotTreeItem expand(SWTBot bot, String... items) {
+ SWTBotTree tree = bot.tree();
+ SWTBotTreeItem nextItem = tree.getTreeItem(items[0]);
+ SWTBotTreeItem item = null;
+ final int sleep = 1000; // 1s
+ final int limit = 5; // 5 cycles max
+
+ for (int i = 0 ; i < items.length - 1; i++ ) {
+ item = nextItem;
+ expandNode(item);
+ boolean ok = findChild(item,items[i+1]);
+ // 1st cure - time
+ if (!ok) {
+ log.info("Nok: 1st round");
+ int counter = 0;
+ while (counter < limit) {
+ bot.sleep(sleep);
+ ok = findChild(item, items[i+1]);
+ if (!ok) {
+ counter++;
+ }
+ else break;
+ }
+ }
+ // 2nd cure (re-colapse/re-expansion)
+ if (!ok) {
+ log.info("Nok: 2nd round");
+ collapseNode(item);
+ expandNode(item);
+ ok = findChild(item,items[i+1]);
+ if (!ok) {
+ int counter = 0;
+ while (counter < limit) {
+ bot.sleep(sleep);
+ ok = findChild(item, items[i+1]);
+ if (!ok) {
+ counter++;
+ }
+ else break;
+ }
+ }
+ }
+ // 3dr round - final round
+ if (ok) {
+ nextItem = item.getNode(items[i+1]);
+ }
+ else fail("Unable to find node " + items[i+1]);
+ }
+ return nextItem;
+ }
+
+
+ private static void expandNode(SWTBotTreeItem item) {
+ item.expand();
+ if (!item.isExpanded()) {
+ fail("Unable to expand " + item.getText());
+ }
+ }
+
+
+ private static boolean findChild(SWTBotTreeItem item, String newTitle) {
+ boolean res = false;
+
+ // check nodes if they containt what is required
+ if (item.getNodes().contains(newTitle)) {
+ res = true;
+ log.info("Node " + item.getText() + " contains " + newTitle);
+ }
+ else
+ {
+ log.info("Unable to find subnode " + newTitle);
+ }
+ return res;
+
+ }
+
+ private static void collapseNode(SWTBotTreeItem item) {
+ if (item.isExpanded()) {
+ item.collapse();
+ }
+ if (item.isExpanded()) {
+ fail("Unable to collapse" + item.getText());
+ }
+ }
+}
12 years, 8 months
- 1
- 0
JBoss Tools SVN: r39503 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 7 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-14 10:37:16 -0400 (Wed, 14 Mar 2012)
New Revision: 39503
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/AS7DeploymentScannerUtility.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ModifyDeploymentScannerIntervalDialog.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListener.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7DeploymentScannerAdditions.java
trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/ShowConsoleServerStateListener.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathRuntimeListener.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBInitialSelectionProvider.java
Log:
JBIDE-11275 - deployment scanner at 0 shows dialog now in trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListener.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListener.java 2012-03-14 14:34:20 UTC (rev 39502)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListener.java 2012-03-14 14:37:16 UTC (rev 39503)
@@ -12,7 +12,10 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IRuntimeLifecycleListener;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerLifecycleListener;
+import org.eclipse.wst.server.core.IServerListener;
import org.eclipse.wst.server.core.ServerEvent;
/**
@@ -22,7 +25,8 @@
* @author Rob Stryker
*
*/
-public class UnitedServerListener {
+public class UnitedServerListener implements
+ IServerLifecycleListener, IServerListener, IRuntimeLifecycleListener {
public void init(IServer server) {}
public void serverAdded(IServer server) {}
@@ -46,4 +50,18 @@
}
public void runtimeRemoved(IRuntime runtime) {
}
+
+ // Utility method
+ public boolean serverSwitchesToState(ServerEvent event, int state) {
+ int eventKind = event.getKind();
+ if ((eventKind & ServerEvent.SERVER_CHANGE) != 0) {
+ // server change event
+ if ((eventKind & ServerEvent.STATE_CHANGE) != 0) {
+ if( event.getServer().getServerState() == state ) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java 2012-03-14 14:34:20 UTC (rev 39502)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java 2012-03-14 14:37:16 UTC (rev 39503)
@@ -34,10 +34,14 @@
return (ServerExtendedProperties)ret;
}
- @Override
public Object getAdapter(Object adaptableObject, Class adapterType) {
- if( adapterType != ServerExtendedProperties.class )
- return null;
+ ServerExtendedProperties props = getExtendedProperties(adaptableObject);
+ if( adapterType.isAssignableFrom(props.getClass()))
+ return props;
+ return null;
+ }
+
+ public ServerExtendedProperties getExtendedProperties(Object adaptableObject) {
String typeId = null;
IServer s = null;
IRuntime r = null;
@@ -87,10 +91,12 @@
}
return null;
}
-
- @Override
+
public Class[] getAdapterList() {
- return new Class[]{ ServerExtendedProperties.class};
+ return new Class[]{ ServerExtendedProperties.class,
+ JBossExtendedProperties.class,
+ JBossAS7ExtendedProperties.class,
+ JBossAS710ExtendedProperties.class};
}
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/AS7DeploymentScannerUtility.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/AS7DeploymentScannerUtility.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/AS7DeploymentScannerUtility.java 2012-03-14 14:37:16 UTC (rev 39503)
@@ -0,0 +1,110 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.core.server.internal.v7;
+
+import java.util.HashMap;
+import java.util.List;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.wst.server.core.IServer;
+import org.jboss.dmr.ModelNode;
+import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.server.v7.management.AS7ManagementDetails;
+import org.jboss.ide.eclipse.as.management.core.IJBoss7ManagerService;
+import org.jboss.ide.eclipse.as.management.core.JBoss7ManagerUtil;
+
+public class AS7DeploymentScannerUtility {
+
+ public IStatus addDeploymentScanner(final IServer server, String scannerName, final String folder) {
+ ModelNode op = new ModelNode();
+ op.get("operation").set("add"); //$NON-NLS-1$ //$NON-NLS-2$
+ ModelNode addr = op.get("address"); //$NON-NLS-1$
+ addr.add("subsystem", "deployment-scanner"); //$NON-NLS-1$//$NON-NLS-2$
+ addr.add("scanner", scannerName); //$NON-NLS-1$
+ op.get("path").set(folder); //$NON-NLS-1$
+ final String request = op.toJSONString(true);
+ return execute(server, request);
+ }
+
+ public IStatus removeDeploymentScanner(final IServer server, String scannerName) {
+ ModelNode op = new ModelNode();
+ op.get("operation").set("remove"); //$NON-NLS-1$ //$NON-NLS-2$
+ ModelNode addr = op.get("address"); //$NON-NLS-1$
+ addr.add("subsystem", "deployment-scanner"); //$NON-NLS-1$//$NON-NLS-2$
+ addr.add("scanner", scannerName); //$NON-NLS-1$
+ final String request = op.toJSONString(true);
+ return execute(server, request);
+ }
+
+ public boolean updateDeploymentScannerInterval(final IServer server, String scannerName, int newValue) {
+ ModelNode op = new ModelNode();
+ op.get("operation").set("write-attribute"); //$NON-NLS-1$ //$NON-NLS-2$
+ op.get("name").set("scan-interval"); //$NON-NLS-1$ //$NON-NLS-2$
+ op.get("value").set(newValue); //$NON-NLS-1$
+ ModelNode addr = op.get("address"); //$NON-NLS-1$
+ addr.add("subsystem", "deployment-scanner"); //$NON-NLS-1$//$NON-NLS-2$
+ addr.add("scanner", scannerName); //$NON-NLS-1$
+ final String request = op.toJSONString(true);
+ try {
+ executeWithResult(server, request);
+ } catch(Exception e) {
+ return false;
+ }
+ return true;
+ }
+
+ public HashMap<String, Integer> getDeploymentScannerIntervals(final IServer server) {
+ ModelNode op = new ModelNode();
+ op.get("operation").set("read-attribute"); //$NON-NLS-1$ //$NON-NLS-2$
+ op.get("name").set("scan-interval"); //$NON-NLS-1$ //$NON-NLS-2$
+ ModelNode addr = op.get("address"); //$NON-NLS-1$
+ addr.add("subsystem", "deployment-scanner"); //$NON-NLS-1$//$NON-NLS-2$
+ addr.add("scanner", "*"); //$NON-NLS-1$ //$NON-NLS-2$
+ final String request = op.toJSONString(true);
+ ModelNode response = null;
+ try {
+ response = executeWithResult(server, request);
+ } catch(Exception e) {
+ return new HashMap<String, Integer>();
+ }
+
+ HashMap<String, Integer> retval=new HashMap<String, Integer>();
+ List<ModelNode> list = response.asList();
+ for( int i = 0; i <list.size(); i++ ) {
+ ModelNode address = list.get(i).get("address"); //$NON-NLS-1$
+ String scannerName = address.asList().get(1).get("scanner").asString(); //$NON-NLS-1$
+ ModelNode intVal = list.get(i).get("result"); //$NON-NLS-1$
+ int intVal2 = intVal.asBigInteger().intValue();
+ retval.put(scannerName, new Integer(intVal2));
+ }
+ return retval;
+ }
+
+ protected IStatus execute(final IServer server, final String request) {
+ try {
+ ModelNode node = executeWithResult(server, request);
+ return Status.OK_STATUS;
+ } catch( Exception e ) {
+ // TODO Throw new checked exception
+ return new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, e.getMessage(), e);
+ }
+ }
+ protected ModelNode executeWithResult(final IServer server, final String request) throws Exception {
+ String resultJSON = JBoss7ManagerUtil.executeWithService(new JBoss7ManagerUtil.IServiceAware<String>() {
+ public String execute(IJBoss7ManagerService service) throws Exception {
+ return service.execute(new AS7ManagementDetails(server), request);
+ }
+ }, server);
+ ModelNode result = ModelNode.fromJSONString(resultJSON);
+ return result;
+ }
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7DeploymentScannerAdditions.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7DeploymentScannerAdditions.java 2012-03-14 14:34:20 UTC (rev 39502)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7DeploymentScannerAdditions.java 2012-03-14 14:37:16 UTC (rev 39503)
@@ -89,13 +89,14 @@
}
}
+ AS7DeploymentScannerUtility util = new AS7DeploymentScannerUtility();
// Do the removes
Iterator<String> i = removed.iterator();
String scannerName = null;
while(i.hasNext()) {
scannerName = i.next();
- IStatus s = removeOneFolder(server, scannerName);
+ IStatus s = util.removeDeploymentScanner(server, scannerName);
if( s.isOK()) {
props.remove(scannerName);
}
@@ -108,7 +109,7 @@
while(i.hasNext()) {
path = i.next();
newScannerName = findNextScannerName(props);
- IStatus s = addOneFolder(server, newScannerName, path);
+ IStatus s = util.addDeploymentScanner(server, newScannerName, path);
if( s.isOK()){
props.put(newScannerName, path);
}
@@ -135,55 +136,9 @@
return SCANNER_PREFIX + i;
}
- protected IStatus addOneFolder(final IServer server, String scannerName, final String folder) {
- ModelNode op = new ModelNode();
- op.get("operation").set("add"); //$NON-NLS-1$ //$NON-NLS-2$
- ModelNode addr = op.get("address"); //$NON-NLS-1$
- addr.add("subsystem", "deployment-scanner"); //$NON-NLS-1$//$NON-NLS-2$
- addr.add("scanner", scannerName); //$NON-NLS-1$
- op.get("path").set(folder); //$NON-NLS-1$
- final String request = op.toJSONString(true);
- return execute(server, request);
- }
-
- protected IStatus removeOneFolder(final IServer server, String scannerName) {
- ModelNode op = new ModelNode();
- op.get("operation").set("remove"); //$NON-NLS-1$ //$NON-NLS-2$
- ModelNode addr = op.get("address"); //$NON-NLS-1$
- addr.add("subsystem", "deployment-scanner"); //$NON-NLS-1$//$NON-NLS-2$
- addr.add("scanner", scannerName); //$NON-NLS-1$
- final String request = op.toJSONString(true);
- return execute(server, request);
- }
-
- protected IStatus execute(final IServer server, final String request) {
- try {
- String resultJSON = JBoss7ManagerUtil.executeWithService(new JBoss7ManagerUtil.IServiceAware<String>() {
- public String execute(IJBoss7ManagerService service) throws Exception {
- return service.execute(new AS7ManagementDetails(server), request);
- }
- }, server);
- ModelNode result = ModelNode.fromJSONString(resultJSON);
- return Status.OK_STATUS;
- } catch( Exception e ) {
- // TODO Throw new checked exception
- return new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, e.getMessage(), e);
- }
- }
-
-
public void serverChanged(ServerEvent event) {
- IServer server = event.getServer();
- if( accepts(server)) {
- int eventKind = event.getKind();
- if ((eventKind & ServerEvent.SERVER_CHANGE) != 0) {
- // server change event
- if ((eventKind & ServerEvent.STATE_CHANGE) != 0) {
- if( event.getServer().getServerState() == IServer.STATE_STARTED ) {
- modifyDeploymentScanners(event);
- }
- }
- }
+ if( accepts(event.getServer()) && serverSwitchesToState(event, IServer.STATE_STARTED)){
+ modifyDeploymentScanners(event);
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.java 2012-03-14 14:34:20 UTC (rev 39502)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.java 2012-03-14 14:37:16 UTC (rev 39503)
@@ -42,6 +42,10 @@
return false;
}
+ protected void verifyPrimaryScannerEnablement() {
+ // Do Nothing
+ }
+
protected void modifyDeploymentScanners(ServerEvent event){
String[] folders = getDeployLocationFolders(event.getServer());
if( folders.length > 0 )
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2012-03-14 14:34:20 UTC (rev 39502)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2012-03-14 14:37:16 UTC (rev 39503)
@@ -1,24 +1,13 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.ui;
import java.util.MissingResourceException;
@@ -37,6 +26,7 @@
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.server.UnitedServerListenerManager;
import org.jboss.ide.eclipse.as.ui.console.ShowConsoleServerStateListener;
+import org.jboss.ide.eclipse.as.ui.dialogs.ModifyDeploymentScannerIntervalDialog.DeploymentScannerUIServerStartedListener;
import org.jboss.ide.eclipse.as.ui.dialogs.ServerAlreadyStartedDialog.ServerAlreadyStartedHandler;
import org.jboss.ide.eclipse.as.ui.views.server.extensions.XPathRuntimeListener;
import org.jboss.ide.eclipse.as.ui.wizards.JBInitialSelectionProvider;
@@ -66,12 +56,14 @@
}
private static JBInitialSelectionProvider selectionProvider;
+ private static DeploymentScannerUIServerStartedListener as7ScannerAssist;
/**
* This method is called upon plug-in activation
*/
public void start(BundleContext context) throws Exception {
super.start(context);
selectionProvider = new JBInitialSelectionProvider();
+ as7ScannerAssist = new DeploymentScannerUIServerStartedListener();
Preferences prefs = getPluginPreferences();
if( !prefs.getBoolean(IPreferenceKeys.ENABLED_DECORATORS)) {
@@ -87,6 +79,7 @@
}
savePluginPreferences();
UnitedServerListenerManager.getDefault().addListener(ShowConsoleServerStateListener.getDefault());
+ UnitedServerListenerManager.getDefault().addListener(as7ScannerAssist);
ServerCore.addServerLifecycleListener(selectionProvider);
ServerCore.addRuntimeLifecycleListener(XPathRuntimeListener.getDefault());
ExtensionManager.getDefault().setAlreadyStartedHandler(new ServerAlreadyStartedHandler());
@@ -100,6 +93,7 @@
ServerCore.removeRuntimeLifecycleListener(XPathRuntimeListener.getDefault());
ServerCore.removeServerLifecycleListener(selectionProvider);
UnitedServerListenerManager.getDefault().removeListener(ShowConsoleServerStateListener.getDefault());
+ UnitedServerListenerManager.getDefault().removeListener(as7ScannerAssist);
JBossServerUISharedImages.instance().cleanup();
super.stop(context);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/ShowConsoleServerStateListener.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/ShowConsoleServerStateListener.java 2012-03-14 14:34:20 UTC (rev 39502)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/ShowConsoleServerStateListener.java 2012-03-14 14:37:16 UTC (rev 39503)
@@ -34,35 +34,26 @@
public void serverChanged(ServerEvent event) {
final IServer server = event.getServer();
JBossServer jbs = (JBossServer)server.loadAdapter(JBossServer.class, new NullProgressMonitor());
- if( jbs != null ) {
- int eventKind = event.getKind();
- if ((eventKind & ServerEvent.SERVER_CHANGE) != 0) {
- // server change event
- if ((eventKind & ServerEvent.STATE_CHANGE) != 0) {
- if( event.getServer().getServerState() == IServer.STATE_STARTING ) {
- // do not launch console for remotes, for now
- String type = DeploymentPreferenceLoader.getCurrentDeploymentMethodTypeId(server, LocalPublishMethod.LOCAL_PUBLISH_METHOD);
- if( !type.equals(LocalPublishMethod.LOCAL_PUBLISH_METHOD))
- return;
-
- new Thread() {
- public void run() {
- try {
- // delay to insure the server gets a chance to actually launch
- Thread.sleep(3000);
- } catch(InterruptedException ie) {}
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- ILaunch launch = server.getLaunch();
- if( launch != null && launch.getProcesses().length > 0)
- new ShowInConsoleAction(getNullSelectionProvider()).perform(server);
- }
- });
- }
- }.start();
- }
+ if( jbs != null && serverSwitchesToState(event, IServer.STATE_STARTING)) {
+ // do not launch console for remotes, for now
+ String type = DeploymentPreferenceLoader.getCurrentDeploymentMethodTypeId(server, LocalPublishMethod.LOCAL_PUBLISH_METHOD);
+ if( !type.equals(LocalPublishMethod.LOCAL_PUBLISH_METHOD))
+ return;
+ new Thread() {
+ public void run() {
+ try {
+ // delay to insure the server gets a chance to actually launch
+ Thread.sleep(3000);
+ } catch(InterruptedException ie) {}
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ ILaunch launch = server.getLaunch();
+ if( launch != null && launch.getProcesses().length > 0)
+ new ShowInConsoleAction(getNullSelectionProvider()).perform(server);
+ }
+ });
}
- }
+ }.start();
}
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ModifyDeploymentScannerIntervalDialog.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ModifyDeploymentScannerIntervalDialog.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ModifyDeploymentScannerIntervalDialog.java 2012-03-14 14:37:16 UTC (rev 39503)
@@ -0,0 +1,293 @@
+/*******************************************************************************
+* Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.ui.dialogs;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.ICellModifier;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerEvent;
+import org.jboss.ide.eclipse.as.core.server.UnitedServerListener;
+import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossExtendedProperties;
+import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.AS7DeploymentScannerUtility;
+import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
+import org.osgi.service.prefs.BackingStoreException;
+
+public class ModifyDeploymentScannerIntervalDialog extends TitleAreaDialog {
+
+ public static final String AS7_IGNORE_ZERO_INTERVAL_SCANNER_SETTING = "AS7_IGNORE_ZERO_INTERVAL_SCANNER_SETTING"; //$NON-NLS-1$
+
+ public static class DeploymentScannerUIServerStartedListener extends UnitedServerListener {
+ public void serverChanged(ServerEvent event) {
+ IServer s = event.getServer();
+ JBossExtendedProperties props = (JBossExtendedProperties)
+ s.loadAdapter(JBossExtendedProperties.class, null);
+ if( props != null && props.getMultipleDeployFolderSupport() == ServerExtendedProperties.DEPLOYMENT_SCANNER_AS7_MANAGEMENT_SUPPORT) {
+ if( serverSwitchesToState(event, IServer.STATE_STARTED)) {
+ // Don't do any potentially long-running tasks here.
+ launchJob(s);
+ }
+ }
+ }
+
+ private void launchJob(final IServer server) {
+ new Job("Checking Deployment Scanners for server") {
+ protected IStatus run(IProgressMonitor monitor) {
+ IEclipsePreferences prefs = InstanceScope.INSTANCE.getNode(JBossServerUIPlugin.PLUGIN_ID);
+ boolean ignore = prefs.getBoolean(AS7_IGNORE_ZERO_INTERVAL_SCANNER_SETTING, false);
+ if( !ignore ) {
+ final HashMap<String, Integer> map =
+ new AS7DeploymentScannerUtility().getDeploymentScannerIntervals(server);
+ if( hasScannersAtZero(server,map)) {
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ // NOW launch the dialog
+ launchDialog(server, map);
+ }
+ });
+ }
+ }
+ return Status.OK_STATUS;
+ }
+ }.schedule();
+ }
+
+ private void launchDialog(final IServer server, HashMap<String, Integer> map) {
+ ModifyDeploymentScannerIntervalDialog d =
+ new ModifyDeploymentScannerIntervalDialog(
+ server, map,
+ Display.getDefault().getActiveShell());
+ d.open();
+
+ final ArrayList<String> changed = d.getChanged();
+ final HashMap<String, Integer> changedMap = d.getChangedMap();
+ boolean neverAskAgainSetting = d.getAskAgainSelection();
+
+ if( neverAskAgainSetting ) {
+ IEclipsePreferences prefs = InstanceScope.INSTANCE.getNode(JBossServerUIPlugin.PLUGIN_ID);
+ prefs.putBoolean(AS7_IGNORE_ZERO_INTERVAL_SCANNER_SETTING, true);
+ try {
+ prefs.flush();
+ } catch(BackingStoreException e) {
+ }
+ }
+
+ if( changed.size() > 0 ) {
+ new Job("Updating server's deployment scanners") {
+ protected IStatus run(IProgressMonitor monitor) {
+ return updateServersScanners(server, changed, changedMap);
+ }
+ }.schedule();
+ }
+ }
+
+ private IStatus updateServersScanners(IServer server, ArrayList<String> changed, HashMap<String, Integer> changedMap) {
+ AS7DeploymentScannerUtility util = new AS7DeploymentScannerUtility();
+ Iterator<String> i = changed.iterator();
+ while(i.hasNext()) {
+ String t = i.next();
+ util.updateDeploymentScannerInterval(server, t, changedMap.get(t).intValue());
+ }
+ return Status.OK_STATUS;
+ }
+
+ private boolean hasScannersAtZero(IServer server, HashMap<String, Integer> map ) {
+ // check if any have 0
+ Iterator<Integer> it = map.values().iterator();
+ while(it.hasNext()) {
+ if( it.next().intValue() <= 0) {
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+
+ private IServer server;
+ private HashMap<String, Integer> map;
+ private TableViewer tv;
+ private ArrayList<String> changed = new ArrayList<String>();
+ private boolean askAgainSelected = false;
+ private String[] headings = new String[]{
+ "Scanner Name", "Scanner Interval"
+ };
+ public ModifyDeploymentScannerIntervalDialog(
+ IServer server, HashMap<String, Integer> map, Shell parentShell) {
+ super(parentShell);
+ this.map = map;
+ this.server = server;
+ }
+
+ public ArrayList<String> getChanged() {
+ return changed;
+ }
+
+ public HashMap<String, Integer> getChangedMap() {
+ return map;
+ }
+
+ public boolean getAskAgainSelection() {
+ return askAgainSelected;
+ }
+
+ protected Control createContents(Composite parent) {
+ Control c = super.createContents(parent);
+ setMessage("One or more deployment scanners have a scan-interval of 0.\nThese scanners are inactive. If this is intentional, press 'OK'.", IMessageProvider.WARNING );
+ setTitle("Inactive Deployment Scanner?");
+ getShell().setText("Inactive Deployment Scanner?");
+ return c;
+ }
+
+ protected void createButtonsForButtonBar(Composite parent) {
+ createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
+ }
+
+ protected Control createDialogArea(Composite parent) {
+ Composite main = new Composite((Composite)super.createDialogArea(parent), SWT.NONE);
+ main.setLayoutData(new GridData(GridData.FILL_BOTH));
+ main.setLayout(new GridLayout(1,false));
+
+ // Add the TableViewer
+ tv = new TableViewer(main, SWT.FULL_SELECTION);
+ tv.setContentProvider(new ScannerContentProvider());
+ tv.setLabelProvider(new ScannerLabelProvider());
+
+ // Set up the table
+ Table table = tv.getTable();
+ table.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+ TableColumn tc1 = new TableColumn(table, SWT.CENTER);
+ tc1.setText(headings[0]);
+ tc1.setWidth(150);
+ TableColumn tc2 = new TableColumn(table, SWT.CENTER);
+ tc2.setText(headings[1]);
+
+ for (int i = 0, n = table.getColumnCount(); i < n; i++) {
+ table.getColumn(i).pack();
+ }
+
+ table.setHeaderVisible(true);
+ table.setLinesVisible(true);
+
+ // Create the cell editors
+ CellEditor[] editors = new CellEditor[4];
+ editors[0] = null;
+ editors[1] = new TextCellEditor(table);
+
+ // Set the editors, cell modifier, and column properties
+ tv.setColumnProperties(headings);
+ tv.setCellModifier(new ScannerCellModifier());
+ tv.setCellEditors(editors);
+
+ tv.setInput(map);
+
+ final Button askAgain = new Button(main, SWT.CHECK);
+ askAgain.setText("Don't ask this again.");
+ askAgain.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ askAgainSelected = askAgain.getSelection();
+ }
+ public void widgetDefaultSelected(SelectionEvent e) {
+ askAgainSelected = askAgain.getSelection();
+ }
+ });
+ return main;
+ }
+
+ private class ScannerContentProvider implements IStructuredContentProvider {
+ public void dispose() {
+ }
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ }
+ public Object[] getElements(Object inputElement) {
+ Set<String> s = map.keySet();
+ return s.toArray(new String[s.size()]);
+ }
+ }
+
+ private class ScannerLabelProvider implements ITableLabelProvider {
+ public String getColumnText(Object element, int columnIndex) {
+ if( columnIndex == 0 )
+ return element.toString();
+ return map.get(element).toString();
+ }
+ public void addListener(ILabelProviderListener listener) {
+ }
+ public void dispose() {
+ }
+ public boolean isLabelProperty(Object element, String property) {
+ return false;
+ }
+ public void removeListener(ILabelProviderListener listener) {
+ }
+ public Image getColumnImage(Object element, int columnIndex) {
+ return null;
+ }
+ }
+
+ private class ScannerCellModifier implements ICellModifier {
+
+ @Override
+ public boolean canModify(Object element, String property) {
+ return property.equals(headings[1]);
+ }
+ public Object getValue(Object element, String property) {
+ return map.get(element).toString();
+ }
+ public void modify(Object element, String property, Object value) {
+ String element2 = ((TableItem)element).getText();
+ if( !value.toString().equals(map.get(element2).toString())) {
+ if( !changed.contains(element2))
+ changed.add(element2);
+ try {
+ map.put(element2, Integer.parseInt(value.toString()));
+ tv.refresh();
+ } catch(NumberFormatException nfe) {
+ // intentionally ignore. Do NOTHING.
+ }
+ }
+ }
+ }
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathRuntimeListener.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathRuntimeListener.java 2012-03-14 14:34:20 UTC (rev 39502)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathRuntimeListener.java 2012-03-14 14:37:16 UTC (rev 39503)
@@ -19,8 +19,9 @@
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathCategory;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathModel;
+import org.jboss.ide.eclipse.as.core.server.UnitedServerListener;
-public class XPathRuntimeListener implements IRuntimeLifecycleListener {
+public class XPathRuntimeListener extends UnitedServerListener {
public static XPathRuntimeListener instance;
public static XPathRuntimeListener getDefault() {
if( instance == null )
@@ -28,14 +29,6 @@
return instance;
}
- protected XPathRuntimeListener() {
-
- }
-
- public void runtimeAdded(IRuntime runtime) {
- }
- public void runtimeRemoved(IRuntime runtime) {
- }
public void runtimeChanged(IRuntime runtime) {
IViewPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView("org.eclipse.wst.server.ui.ServersView");
IServer[] allServers = ServerCore.getServers();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBInitialSelectionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBInitialSelectionProvider.java 2012-03-14 14:34:20 UTC (rev 39502)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBInitialSelectionProvider.java 2012-03-14 14:37:16 UTC (rev 39503)
@@ -10,6 +10,9 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.ui.wizards;
+import java.util.ArrayList;
+import java.util.Arrays;
+
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.wst.server.core.IServer;
@@ -32,36 +35,36 @@
}
public IServerType getInitialSelection(IServerType[] serverTypes) {
+ ArrayList<IServerType> types = new ArrayList<IServerType>();
+ types.addAll(Arrays.asList(serverTypes));
- if (serverTypes == null)
- return null;
-
// Find the last-selected one
- IEclipsePreferences prefs = new InstanceScope().getNode(JBossServerUIPlugin.PLUGIN_ID);
+ IEclipsePreferences prefs = InstanceScope.INSTANCE.getNode(JBossServerUIPlugin.PLUGIN_ID);
String last = prefs.get(LAST_SERVER_CREATED_KEY, null);
- if( last != null ) {
- IServer s = ServerCore.findServer(last);
- if( s != null ) {
- for( int i = 0; i < serverTypes.length; i++ )
- if( serverTypes[i].getId().equals(s.getServerType().getId()))
- return serverTypes[i];
- }
- }
+ IServer lastServer = last == null ? null : ServerCore.findServer(last);
+ IServerType lastType = lastServer == null ? null : lastServer.getServerType();
+ if( lastType != null && types.contains(lastType))
+ return lastType;
- // return default
- int size = serverTypes.length;
- for (int i = 0; i < size; i++) {
- if( serverTypes[i].getId().equals(IJBossToolingConstants.SERVER_AS_51))
- return serverTypes[i];
- }
+ // return default server type
+ IServerType defaultType = getDefaultServerType();
+ if( types.contains(defaultType))
+ return defaultType;
+
+ // Else, just choose whatever they give us
return serverTypes[0];
}
+
+ public IServerType getDefaultServerType() {
+ String newestJBoss = IJBossToolingConstants.SERVER_AS_71;
+ return ServerCore.findServerType(newestJBoss);
+ }
private static String LAST_SERVER_CREATED_KEY = "org.jboss.ide.eclipse.as.ui.wizards.LAST_SERVER_CREATED"; //$NON-NLS-1$
public void serverAdded(IServer server) {
if( server != null ) {
- IEclipsePreferences prefs = new InstanceScope().getNode(JBossServerUIPlugin.PLUGIN_ID);
+ IEclipsePreferences prefs = InstanceScope.INSTANCE.getNode(JBossServerUIPlugin.PLUGIN_ID);
prefs.put(LAST_SERVER_CREATED_KEY, server.getId());
try {
prefs.flush();
12 years, 8 months
- 1
- 0
JBoss Tools SVN: r39502 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2012-03-14 10:34:20 -0400 (Wed, 14 Mar 2012)
New Revision: 39502
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ProjectUtils.java
Log:
https://issues.jboss.org/browse/JBIDE-11103
Filter out non java projects
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ProjectUtils.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ProjectUtils.java 2012-03-14 13:58:50 UTC (rev 39501)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ProjectUtils.java 2012-03-14 14:34:20 UTC (rev 39502)
@@ -312,9 +312,15 @@
}
// insert this in last place
updateCollection(projects, findProject(consoleConfiguration));
- ArrayList<IJavaProject> res = new ArrayList<IJavaProject>();
- for (Iterator<IProject> it = projects.iterator(); it.hasNext();) {
- res.add(JavaCore.create(it.next()));
+ List<IJavaProject> res = new ArrayList<IJavaProject>();
+ for (int i = 0; i < projects.size(); i++) {
+ try {
+ if (projects.get(i).hasNature(JavaCore.NATURE_ID)){
+ res.add(JavaCore.create(projects.get(i)));
+ }
+ } catch (CoreException e) {
+ HibernateConsolePlugin.getDefault().log(e);
+ }
}
return res.toArray(new IJavaProject[0]);
}
12 years, 8 months
- 1
- 0
JBoss Tools SVN: r39501 - in trunk: archives and 32 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-03-14 09:58:50 -0400 (Wed, 14 Mar 2012)
New Revision: 39501
Removed:
trunk/jacoco-jboss/
Modified:
trunk/archives/pom.xml
trunk/as/pom.xml
trunk/birt/pom.xml
trunk/bpel/pom.xml
trunk/bpmn/pom.xml
trunk/cdi/pom.xml
trunk/central/pom.xml
trunk/common/pom.xml
trunk/deltacloud/pom.xml
trunk/esb/pom.xml
trunk/examples/pom.xml
trunk/flow/pom.xml
trunk/forge/pom.xml
trunk/freemarker/pom.xml
trunk/gwt/pom.xml
trunk/hibernatetools/pom.xml
trunk/jbpm/pom.xml
trunk/jmx/pom.xml
trunk/jsf/pom.xml
trunk/jst/pom.xml
trunk/maven/pom.xml
trunk/modeshape/pom.xml
trunk/openshift/pom.xml
trunk/portlet/pom.xml
trunk/runtime/pom.xml
trunk/seam/pom.xml
trunk/smooks/pom.xml
trunk/struts/pom.xml
trunk/tests/pom.xml
trunk/usage/pom.xml
trunk/vpe/pom.xml
trunk/ws/pom.xml
trunk/xulrunner/pom.xml
Log:
JBIDE-11157
Add JBoss repositories reference in components
Modified: trunk/archives/pom.xml
===================================================================
--- trunk/archives/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/archives/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -16,7 +16,21 @@
<module>features</module>
<module>plugins</module>
<module>tests</module>
- <module>site</module>
- </modules>
+ <module>site</module>
+ </modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/as/pom.xml
===================================================================
--- trunk/as/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/as/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -18,5 +18,19 @@
<module>features</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/birt/pom.xml
===================================================================
--- trunk/birt/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/birt/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -16,7 +16,21 @@
<module>features</module>
<module>plugins</module>
<module>tests</module>
- <module>site</module>
- </modules>
+ <module>site</module>
+ </modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/bpel/pom.xml
===================================================================
--- trunk/bpel/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/bpel/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -18,5 +18,19 @@
<module>site</module>
<module>tests</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/bpmn/pom.xml
===================================================================
--- trunk/bpmn/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/bpmn/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -16,9 +16,10 @@
<module>plugins</module>
<module>tests</module>
<module>features</module>
- </modules>
+ </modules>
+
<repositories>
-
+ <!-- TODO: is this authorized? Should use JBoss Tools mirror repo -->
<repository>
<id>indigo</id>
<url>http://download.eclipse.org/modeling/gmf/updates/milestones/</url>
@@ -30,6 +31,18 @@
<enabled>true</enabled>
</releases>
</repository>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</repositories>
Modified: trunk/cdi/pom.xml
===================================================================
--- trunk/cdi/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/cdi/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -18,5 +18,19 @@
<module>tests</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/central/pom.xml
===================================================================
--- trunk/central/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/central/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -24,5 +24,19 @@
<module>tests</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/common/pom.xml
===================================================================
--- trunk/common/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/common/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -19,5 +19,19 @@
<module>site</module>
<module>tests</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/deltacloud/pom.xml
===================================================================
--- trunk/deltacloud/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/deltacloud/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -19,4 +19,18 @@
<module>site</module>
<module>tests</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/esb/pom.xml
===================================================================
--- trunk/esb/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/esb/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -30,5 +30,19 @@
<module>tests</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/examples/pom.xml
===================================================================
--- trunk/examples/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/examples/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -19,5 +19,19 @@
<module>tests</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/flow/pom.xml
===================================================================
--- trunk/flow/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/flow/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -19,5 +19,19 @@
<module>features</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/forge/pom.xml
===================================================================
--- trunk/forge/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/forge/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -19,5 +19,19 @@
<module>features</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/freemarker/pom.xml
===================================================================
--- trunk/freemarker/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/freemarker/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -19,5 +19,19 @@
<module>site</module>
<module>tests</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/gwt/pom.xml
===================================================================
--- trunk/gwt/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/gwt/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -19,7 +19,8 @@
<module>site</module>
</modules>
<repositories>
- <!-- Cannot redistribute GWT plugins due to license therefore cannot be included in target platform; must reference as 3rd party URL -->
+ <!-- Cannot redistribute GWT plugins due to license therefore cannot be included in target platform; must reference as 3rd party URL -->
+ <!-- TODO: is this Ok? Shouldn't it use our JBoss dependencies repository -->
<repository>
<id>gwt-e37</id>
<url>http://dl.google.com/eclipse/plugin/3.7/</url>
@@ -27,6 +28,17 @@
<snapshots><enabled>true</enabled></snapshots>
<releases><enabled>true</enabled></releases>
</repository>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
</repositories>
</project>
Modified: trunk/hibernatetools/pom.xml
===================================================================
--- trunk/hibernatetools/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/hibernatetools/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -16,7 +16,21 @@
<module>features</module>
<module>plugins</module>
<module>tests</module>
- <module>site</module>
- </modules>
+ <module>site</module>
+ </modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/jbpm/pom.xml
===================================================================
--- trunk/jbpm/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/jbpm/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -18,5 +18,19 @@
<module>tests</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/jmx/pom.xml
===================================================================
--- trunk/jmx/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/jmx/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -19,4 +19,18 @@
<module>site</module>
<module>tests</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/jsf/pom.xml
===================================================================
--- trunk/jsf/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/jsf/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -17,5 +17,19 @@
<module>features</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/jst/pom.xml
===================================================================
--- trunk/jst/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/jst/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -17,5 +17,19 @@
<module>features</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/maven/pom.xml
===================================================================
--- trunk/maven/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/maven/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -56,5 +56,19 @@
</plugins>
</pluginManagement>
</build>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/modeshape/pom.xml
===================================================================
--- trunk/modeshape/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/modeshape/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -19,5 +19,19 @@
<module>tests</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/openshift/pom.xml
===================================================================
--- trunk/openshift/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/openshift/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -18,5 +18,19 @@
<module>features</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/portlet/pom.xml
===================================================================
--- trunk/portlet/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/portlet/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -18,4 +18,18 @@
<module>tests</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/runtime/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -19,5 +19,19 @@
<module>tests</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/seam/pom.xml
===================================================================
--- trunk/seam/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/seam/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -20,5 +20,19 @@
<module>tests</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/smooks/pom.xml
===================================================================
--- trunk/smooks/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/smooks/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -19,5 +19,19 @@
<module>tests</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/struts/pom.xml
===================================================================
--- trunk/struts/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/struts/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -16,7 +16,21 @@
<module>features</module>
<module>plugins</module>
<module>tests</module>
- <module>site</module>
- </modules>
+ <module>site</module>
+ </modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/tests/pom.xml
===================================================================
--- trunk/tests/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/tests/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -17,4 +17,18 @@
<module>features</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/usage/pom.xml
===================================================================
--- trunk/usage/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/usage/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -19,5 +19,19 @@
<module>features</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/vpe/pom.xml
===================================================================
--- trunk/vpe/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/vpe/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -18,4 +18,18 @@
<module>features</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/ws/pom.xml
===================================================================
--- trunk/ws/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/ws/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -19,5 +19,19 @@
<module>features</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
Modified: trunk/xulrunner/pom.xml
===================================================================
--- trunk/xulrunner/pom.xml 2012-03-14 13:02:01 UTC (rev 39500)
+++ trunk/xulrunner/pom.xml 2012-03-14 13:58:50 UTC (rev 39501)
@@ -17,5 +17,19 @@
<module>plugins</module>
<module>site</module>
</modules>
+
+ <repositories>
+ <!-- To resolve parent artifact -->
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ </repositories>
</project>
12 years, 8 months
- 1
- 0
JBoss Tools SVN: r39500 - workspace/fred/repositories/snapshot/org/jboss/errai/archetypes/kitchensink-quickstart/2.0-SNAPSHOT.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-03-14 09:02:01 -0400 (Wed, 14 Mar 2012)
New Revision: 39500
Modified:
workspace/fred/repositories/snapshot/org/jboss/errai/archetypes/kitchensink-quickstart/2.0-SNAPSHOT/kitchensink-quickstart-2.0-SNAPSHOT.jar
Log:
Fix warName of errai archetype
Modified: workspace/fred/repositories/snapshot/org/jboss/errai/archetypes/kitchensink-quickstart/2.0-SNAPSHOT/kitchensink-quickstart-2.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
12 years, 8 months
- 1
- 0
JBoss Tools SVN: r39499 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-14 08:42:46 -0400 (Wed, 14 Mar 2012)
New Revision: 39499
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-11307 - xpath decorators
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2012-03-14 12:26:17 UTC (rev 39498)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2012-03-14 12:42:46 UTC (rev 39499)
@@ -453,7 +453,8 @@
id="org.jboss.ide.eclipse.as.ui.extensions.xml.decorator"
label="JBoss Server XML Configuration Decorator"
lightweight="true"
- location="BOTTOM_RIGHT">
+ location="BOTTOM_RIGHT"
+ state="true">
<enablement>
<or>
<objectClass name="org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathQuery"/>
12 years, 8 months
- 1
- 0