November 2011 - jbosstools-commits

JBoss Tools SVN: r36590 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test: core and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: ljelinko Date: 2011-11-24 02:39:23 -0500 (Thu, 24 Nov 2011) New Revision: 36590 Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletProject.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/RunJavaPortletOnServer.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java Removed: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJSFPortletProject.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortlet.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/RunJavaPortletOnServer.java Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JSFPortletTestSuite.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JavaPortletTestSuite.java Log: changed package of tests Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2011-11-24 07:00:04 UTC (rev 36589) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2011-11-24 07:39:23 UTC (rev 36590) @@ -1,9 +1,9 @@ package org.jboss.tools.portlet.ui.bot.test; -import org.jboss.tools.portlet.ui.bot.test.create.CreateJSFPortletProject; -import org.jboss.tools.portlet.ui.bot.test.create.CreateJavaPortlet; -import org.jboss.tools.portlet.ui.bot.test.create.CreateJavaPortletProject; -import org.jboss.tools.portlet.ui.bot.test.create.RunJavaPortletOnServer; +import org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortlet; +import org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletProject; +import org.jboss.tools.portlet.ui.bot.test.core.RunJavaPortletOnServer; +import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject; import org.junit.runner.RunWith; import org.junit.runners.Suite; Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JSFPortletTestSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JSFPortletTestSuite.java 2011-11-24 07:00:04 UTC (rev 36589) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JSFPortletTestSuite.java 2011-11-24 07:39:23 UTC (rev 36590) @@ -1,6 +1,6 @@ package org.jboss.tools.portlet.ui.bot.test; -import org.jboss.tools.portlet.ui.bot.test.create.CreateJSFPortletProject; +import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject; import org.junit.runner.RunWith; import org.junit.runners.Suite; Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JavaPortletTestSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JavaPortletTestSuite.java 2011-11-24 07:00:04 UTC (rev 36589) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JavaPortletTestSuite.java 2011-11-24 07:39:23 UTC (rev 36590) @@ -1,8 +1,8 @@ package org.jboss.tools.portlet.ui.bot.test; -import org.jboss.tools.portlet.ui.bot.test.create.CreateJavaPortlet; -import org.jboss.tools.portlet.ui.bot.test.create.CreateJavaPortletProject; -import org.jboss.tools.portlet.ui.bot.test.create.RunJavaPortletOnServer; +import org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortlet; +import org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletProject; +import org.jboss.tools.portlet.ui.bot.test.core.RunJavaPortletOnServer; import org.junit.runner.RunWith; import org.junit.runners.Suite; Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java (from rev 36589, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortlet.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java 2011-11-24 07:39:23 UTC (rev 36590) @@ -0,0 +1,51 @@ +package org.jboss.tools.portlet.ui.bot.test.core; + +import static org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletProject.PROJECT_NAME; +import static org.jboss.tools.portlet.ui.bot.test.entity.EntityFactory.file; +import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.DefaultMatchersFactory.isNumberOfErrors; +import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.WorkspaceMatchersFactory.containsNodes; +import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.WorkspaceMatchersFactory.exists; + +import org.jboss.tools.portlet.ui.bot.test.entity.XMLNode; +import org.jboss.tools.portlet.ui.bot.test.task.SWTTask; +import org.jboss.tools.portlet.ui.bot.test.task.wizard.web.jboss.PortletCreationTask; +import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase; +import org.junit.Test; + +/** + * Creates a new java portlet. + * + * @author Lucia Jelinkova + * + */ +public class CreateJavaPortlet extends SWTTaskBasedTestCase { + + private static final String CLASS_NAME = "UITestingPortlet"; + + private static final String PACKAGE_NAME = "org.jboss.tools.tests.ui.portlet"; + + private static final String SOURCE_FILE_NAME = "src"; + + private static final String CLASS_FILE = SOURCE_FILE_NAME + "/" + PACKAGE_NAME + "/" + CLASS_NAME + ".java"; + + private static final String FULL_CLASS_NAME = PACKAGE_NAME + "." + CLASS_NAME; + + @Test + public void testCreate(){ + doPerform(getCreatePortletTask()); + + doAssertThat(0, isNumberOfErrors()); + doAssertThat(file(PROJECT_NAME, CLASS_FILE), exists()); + doAssertThat(file(PROJECT_NAME, "WebContent/WEB-INF/default-object.xml"), exists()); + doAssertThat(file(PROJECT_NAME, "WebContent/WEB-INF/portlet-instances.xml"), exists()); + doAssertThat(file(PROJECT_NAME, "WebContent/WEB-INF/portlet.xml"), containsNodes(new XMLNode("portlet-app/portlet/portlet-class", FULL_CLASS_NAME))); + } + + private SWTTask getCreatePortletTask() { + PortletCreationTask task = new PortletCreationTask(); + task.setProject(PROJECT_NAME); + task.setPackageName(PACKAGE_NAME); + task.setClassName(CLASS_NAME); + return task; + } +} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletProject.java (from rev 36589, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletProject.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletProject.java 2011-11-24 07:39:23 UTC (rev 36590) @@ -0,0 +1,43 @@ +package org.jboss.tools.portlet.ui.bot.test.core; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.tools.portlet.ui.bot.test.entity.FacetDefinition; +import org.jboss.tools.portlet.ui.bot.test.task.wizard.WizardPageDefaultsFillingTask; +import org.jboss.tools.portlet.ui.bot.test.task.wizard.WizardPageFillingTask; +import org.jboss.tools.portlet.ui.bot.test.task.wizard.web.jboss.JBossPortletCapabilitiesWizardPageFillingTask; +import org.jboss.tools.portlet.ui.bot.test.template.CreatePortletProjectTemplate; + +/** + * Creates a new Dynamic Web Project with the specific JBoss Core Portlet facet. + * + * @author Lucia Jelinkova + * + */ +public class CreateJavaPortletProject extends CreatePortletProjectTemplate { + + public static final String PROJECT_NAME = "java-portlet"; + + @Override + public String getProjectName() { + return PROJECT_NAME; + } + + @Override + public List<FacetDefinition> getRequiredFacets() { + List<FacetDefinition> facets = new ArrayList<FacetDefinition>(); + facets.add(JAVA_FACET); + facets.add(CORE_PORTLET_FACET); + return facets; + } + + @Override + public List<WizardPageFillingTask> getAdditionalWizardPages() { + List<WizardPageFillingTask> tasks = new ArrayList<WizardPageFillingTask>(); + tasks.add(new WizardPageDefaultsFillingTask()); + tasks.add(new WizardPageDefaultsFillingTask()); + tasks.add(new JBossPortletCapabilitiesWizardPageFillingTask(JBossPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER)); + return tasks; + } +} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/RunJavaPortletOnServer.java (from rev 36589, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/RunJavaPortletOnServer.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/RunJavaPortletOnServer.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/RunJavaPortletOnServer.java 2011-11-24 07:39:23 UTC (rev 36590) @@ -0,0 +1,35 @@ +package org.jboss.tools.portlet.ui.bot.test.core; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletProject.PROJECT_NAME; +import static org.hamcrest.Matchers.not; +import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.DefaultMatchersFactory.inConsoleOutput; + +import org.jboss.tools.portlet.ui.bot.test.task.console.ConsoleClearingTask; +import org.jboss.tools.portlet.ui.bot.test.task.server.RunninngProjectOnServerTask; +import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; +import org.junit.Test; + +/** + * Performs Run on Server on the java portlet project and checks if there is no exception in the + * console. + * + * @author Lucia Jelinkova + * + */ +@Require(clearWorkspace=false, clearProjects=false, server=@Server(required=true, state=ServerState.Running, type=ServerType.EPP)) +public class RunJavaPortletOnServer extends SWTTaskBasedTestCase { + + @Test + public void testRunOnServer(){ + doPerform(new ConsoleClearingTask()); + doPerform(new RunninngProjectOnServerTask(PROJECT_NAME)); + + assertThat("Exception", not(inConsoleOutput())); + System.out.println(); + } +} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJSFPortletProject.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJSFPortletProject.java 2011-11-24 07:00:04 UTC (rev 36589) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJSFPortletProject.java 2011-11-24 07:39:23 UTC (rev 36590) @@ -1,53 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.create; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.tools.portlet.ui.bot.test.entity.FacetDefinition; -import org.jboss.tools.portlet.ui.bot.test.task.wizard.WizardPageDefaultsFillingTask; -import org.jboss.tools.portlet.ui.bot.test.task.wizard.WizardPageFillingTask; -import org.jboss.tools.portlet.ui.bot.test.task.wizard.web.jboss.JBossJSFPortletCapabilitiesWizardPageFillingTask; -import org.jboss.tools.portlet.ui.bot.test.task.wizard.web.jboss.JBossPortletCapabilitiesWizardPageFillingTask; -import org.jboss.tools.portlet.ui.bot.test.template.CreatePortletProjectTemplate; - - -/** - * Creates a new Dynamic Web Project with the specific JBoss JSF Portlet facet. - * - * @author Lucia Jelinkova - * - */ -public class CreateJSFPortletProject extends CreatePortletProjectTemplate{ - - public static final String PROJECT_NAME = "jsf-portlet"; - - protected static final FacetDefinition JSF_PORTLET_FACET = new FacetDefinition("JBoss JSF Portlet", JBOSS_FACET_CATEGORY); - - protected static final FacetDefinition JSF_FACET = new FacetDefinition("JavaServer Faces"); - - @Override - public String getProjectName() { - return PROJECT_NAME; - } - - @Override - public List<FacetDefinition> getRequiredFacets() { - List<FacetDefinition> facets = new ArrayList<FacetDefinition>(); - facets.add(JAVA_FACET); - facets.add(JSF_FACET); - facets.add(CORE_PORTLET_FACET); - facets.add(JSF_PORTLET_FACET); - return facets; - } - - @Override - public List<WizardPageFillingTask> getAdditionalWizardPages() { - List<WizardPageFillingTask> tasks = new ArrayList<WizardPageFillingTask>(); - tasks.add(new WizardPageDefaultsFillingTask()); - tasks.add(new WizardPageDefaultsFillingTask()); - tasks.add(new JBossPortletCapabilitiesWizardPageFillingTask(JBossPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER)); - tasks.add(new WizardPageDefaultsFillingTask()); - tasks.add(new JBossJSFPortletCapabilitiesWizardPageFillingTask(JBossJSFPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER)); - return tasks; - } -} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortlet.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortlet.java 2011-11-24 07:00:04 UTC (rev 36589) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortlet.java 2011-11-24 07:39:23 UTC (rev 36590) @@ -1,51 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.create; - -import static org.jboss.tools.portlet.ui.bot.test.create.CreateJavaPortletProject.PROJECT_NAME; -import static org.jboss.tools.portlet.ui.bot.test.entity.EntityFactory.file; -import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.DefaultMatchersFactory.isNumberOfErrors; -import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.WorkspaceMatchersFactory.containsNodes; -import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.WorkspaceMatchersFactory.exists; - -import org.jboss.tools.portlet.ui.bot.test.entity.XMLNode; -import org.jboss.tools.portlet.ui.bot.test.task.SWTTask; -import org.jboss.tools.portlet.ui.bot.test.task.wizard.web.jboss.PortletCreationTask; -import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase; -import org.junit.Test; - -/** - * Creates a new java portlet. - * - * @author Lucia Jelinkova - * - */ -public class CreateJavaPortlet extends SWTTaskBasedTestCase { - - private static final String CLASS_NAME = "UITestingPortlet"; - - private static final String PACKAGE_NAME = "org.jboss.tools.tests.ui.portlet"; - - private static final String SOURCE_FILE_NAME = "src"; - - private static final String CLASS_FILE = SOURCE_FILE_NAME + "/" + PACKAGE_NAME + "/" + CLASS_NAME + ".java"; - - private static final String FULL_CLASS_NAME = PACKAGE_NAME + "." + CLASS_NAME; - - @Test - public void testCreate(){ - doPerform(getCreatePortletTask()); - - doAssertThat(0, isNumberOfErrors()); - doAssertThat(file(PROJECT_NAME, CLASS_FILE), exists()); - doAssertThat(file(PROJECT_NAME, "WebContent/WEB-INF/default-object.xml"), exists()); - doAssertThat(file(PROJECT_NAME, "WebContent/WEB-INF/portlet-instances.xml"), exists()); - doAssertThat(file(PROJECT_NAME, "WebContent/WEB-INF/portlet.xml"), containsNodes(new XMLNode("portlet-app/portlet/portlet-class", FULL_CLASS_NAME))); - } - - private SWTTask getCreatePortletTask() { - PortletCreationTask task = new PortletCreationTask(); - task.setProject(PROJECT_NAME); - task.setPackageName(PACKAGE_NAME); - task.setClassName(CLASS_NAME); - return task; - } -} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java 2011-11-24 07:00:04 UTC (rev 36589) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java 2011-11-24 07:39:23 UTC (rev 36590) @@ -1,43 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.create; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.tools.portlet.ui.bot.test.entity.FacetDefinition; -import org.jboss.tools.portlet.ui.bot.test.task.wizard.WizardPageDefaultsFillingTask; -import org.jboss.tools.portlet.ui.bot.test.task.wizard.WizardPageFillingTask; -import org.jboss.tools.portlet.ui.bot.test.task.wizard.web.jboss.JBossPortletCapabilitiesWizardPageFillingTask; -import org.jboss.tools.portlet.ui.bot.test.template.CreatePortletProjectTemplate; - -/** - * Creates a new Dynamic Web Project with the specific JBoss Core Portlet facet. - * - * @author Lucia Jelinkova - * - */ -public class CreateJavaPortletProject extends CreatePortletProjectTemplate { - - public static final String PROJECT_NAME = "java-portlet"; - - @Override - public String getProjectName() { - return PROJECT_NAME; - } - - @Override - public List<FacetDefinition> getRequiredFacets() { - List<FacetDefinition> facets = new ArrayList<FacetDefinition>(); - facets.add(JAVA_FACET); - facets.add(CORE_PORTLET_FACET); - return facets; - } - - @Override - public List<WizardPageFillingTask> getAdditionalWizardPages() { - List<WizardPageFillingTask> tasks = new ArrayList<WizardPageFillingTask>(); - tasks.add(new WizardPageDefaultsFillingTask()); - tasks.add(new WizardPageDefaultsFillingTask()); - tasks.add(new JBossPortletCapabilitiesWizardPageFillingTask(JBossPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER)); - return tasks; - } -} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/RunJavaPortletOnServer.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/RunJavaPortletOnServer.java 2011-11-24 07:00:04 UTC (rev 36589) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/RunJavaPortletOnServer.java 2011-11-24 07:39:23 UTC (rev 36590) @@ -1,35 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.create; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.jboss.tools.portlet.ui.bot.test.create.CreateJavaPortletProject.PROJECT_NAME; -import static org.hamcrest.Matchers.not; -import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.DefaultMatchersFactory.inConsoleOutput; - -import org.jboss.tools.portlet.ui.bot.test.task.console.ConsoleClearingTask; -import org.jboss.tools.portlet.ui.bot.test.task.server.RunninngProjectOnServerTask; -import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase; -import org.jboss.tools.ui.bot.ext.config.Annotations.Require; -import org.jboss.tools.ui.bot.ext.config.Annotations.Server; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; -import org.junit.Test; - -/** - * Performs Run on Server on the java portlet project and checks if there is no exception in the - * console. - * - * @author Lucia Jelinkova - * - */ -@Require(clearWorkspace=false, clearProjects=false, server=@Server(required=true, state=ServerState.Running, type=ServerType.EPP)) -public class RunJavaPortletOnServer extends SWTTaskBasedTestCase { - - @Test - public void testRunOnServer(){ - doPerform(new ConsoleClearingTask()); - doPerform(new RunninngProjectOnServerTask(PROJECT_NAME)); - - assertThat("Exception", not(inConsoleOutput())); - System.out.println(); - } -} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java (from rev 36589, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJSFPortletProject.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java 2011-11-24 07:39:23 UTC (rev 36590) @@ -0,0 +1,53 @@ +package org.jboss.tools.portlet.ui.bot.test.jsf; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.tools.portlet.ui.bot.test.entity.FacetDefinition; +import org.jboss.tools.portlet.ui.bot.test.task.wizard.WizardPageDefaultsFillingTask; +import org.jboss.tools.portlet.ui.bot.test.task.wizard.WizardPageFillingTask; +import org.jboss.tools.portlet.ui.bot.test.task.wizard.web.jboss.JBossJSFPortletCapabilitiesWizardPageFillingTask; +import org.jboss.tools.portlet.ui.bot.test.task.wizard.web.jboss.JBossPortletCapabilitiesWizardPageFillingTask; +import org.jboss.tools.portlet.ui.bot.test.template.CreatePortletProjectTemplate; + + +/** + * Creates a new Dynamic Web Project with the specific JBoss JSF Portlet facet. + * + * @author Lucia Jelinkova + * + */ +public class CreateJSFPortletProject extends CreatePortletProjectTemplate{ + + public static final String PROJECT_NAME = "jsf-portlet"; + + protected static final FacetDefinition JSF_PORTLET_FACET = new FacetDefinition("JBoss JSF Portlet", JBOSS_FACET_CATEGORY); + + protected static final FacetDefinition JSF_FACET = new FacetDefinition("JavaServer Faces"); + + @Override + public String getProjectName() { + return PROJECT_NAME; + } + + @Override + public List<FacetDefinition> getRequiredFacets() { + List<FacetDefinition> facets = new ArrayList<FacetDefinition>(); + facets.add(JAVA_FACET); + facets.add(JSF_FACET); + facets.add(CORE_PORTLET_FACET); + facets.add(JSF_PORTLET_FACET); + return facets; + } + + @Override + public List<WizardPageFillingTask> getAdditionalWizardPages() { + List<WizardPageFillingTask> tasks = new ArrayList<WizardPageFillingTask>(); + tasks.add(new WizardPageDefaultsFillingTask()); + tasks.add(new WizardPageDefaultsFillingTask()); + tasks.add(new JBossPortletCapabilitiesWizardPageFillingTask(JBossPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER)); + tasks.add(new WizardPageDefaultsFillingTask()); + tasks.add(new JBossJSFPortletCapabilitiesWizardPageFillingTask(JBossJSFPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER)); + return tasks; + } +}

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36589 - trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2011-11-24 02:00:04 -0500 (Thu, 24 Nov 2011) New Revision: 36589 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java Log: JBIDE-10235 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java 2011-11-23 22:59:16 UTC (rev 36588) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java 2011-11-24 07:00:04 UTC (rev 36589) @@ -26,30 +26,40 @@ public IJBoss7DeploymentResult deployAsync(String host, int port, String deploymentName, File file, IProgressMonitor monitor) throws Exception { AS7Manager manager = new AS7Manager(host, port); - return manager.deploy(deploymentName, file); + IJBoss7DeploymentResult result = manager.deploy(deploymentName, file); + manager.dispose(); + return result; } public IJBoss7DeploymentResult deploySync(String host, int port, String deploymentName, File file, IProgressMonitor monitor) throws Exception { AS7Manager manager = new AS7Manager(host, port); - return manager.deploySync(deploymentName, file, monitor); + IJBoss7DeploymentResult result = manager.deploySync(deploymentName, file, monitor); + manager.dispose(); + return result; } public IJBoss7DeploymentResult undeployAsync(String host, int port, String deploymentName, boolean removeFile, IProgressMonitor monitor) throws Exception { AS7Manager manager = new AS7Manager(host, port); - return manager.undeploy(deploymentName); + IJBoss7DeploymentResult result = manager.undeploy(deploymentName); + manager.dispose(); + return result; } public IJBoss7DeploymentResult syncUndeploy(String host, int port, String deploymentName, boolean removeFile, IProgressMonitor monitor) throws Exception { AS7Manager manager = new AS7Manager(host, port); - return manager.undeploySync(deploymentName, monitor); + IJBoss7DeploymentResult result = manager.undeploySync(deploymentName, monitor); + manager.dispose(); + return result; } public JBoss7DeploymentState getDeploymentState(String host, int port, String deploymentName) throws Exception { AS7Manager manager = new AS7Manager(host, port); - return manager.getDeploymentStateSafe(deploymentName); + JBoss7DeploymentState result = manager.getDeploymentStateSafe(deploymentName); + manager.dispose(); + return result; } @Deprecated @@ -59,11 +69,16 @@ public JBoss7ServerState getServerState(String host, int port) throws Exception { AS7Manager manager = new AS7Manager(host, port); - return manager.getServerState(); + JBoss7ServerState state = manager.getServerState(); + manager.dispose(); + return state; } public boolean isRunning(String host, int port) throws Exception { - return new AS7Manager(host, port).isRunning(); + AS7Manager manager = new AS7Manager(host, port); + boolean ret = manager.isRunning(); + manager.dispose(); + return ret; } @Deprecated @@ -72,7 +87,9 @@ } public void stop(String host, int port) throws Exception { - new AS7Manager(host, port).stopServer(); + AS7Manager manager = new AS7Manager(host, port); + manager.stopServer(); + manager.dispose(); } @Override

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36588 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common: editor/form and 5 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-11-23 17:59:16 -0500 (Wed, 23 Nov 2011) New Revision: 36588 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ErrorMode.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleErrorForm.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ExtendedFieldEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/DefaultFormContainer.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/SplitFormContainer.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/ExtendedPropertiesEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XChildrenEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XModelObjectEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/DefaultSettings.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/IWidgetSettings.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/TextAndReferenceComponent.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/WhiteSettings.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/DefaultSpecialWizardDialog.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/ProgressPart.java Log: JBIDE-10225 https://issues.jboss.org/browse/JBIDE-10225 Cursor & Color leak prevented. Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ErrorMode.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ErrorMode.java 2011-11-23 22:34:15 UTC (rev 36587) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ErrorMode.java 2011-11-23 22:59:16 UTC (rev 36588) @@ -214,14 +214,16 @@ } class L extends Canvas implements PaintListener, MouseMoveListener { - Cursor DEF_CURSOR = new Cursor(null, SWT.CURSOR_ARROW); - Cursor HAND_CURSOR = new Cursor(null, SWT.CURSOR_HAND); + Cursor DEF_CURSOR; + Cursor HAND_CURSOR; private String[] messages = new String[]{"", "", ""}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ public L(Composite parent, int style) { super (parent, style); addPaintListener(this); addMouseMoveListener(this); + DEF_CURSOR = getShell().getDisplay().getSystemCursor(SWT.CURSOR_ARROW); + HAND_CURSOR = getShell().getDisplay().getSystemCursor(SWT.CURSOR_HAND); } public void setData(String[] messages) { Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleErrorForm.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleErrorForm.java 2011-11-23 22:34:15 UTC (rev 36587) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleErrorForm.java 2011-11-23 22:59:16 UTC (rev 36588) @@ -251,14 +251,14 @@ } class ML extends MouseAdapter implements MouseMoveListener { - Cursor hand = new Cursor(null, SWT.CURSOR_HAND); - Cursor arrow = new Cursor(null, SWT.CURSOR_ARROW); + Cursor hand = null; + Cursor arrow = null; public void mouseMove(MouseEvent e) { StyleRange range = getRange(e); if(range != null && range.foreground == BLUE) { - styledText.setCursor(hand); + styledText.setCursor(styledText.getShell().getDisplay().getSystemCursor(SWT.CURSOR_HAND)); } else { - styledText.setCursor(arrow); + styledText.setCursor(styledText.getShell().getDisplay().getSystemCursor(SWT.CURSOR_ARROW)); } } public void mouseUp(MouseEvent e) { Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ExtendedFieldEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ExtendedFieldEditor.java 2011-11-23 22:34:15 UTC (rev 36587) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ExtendedFieldEditor.java 2011-11-23 22:59:16 UTC (rev 36588) @@ -139,7 +139,16 @@ } return labelComposite; } - + + Color foreground = null; + + Color getForeground() { + if(foreground == null || foreground.isDisposed()) { + foreground = new Color(null, 10, 36, 106); + } + return foreground; + } + protected Label createLabelControl(Composite parent) { if (getLabelControl() == null) { // cannot comment this! for details see label.addDisposeListener int style = getSettings().getStyle("Label.Style"); //$NON-NLS-1$ @@ -154,7 +163,7 @@ /// label.setBackground(bg); label.setForeground(fg); if(settings instanceof WhiteSettings) { - label.setForeground(new Color(null, 10, 36, 106)); + label.setForeground(getForeground()); label.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_WHITE)); } @@ -183,6 +192,10 @@ label = null; setPropertyChangeListener(null); setPage(null); + if(foreground != null && !foreground.isDisposed()) { + foreground.dispose(); + foreground = null; + } } public void load() { Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/DefaultFormContainer.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/DefaultFormContainer.java 2011-11-23 22:34:15 UTC (rev 36587) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/DefaultFormContainer.java 2011-11-23 22:59:16 UTC (rev 36588) @@ -39,7 +39,6 @@ composite = new Composite(parent, SWT.NONE); settings.setupControl(composite); - //composite.setBackground(new Color(null, 255, 0 ,0)); composite.setLayout(getLayout()); composite.setLayoutData(getLayoutData()); // create client area Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/SplitFormContainer.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/SplitFormContainer.java 2011-11-23 22:34:15 UTC (rev 36587) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/SplitFormContainer.java 2011-11-23 22:59:16 UTC (rev 36588) @@ -116,8 +116,6 @@ gd = new GridData(GridData.FILL_BOTH); secondFormControl.setLayoutData(gd); - - //composite.setBackground(new Color(null, 255,255,255)); composite.setWeights(new int[]{30, 70}); composite.setLayoutData(new GridData(GridData.FILL_BOTH)); control = main; Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/ExtendedPropertiesEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/ExtendedPropertiesEditor.java 2011-11-23 22:34:15 UTC (rev 36587) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/ExtendedPropertiesEditor.java 2011-11-23 22:59:16 UTC (rev 36588) @@ -14,16 +14,19 @@ import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.ICellModifier; import org.eclipse.jface.viewers.TextCellEditor; +import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.TableItem; import org.jboss.tools.common.model.util.EclipseResourceUtil; public class ExtendedPropertiesEditor { - static Color DEFAULT_COLOR = new Color(null, 0, 0, 0); - static Color DISABLED_COLOR = new Color(null, 127, 127, 127); + static Color DEFAULT_COLOR = Display.getDefault().getSystemColor(SWT.COLOR_BLACK); + static Color DISABLED_COLOR = Display.getDefault().getSystemColor(SWT.COLOR_GRAY); + static Image EMPTY = EclipseResourceUtil.getImage("images/actions/empty.gif"); //$NON-NLS-1$ protected XTable xtable = new XTable(); protected ExtendedProperties attributes; Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XChildrenEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XChildrenEditor.java 2011-11-23 22:34:15 UTC (rev 36587) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XChildrenEditor.java 2011-11-23 22:59:16 UTC (rev 36588) @@ -25,6 +25,7 @@ import org.eclipse.swt.graphics.GC; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Widget; import org.jboss.tools.common.editor.AbstractSelectionProvider; import org.jboss.tools.common.meta.action.XActionInvoker; @@ -38,8 +39,8 @@ import org.jboss.tools.common.model.util.AbstractTableHelper; public class XChildrenEditor implements CommandBarListener { - protected static Color DEFAULT_COLOR = new Color(null, 0, 0, 0); - protected static Color GREYED_COLOR = new Color(null, 127, 127, 127); + protected static Color DEFAULT_COLOR = Display.getDefault().getSystemColor(SWT.COLOR_BLACK); + protected static Color GREYED_COLOR = Display.getDefault().getSystemColor(SWT.COLOR_GRAY); public static String ADD = Messages.XChildrenEditor_Add; public static String DELETE = Messages.XChildrenEditor_Delete; public static String EDIT = Messages.XChildrenEditor_Edit; Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XModelObjectEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XModelObjectEditor.java 2011-11-23 22:34:15 UTC (rev 36587) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XModelObjectEditor.java 2011-11-23 22:59:16 UTC (rev 36588) @@ -12,10 +12,12 @@ import java.util.ArrayList; import org.eclipse.jface.viewers.CellEditor; +import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Display; import org.jboss.tools.common.meta.XAttribute; import org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintAList; import org.jboss.tools.common.meta.key.WizardKeys; @@ -23,8 +25,8 @@ import org.jboss.tools.common.model.util.EclipseResourceUtil; public class XModelObjectEditor { - static Color DEFAULT_COLOR = new Color(null, 0, 0, 0); - static Color DISABLED_COLOR = new Color(null, 127, 127, 127); + static Color DEFAULT_COLOR = Display.getDefault().getSystemColor(SWT.COLOR_BLACK); + static Color DISABLED_COLOR = Display.getDefault().getSystemColor(SWT.COLOR_GRAY); static Image EMPTY = EclipseResourceUtil.getImage("images/actions/empty.gif"); //$NON-NLS-1$ protected XTable xtable = new XTable(); protected XModelObject object = null; Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/DefaultSettings.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/DefaultSettings.java 2011-11-23 22:34:15 UTC (rev 36587) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/DefaultSettings.java 2011-11-23 22:59:16 UTC (rev 36588) @@ -287,4 +287,6 @@ return null; } + public void dispose() {} + } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/IWidgetSettings.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/IWidgetSettings.java 2011-11-23 22:34:15 UTC (rev 36587) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/IWidgetSettings.java 2011-11-23 22:59:16 UTC (rev 36588) @@ -31,4 +31,6 @@ public void setupControl(Control control); public FormToolkit getToolkit(Display display); + + public void dispose(); } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/TextAndReferenceComponent.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/TextAndReferenceComponent.java 2011-11-23 22:34:15 UTC (rev 36587) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/TextAndReferenceComponent.java 2011-11-23 22:59:16 UTC (rev 36588) @@ -52,7 +52,7 @@ public void mouseMove(MouseEvent e) { int c = (overReference(e.x, e.y)) ? SWT.CURSOR_HAND : SWT.CURSOR_ARROW; - setCursor(new Cursor(Display.getCurrent(), c)); + setCursor(getShell().getDisplay().getSystemCursor(c)); } private boolean overReference(int x, int y) { Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/WhiteSettings.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/WhiteSettings.java 2011-11-23 22:34:15 UTC (rev 36587) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/WhiteSettings.java 2011-11-23 22:59:16 UTC (rev 36588) @@ -51,7 +51,11 @@ protected void initCursors() { super.initCursors(); - handCursor = new Cursor(Display.getCurrent(), SWT.CURSOR_HAND); + Display display = Display.getCurrent(); + if(display == null) { + display = Display.getDefault(); + } + handCursor = display.getSystemCursor(SWT.CURSOR_HAND); } protected void initFonts() { @@ -103,7 +107,12 @@ } return toolkit; } + + public void dispose() { + defaultBackground.dispose(); + listBorderColor.dispose(); + separatorColor.dispose(); + } - } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/DefaultSpecialWizardDialog.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/DefaultSpecialWizardDialog.java 2011-11-23 22:34:15 UTC (rev 36587) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/DefaultSpecialWizardDialog.java 2011-11-23 22:59:16 UTC (rev 36588) @@ -59,7 +59,6 @@ public void updateDialogArea() { stepPage = createPage((Composite)pageArea); - //stepPage.setBackground(new Color(null,128,255,255)); Point size = stepPage.computeSize(SWT.DEFAULT, SWT.DEFAULT); size.x = Math.max(size.x,pageWidth); size.y = Math.max(size.y,pageHeight); @@ -92,7 +91,6 @@ gridLayout.horizontalSpacing = 0; gridLayout.verticalSpacing = 0; dialogArea.setLayout(gridLayout); - //composite.setBackground(new Color(null, 255,0,255)); // Build the separator line Label dialogAreaSeparator = new Label(dialogArea, SWT.HORIZONTAL | SWT.SEPARATOR); @@ -120,7 +118,6 @@ gridLayout.horizontalSpacing = 0; gridLayout.verticalSpacing = 0; composite.setLayout(gridLayout); - //composite.setBackground(new Color(null, 0,255,255)); GridData gd = new GridData(GridData.FILL_HORIZONTAL); //gd.heightHint = commandBarHeight; composite.setLayoutData(gd); @@ -146,7 +143,6 @@ gd = new GridData(GridData.FILL_BOTH); gd.heightHint = commandBar.getControl().computeSize(SWT.DEFAULT, SWT.DEFAULT).y; control.setLayoutData(gd); - //control.setBackground(new Color(null, 0,0,255)); return composite; } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/ProgressPart.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/ProgressPart.java 2011-11-23 22:34:15 UTC (rev 36587) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/ProgressPart.java 2011-11-23 22:59:16 UTC (rev 36588) @@ -65,9 +65,9 @@ } private void setWaitCursor() { Display d = getShell().getDisplay(); - waitCursor = new Cursor(d, SWT.CURSOR_WAIT); + waitCursor = d.getSystemCursor(SWT.CURSOR_WAIT); setDisplayCursor(waitCursor); - arrowCursor = new Cursor(d, SWT.CURSOR_ARROW); + arrowCursor = d.getSystemCursor(SWT.CURSOR_ARROW); } private void saveFocus(Map<Object,Object> state, Control focusControl) { if (focusControl != null) {

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36587 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-11-23 17:34:15 -0500 (Wed, 23 Nov 2011) New Revision: 36587 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/FacesConfigValidator.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/JSFSeverityPreferences.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/JSFValidationMessage.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/messages.properties Log: JBIDE-10190 https://issues.jboss.org/browse/JBIDE-10190 Partially migrated validation for faces-config.xml. Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/FacesConfigValidator.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/FacesConfigValidator.java 2011-11-23 22:33:38 UTC (rev 36586) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/FacesConfigValidator.java 2011-11-23 22:34:15 UTC (rev 36587) @@ -15,6 +15,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.StringTokenizer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; @@ -24,12 +25,15 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.osgi.util.NLS; import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.eclipse.wst.validation.internal.core.ValidationException; import org.eclipse.wst.validation.internal.provisional.core.IReporter; +import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.impl.XModelImpl; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.validation.ContextValidationHelper; import org.jboss.tools.common.validation.IProjectValidationContext; @@ -43,10 +47,16 @@ import org.jboss.tools.common.validation.internal.ValidatingProjectSet; import org.jboss.tools.common.web.WebUtils; import org.jboss.tools.jsf.model.JSFConstants; +import org.jboss.tools.jsf.model.pv.JSFProjectsTree; +import org.jboss.tools.jsf.web.JSFWebHelper; +import org.jboss.tools.jsf.web.JSFWebProject; +import org.jboss.tools.jsf.web.pattern.JSFUrlPattern; +import org.jboss.tools.jsf.web.validation.composite.CompositeComponentValidator; import org.jboss.tools.jst.web.WebModelPlugin; +import org.jboss.tools.jst.web.model.helpers.WebAppHelper; +import org.jboss.tools.jst.web.model.pv.WebProjectNode; import org.jboss.tools.jst.web.validation.Check; import org.jboss.tools.jst.web.validation.CheckClass; -import org.jboss.tools.jst.web.validation.WebXMLPreferences; /** * @author Viacheslav Kabanovich @@ -54,7 +64,7 @@ public class FacesConfigValidator extends ValidationErrorManager implements IValidator, JSFConstants { public static final String ID = "org.jboss.tools.esb.validator.ESBCoreValidator"; //$NON-NLS-1$ public static final String PROBLEM_TYPE = "org.jboss.tools.jsf.facesconfigproblem"; //$NON-NLS-1$ - public static final String PREFERENCE_PAGE_ID = "org.jboss.tools.jsf.ui.FacesConfigValidatorPreferencePage"; //$NON-NLS-1$ + public static final String PREFERENCE_PAGE_ID = CompositeComponentValidator.PREFERENCE_PAGE_ID; public static String SHORT_ID = "verification"; //$NON-NLS-1$ @@ -75,7 +85,7 @@ */ @Override protected String getPreference(IProject project, String preferenceKey) { - return WebXMLPreferences.getInstance().getProjectPreference(project, preferenceKey); + return JSFSeverityPreferences.getInstance().getProjectPreference(project, preferenceKey); } /* @@ -84,7 +94,7 @@ */ @Override public int getMaxNumberOfMarkersPerFile(IProject project) { - return WebXMLPreferences.getMaxNumberOfProblemMarkersPerFile(project); + return JSFSeverityPreferences.getMaxNumberOfProblemMarkersPerFile(project); } private void addCheck(Check check, String... entities) { @@ -106,6 +116,42 @@ addCheck(new CheckClass(this, JSFSeverityPreferences.INVALID_STATE_MANAGER, "state-manager", false, "javax.faces.application.StateManager", null), ENT_APP, ENT_APP_12, ENT_APP_20); addCheck(new CheckClass(this, JSFSeverityPreferences.INVALID_VARIABLE_RESOLVER, "variable-resolver", false, "javax.faces.el.VariableResolver", null), ENT_APP, ENT_APP_12, ENT_APP_20); addCheck(new CheckClass(this, JSFSeverityPreferences.INVALID_VIEW_HANDLER, "view-handler", false, "javax.faces.application.ViewHandler", null), ENT_APP, ENT_APP_12, ENT_APP_20); + + String ENT_COMPONENT = "JSFComponent", ENT_COMPONENT_11 = ENT_COMPONENT + SUFF_11; + addCheck(new CheckClass(this, JSFSeverityPreferences.INVALID_COMPONENT_CLASS, "component-class", false, null, "javax.faces.component.UIComponent"), ENT_COMPONENT, ENT_COMPONENT_11); + + String ENT_CONVERTER = "JSFConverter"; + addCheck(new CheckClass(this, JSFSeverityPreferences.INVALID_CONVERTER_CLASS, "converter-class", false, "javax.faces.convert.Converter", null), ENT_CONVERTER); + addCheck(new CheckClass(this, JSFSeverityPreferences.INVALID_CONVERTER_FOR_CLASS, "converter-for-class", true, null, null), ENT_CONVERTER); + + String ENT_FACTORY = "JSFFactory", ENT_FACTORY_20 = ENT_FACTORY + SUFF_20; + addCheck(new CheckClass(this, JSFSeverityPreferences.INVALID_APPLICATION_FACTORY, "application-factory", false, null, "javax.faces.application.ApplicationFactory"), ENT_FACTORY, ENT_FACTORY_20); + addCheck(new CheckClass(this, JSFSeverityPreferences.INVALID_FACES_CONTEXT_FACTORY, "faces-context-factory", false, null, "javax.faces.context.FacesContextFactory"), ENT_FACTORY, ENT_FACTORY_20); + addCheck(new CheckClass(this, JSFSeverityPreferences.INVALID_LIFECYCLE_FACTORY, "lifecycle-factory", false, null, "javax.faces.lifecycle.LifecycleFactory"), ENT_FACTORY, ENT_FACTORY_20); + addCheck(new CheckClass(this, JSFSeverityPreferences.INVALID_RENDER_KIT_FACTORY, "render-kit-factory", false, null, "javax.faces.render.RenderKitFactory"), ENT_FACTORY, ENT_FACTORY_20); + + String ENT_LIST_ENTRIES = "JSFListEntries", ENT_MAP_ENTRIES = "JSFMapEntries"; + addCheck(new CheckClass(this, JSFSeverityPreferences.INVALID_KEY_CLASS, "key-class", true, null, null), ENT_MAP_ENTRIES); + addCheck(new CheckClass(this, JSFSeverityPreferences.INVALID_KEY_CLASS, "value-class", true, null, null), ENT_LIST_ENTRIES, ENT_MAP_ENTRIES); + + String ENT_MANAGED_BEAN = "JSFManagedBean", ENT_MANAGED_BEAN_20 = ENT_MANAGED_BEAN + SUFF_20; + addCheck(new CheckClass(this, JSFSeverityPreferences.INVALID_BEAN_CLASS, "managed-bean-class", false, null, null), ENT_MANAGED_BEAN, ENT_MANAGED_BEAN_20); + String ENT_MANAGED_PROPERTY = "JSFManagedProperty"; + addCheck(new CheckClass(this, JSFSeverityPreferences.INVALID_PROPERTY_CLASS, "property-class", false, null, null), ENT_MANAGED_PROPERTY); + String ENT_REFERENCED_BEAN = "JSFReferencedBean"; + addCheck(new CheckClass(this, JSFSeverityPreferences.INVALID_BEAN_CLASS, "referenced-bean-class", false, null, null), ENT_REFERENCED_BEAN); + + String ENT_PHASE_LISTENER = "JSFPhaseListener"; + addCheck(new CheckClass(this, JSFSeverityPreferences.INVALID_PHASE_LISTENER, "phase-listener", false, null, "javax.faces.event.PhaseListener"), ENT_PHASE_LISTENER); + String ENT_RENDER_KIT = "JSFRenderKit", ENT_RENDER_KIT_11 = ENT_RENDER_KIT + SUFF_11, ENT_RENDER_KIT_12 = ENT_RENDER_KIT + SUFF_12, ENT_RENDER_KIT_20 = ENT_RENDER_KIT + SUFF_20; + addCheck(new CheckClass(this, JSFSeverityPreferences.INVALID_RENDER_KIT_CLASS, "render-kit-class", false, null, "javax.faces.render.RenderKit"), ENT_RENDER_KIT, ENT_RENDER_KIT_11, ENT_RENDER_KIT_12, ENT_RENDER_KIT_20); + String ENT_RENDERER = "JSFRenderer", ENT_RENDERER_11 = ENT_RENDERER + SUFF_11; + addCheck(new CheckClass(this, JSFSeverityPreferences.INVALID_RENDERER_CLASS, "renderer-class", false, null, "javax.faces.render.Renderer"), ENT_RENDERER, ENT_RENDERER_11); + String ENT_VALIDATOR = "JSFValidator", ENT_VALIDATOR_12 = ENT_VALIDATOR + SUFF_12; + addCheck(new CheckClass(this, JSFSeverityPreferences.INVALID_VALIDATOR_CLASS, "validator-class", false, null, "javax.faces.validator.Validator"), ENT_VALIDATOR, ENT_VALIDATOR_12); + + addCheck(new JSFCheckFromViewId(this), new String[]{ENT_NAVIGATION_CASE, ENT_NAVIGATION_CASE_20, ENT_NAVIGATION_RULE, ENT_NAVIGATION_RULE_20}); + addCheck(new JSFCheckToViewId(this), new String[]{ENT_NAVIGATION_CASE, ENT_NAVIGATION_CASE_20, ENT_NAVIGATION_RULE, ENT_NAVIGATION_RULE_20}); } /* @@ -178,8 +224,13 @@ for (IFile file: changedFiles) { if(file.getName().endsWith(XML_EXT)) { XModelObject o = EclipseResourceUtil.createObjectForResource(file); - if(o != null && o.getModelEntity().getName().startsWith("FacesConfig")) { - validateFile(o, file); + if(o != null) { + String entity = o.getModelEntity().getName(); + if(entity.startsWith("FacesConfig")) { + validateFile(o, file); + } else if(entity.startsWith("FileWebApp")) { + new CheckContextParam(this).check(o); + } } } } @@ -219,7 +270,7 @@ try { // This code line never return null - webInf = project.getFolder(webContentPath.append("WEB-INF")); //$NON-NLS-1$ + webInf = project.getFolder(webContentPath.removeFirstSegments(1).append("WEB-INF")); //$NON-NLS-1$ // so never check it for null if(webInf.isAccessible()) { IResource[] rs = webInf.members(); @@ -236,7 +287,7 @@ if(entity.startsWith("FacesConfig")) { validateFile(o, file); } else if(entity.startsWith("FileWebApp")) { - //TODO + new CheckContextParam(this).check(o); } } } @@ -263,3 +314,124 @@ } } + +class JSFCheckFromViewId extends Check { + + public JSFCheckFromViewId(ValidationErrorManager manager) { + super(manager, JSFSeverityPreferences.INVALID_FROM_VIEW_ID, JSFConstants.ATT_FROM_VIEW_ID); + } + + public void check(XModelObject object) { + String value = object.getAttributeValue(attr); + if(value == null) { + return; + } + if(value != null && value.length() > 0 && !value.startsWith("*") && !value.startsWith("/")) { + fireMessage(object, NLS.bind(JSFValidationMessage.VIEW_ID_NO_SLASH, attr)); + } + } +} + +class JSFCheckToViewId extends Check { + + public JSFCheckToViewId(ValidationErrorManager manager) { + super(manager, JSFSeverityPreferences.INVALID_TO_VIEW_ID, JSFConstants.ATT_TO_VIEW_ID); + } + + public void check(XModelObject object) { + String value = object.getAttributeValue(attr); + if(value == null) { + return; + } + if(value.length() == 0) { + fireMessage(object, NLS.bind(JSFValidationMessage.TO_VIEW_ID_EMPTY, attr)); + } else if(!value.startsWith("/")) { + fireMessage(object, NLS.bind(JSFValidationMessage.VIEW_ID_NO_SLASH, attr)); + } else if(value.indexOf("*") >= 0) { + fireMessage(object, NLS.bind(JSFValidationMessage.TO_VIEW_ID_STAR, attr)); + } else { + checkEsists(object, value); + } + } + + void checkEsists(XModelObject object, String value) { + if(value.indexOf('?') >= 0) { + value = value.substring(0, value.indexOf('?')); + } + XModel model = object.getModel(); + XModelObject o = model.getByPath(value); + if(o == null) { + JSFUrlPattern pattern = JSFWebProject.getInstance(model).getUrlPattern(); + if(pattern != null && pattern.isJSFUrl(value)) { + attr = pattern.getJSFPath(value); + o = model.getByPath(value); + } + } + if(o != null) { + IFile f = (IFile)o.getAdapter(IFile.class); + if(f != null) { + String path = f.getLocation().toOSString().replace('\\', '/'); + if(path.endsWith(value)) return; + } + } else if(checkTiles(model, value)) { + return; + } + fireMessage(object, NLS.bind(JSFValidationMessage.VIEW_NOT_EXISTS, attr, value)); + } + + private boolean checkTiles(XModel model, String path) { + XModelObject root = JSFProjectsTree.getProjectsRoot(model); + if(root == null) return false; + XModelObject tiles = root.getChildByPath("Tiles"); //$NON-NLS-1$ + if(tiles == null) return false; + XModelObject[] ts = ((WebProjectNode)tiles).getTreeChildren(); + if(ts.length == 0) return false; + int d = path.lastIndexOf('.'); + if(d < 0) return false; + String tileName = path.substring(0, d + 1) + "tiles"; //$NON-NLS-1$ + tileName = tileName.replace('/', '#'); + for (int i = 0; i < ts.length; i++) { + if(ts[i].getChildByPath(tileName) != null) return true; + } + return false; + } +} + +class CheckContextParam extends Check { + static String CONFIG_FILES_PARAM = JSFWebHelper.FACES_CONFIG_DATA.param; + + public CheckContextParam(ValidationErrorManager manager) { + super(manager, JSFSeverityPreferences.INVALID_CONFIG_FILES, "param-value"); + } + + public void check(XModelObject webapp) { + XModelObject object = WebAppHelper.findWebAppContextParam(webapp, CONFIG_FILES_PARAM); + if(object == null) return; +// if(!CONFIG_FILES_PARAM.equals(object.getAttributeValue("param-name"))) return; //$NON-NLS-1$ + String value = object.getAttributeValue("param-value"); //$NON-NLS-1$ + if(value == null || value.length() == 0) return; + XModel model = object.getModel(); + XModelObject webRoot = model == null ? null : model.getByPath("FileSystems/WEB-ROOT"); //$NON-NLS-1$ + if(webRoot == null) return; + StringTokenizer st = new StringTokenizer(value, ","); //$NON-NLS-1$ + while(st.hasMoreTokens()) { + String path = st.nextToken().trim(); + if(path.length() == 0) continue; + XModelObject fc = XModelImpl.getByRelativePath(model, path); + if(fc == null) { + fireMessage(object, NLS.bind(JSFValidationMessage.INVALID_FACES_CONFIG_REFERENCE, "param-value", path)); + return; + } + String path2 = path.startsWith("/") ? path.substring(1) : path; //$NON-NLS-1$ + XModelObject fc2 = webRoot.getChildByPath(path2); + if(fc2 == null) { + fireMessage(object, NLS.bind(JSFValidationMessage.INVALID_FACES_CONFIG_REFERENCE, "param-value", path)); + return; + } + if(!fc2.getModelEntity().getName().startsWith("FacesConfig")) { //$NON-NLS-1$ + fireMessage(object, NLS.bind(JSFValidationMessage.INVALID_FACES_CONFIG_REFERENCE, "param-value", path)); + return; + } + } + } +} Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/JSFSeverityPreferences.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/JSFSeverityPreferences.java 2011-11-23 22:33:38 UTC (rev 36586) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/JSFSeverityPreferences.java 2011-11-23 22:34:15 UTC (rev 36587) @@ -40,8 +40,36 @@ public static final String INVALID_STATE_MANAGER = INSTANCE.createSeverityOption("invalidStateManager"); //$NON-NLS-1$ public static final String INVALID_VARIABLE_RESOLVER = INSTANCE.createSeverityOption("invalidVariableResolver"); //$NON-NLS-1$ public static final String INVALID_VIEW_HANDLER = INSTANCE.createSeverityOption("invalidViewHandler"); //$NON-NLS-1$ + //Component + public static final String INVALID_COMPONENT_CLASS = INSTANCE.createSeverityOption("invalidComponentClass"); //$NON-NLS-1$ + //Converter + public static final String INVALID_CONVERTER_CLASS = INSTANCE.createSeverityOption("invalidConverterClass"); //$NON-NLS-1$ + public static final String INVALID_CONVERTER_FOR_CLASS = INSTANCE.createSeverityOption("invalidConverterForClass"); //$NON-NLS-1$ + //Factory + public static final String INVALID_APPLICATION_FACTORY = INSTANCE.createSeverityOption("invalidApplicationFactory"); //$NON-NLS-1$ + public static final String INVALID_FACES_CONTEXT_FACTORY = INSTANCE.createSeverityOption("invalidFacesContextFactory"); //$NON-NLS-1$ + public static final String INVALID_LIFECYCLE_FACTORY = INSTANCE.createSeverityOption("invalidLifecycleFactory"); //$NON-NLS-1$ + public static final String INVALID_RENDER_KIT_FACTORY = INSTANCE.createSeverityOption("invalidRenderKitFactory"); //$NON-NLS-1$ + //List/Map entries + public static final String INVALID_VALUE_CLASS = INSTANCE.createSeverityOption("invalidValueClass"); //$NON-NLS-1$ + public static final String INVALID_KEY_CLASS = INSTANCE.createSeverityOption("invalidKeyClass"); //$NON-NLS-1$ + //Beans + public static final String INVALID_BEAN_CLASS = INSTANCE.createSeverityOption("invalidBeanClass"); //$NON-NLS-1$ + public static final String INVALID_PROPERTY_CLASS = INSTANCE.createSeverityOption("invalidPropertyClass"); //$NON-NLS-1$ + //Phase Listener + public static final String INVALID_PHASE_LISTENER = INSTANCE.createSeverityOption("invalidPhaseListener"); //$NON-NLS-1$ + //Render Kit + public static final String INVALID_RENDER_KIT_CLASS = INSTANCE.createSeverityOption("invalidRenderKitClass"); //$NON-NLS-1$ + //Renderer + public static final String INVALID_RENDERER_CLASS = INSTANCE.createSeverityOption("invalidRendererClass"); //$NON-NLS-1$ + //Validator + public static final String INVALID_VALIDATOR_CLASS = INSTANCE.createSeverityOption("invalidValidatorClass"); //$NON-NLS-1$ + //web.xml + public static final String INVALID_CONFIG_FILES = INSTANCE.createSeverityOption("invalidConfigFiles"); //$NON-NLS-1$ + //Navigation + public static final String INVALID_FROM_VIEW_ID = INSTANCE.createSeverityOption("invalidFromViewId"); //$NON-NLS-1$ + public static final String INVALID_TO_VIEW_ID = INSTANCE.createSeverityOption("invalidToViewId"); //$NON-NLS-1$ - /** * @return the only instance of JSFSeverityPreferences */ Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/JSFValidationMessage.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/JSFValidationMessage.java 2011-11-23 22:33:38 UTC (rev 36586) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/JSFValidationMessage.java 2011-11-23 22:34:15 UTC (rev 36587) @@ -16,7 +16,13 @@ public static String XHTML_VALIDATION; public static String XHTML_VALIDATION_NO_START_TAG; public static String XHTML_VALIDATION_NO_END_TAG; - + + public static String VIEW_ID_NO_SLASH; + public static String TO_VIEW_ID_EMPTY; + public static String TO_VIEW_ID_STAR; + public static String VIEW_NOT_EXISTS; + public static String INVALID_FACES_CONFIG_REFERENCE; + static { NLS.initializeMessages(BUNDLE_NAME, JSFValidationMessage.class); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/messages.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/messages.properties 2011-11-23 22:33:38 UTC (rev 36586) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/messages.properties 2011-11-23 22:34:15 UTC (rev 36587) @@ -9,4 +9,10 @@ XHTML_VALIDATION=XHTML Syntax Validation: {0} XHTML_VALIDATION_NO_START_TAG=No start tag for element "{0}" -XHTML_VALIDATION_NO_END_TAG=No end tag for element "{0}" \ No newline at end of file +XHTML_VALIDATION_NO_END_TAG=No end tag for element "{0}" + +VIEW_ID_NO_SLASH=Attribute {0} must start with \/ +TO_VIEW_ID_EMPTY=Attribute {0} must not be empty +TO_VIEW_ID_STAR=Attribute {0} must not contain * +VIEW_NOT_EXISTS=Attribute {0} references to {1} that does not exist +INVALID_FACES_CONFIG_REFERENCE=Attribute {0} references to {1} that is not a valid faces config file \ No newline at end of file

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36586 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-11-23 17:33:38 -0500 (Wed, 23 Nov 2011) New Revision: 36586 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckClass.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/WebXMLCoreValidator.java Log: JBIDE-10190 https://issues.jboss.org/browse/JBIDE-10190 Migrated validation for web.xml. Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckClass.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckClass.java 2011-11-23 20:48:38 UTC (rev 36585) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckClass.java 2011-11-23 22:33:38 UTC (rev 36586) @@ -48,6 +48,11 @@ public void check(XModelObject object) { if(attr == null) return; String value = object.getAttributeValue(attr); + if(value == null) { + System.out.println("Entity=" + object.getModelEntity().getName()); + System.out.println("Attr=" + attr); + return; + } if(value.length() == 0 || isJavaLang(value)) return; if(isPrimitive(value)) { if(!allowsPrimitive) { Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/WebXMLCoreValidator.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/WebXMLCoreValidator.java 2011-11-23 20:48:38 UTC (rev 36585) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/WebXMLCoreValidator.java 2011-11-23 22:33:38 UTC (rev 36586) @@ -249,7 +249,7 @@ try { // This code line never return null - webInf = project.getFolder(webContentPath.append("WEB-INF")); //$NON-NLS-1$ + webInf = project.getFolder(webContentPath.removeFirstSegments(1).append("WEB-INF")); //$NON-NLS-1$ // so never check it for null if(webInf.isAccessible()) { IResource[] rs = webInf.members();

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36585 - in trunk/jsf/plugins/org.jboss.tools.jsf.ui: META-INF and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2011-11-23 15:48:38 -0500 (Wed, 23 Nov 2011) New Revision: 36585 Added: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/marker/ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/marker/DisableFaceletHTMLValidatorMarkerResolution.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/marker/DisableFaceletHTMLValidatorResolutionGenerator.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/JsfUIMessages.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties Log: "Disable Facelet HTML Validator" quick fix https://issues.jboss.org/browse/JBIDE-9366 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF 2011-11-23 19:59:59 UTC (rev 36584) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF 2011-11-23 20:48:38 UTC (rev 36585) @@ -58,7 +58,8 @@ org.eclipse.jst.jsf.core;bundle-version="1.3.3", org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200", org.eclipse.wst.xml.ui;bundle-version="1.1.200", - org.eclipse.wst.common.project.facet.ui + org.eclipse.wst.common.project.facet.ui, + org.eclipse.wst.validation;bundle-version="1.2.300" Bundle-Version: 3.3.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2011-11-23 19:59:59 UTC (rev 36584) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2011-11-23 20:48:38 UTC (rev 36585) @@ -465,5 +465,11 @@ locationURI="popup:org.eclipse.ui.popup.any?after=save"> </menuContribution> </extension> - + + <extension point="org.eclipse.ui.ide.markerResolution"> + <markerResolutionGenerator + class="org.jboss.tools.jsf.ui.marker.DisableFaceletHTMLValidatorResolutionGenerator" + markerType="org.eclipse.jst.jsf.facelet.ui.FaceletValidationMarker"/> + </extension> + </plugin> Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/JsfUIMessages.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/JsfUIMessages.java 2011-11-23 19:59:59 UTC (rev 36584) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/JsfUIMessages.java 2011-11-23 20:48:38 UTC (rev 36585) @@ -48,6 +48,9 @@ public static String MESSAGES_FILE_RENAME_PARTICIPANT_UPDATE_MESSAGE_BUNDLE_REFERENCES; public static String MESSAGES_FILE_RENAME_PARTICIPANT_FILE_NAME_SHOULD_BE_WITH_THE_SAME_EXTENSION; + public static String DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_FOR_WORKSPACE; + public static String DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_FOR_PROJECT; + static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, JsfUIMessages.class); Added: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/marker/DisableFaceletHTMLValidatorMarkerResolution.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/marker/DisableFaceletHTMLValidatorMarkerResolution.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/marker/DisableFaceletHTMLValidatorMarkerResolution.java 2011-11-23 20:48:38 UTC (rev 36585) @@ -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.tools.jsf.ui.marker; + +import java.lang.reflect.InvocationTargetException; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IMarker; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.graphics.Image; +import org.eclipse.ui.IMarkerResolution2; +import org.eclipse.wst.validation.IMutableValidator; +import org.eclipse.wst.validation.MutableProjectSettings; +import org.eclipse.wst.validation.MutableWorkspaceSettings; +import org.eclipse.wst.validation.ValidationFramework; +import org.jboss.tools.jsf.ui.JsfUIMessages; +import org.jboss.tools.jsf.ui.JsfUiPlugin; + +/** + * @author Daniel Azarov + */ +public class DisableFaceletHTMLValidatorMarkerResolution implements + IMarkerResolution2 { + private static final String MARKER_TYPE = "org.eclipse.jst.jsf.facelet.ui.FaceletValidationMarker"; + private IFile file; + private boolean global; + private String label; + + public DisableFaceletHTMLValidatorMarkerResolution(IFile file, boolean global){ + this.file = file; + this.global = global; + if(global){ + label = JsfUIMessages.DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_FOR_WORKSPACE; + }else{ + label = NLS.bind(JsfUIMessages.DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_FOR_PROJECT, file.getProject().getName()); + } + } + + public String getLabel() { + return label; + } + + public void run(IMarker marker) { + IMutableValidator[] validators; + if(global){ + try { + MutableWorkspaceSettings workspaceSettings = ValidationFramework.getDefault().getWorkspaceSettings(); + validators = workspaceSettings.getValidators(); + if(disableValidator(validators, DisableFaceletHTMLValidatorResolutionGenerator.VALIDATOR_ID)){ + ValidationFramework.getDefault().applyChanges(workspaceSettings, true); + try { + file.getProject().getParent().deleteMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE); + } catch (CoreException e) { + JsfUiPlugin.getPluginLog().logError(e); + } + } + } catch (InvocationTargetException e) { + JsfUiPlugin.getPluginLog().logError(e); + } + }else{ + MutableProjectSettings projectSettings = ValidationFramework.getDefault().getProjectSettings(file.getProject()); + validators = projectSettings.getValidators(); + if(disableValidator(validators, DisableFaceletHTMLValidatorResolutionGenerator.VALIDATOR_ID)){ + ValidationFramework.getDefault().applyChanges(projectSettings, true); + try { + file.getProject().deleteMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE); + } catch (CoreException e) { + JsfUiPlugin.getPluginLog().logError(e); + } + } + } + } + + public static boolean disableValidator(IMutableValidator[] validators, String id){ + IMutableValidator validator = findValidator(validators, id); + if(validator != null){ + validator.setBuildValidation(false); + validator.setManualValidation(false); + return true; + } + return false; + } + + public static IMutableValidator findValidator(IMutableValidator[] validators, String id){ + for(IMutableValidator validator : validators){ + if(validator.getId().equals(id)) + return validator; + } + return null; + } + + public String getDescription() { + return label; + } + + public Image getImage() { + return null; + } + +} Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/marker/DisableFaceletHTMLValidatorMarkerResolution.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/marker/DisableFaceletHTMLValidatorResolutionGenerator.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/marker/DisableFaceletHTMLValidatorResolutionGenerator.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/marker/DisableFaceletHTMLValidatorResolutionGenerator.java 2011-11-23 20:48:38 UTC (rev 36585) @@ -0,0 +1,70 @@ +/******************************************************************************* + * 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.tools.jsf.ui.marker; + +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IMarker; +import org.eclipse.ui.IMarkerResolution; +import org.eclipse.ui.IMarkerResolutionGenerator2; +import org.eclipse.wst.validation.IMutableValidator; +import org.eclipse.wst.validation.MutableProjectSettings; +import org.eclipse.wst.validation.MutableWorkspaceSettings; +import org.eclipse.wst.validation.ValidationFramework; +import org.jboss.tools.jsf.ui.JsfUiPlugin; + +/** + * @author Daniel Azarov + */ +public class DisableFaceletHTMLValidatorResolutionGenerator implements + IMarkerResolutionGenerator2 { + private static final String ATTRIBUTE_NAME = "ValidationId"; + public static final String VALIDATOR_ID = "org.eclipse.jst.jsf.facelet.ui.FaceletHTMLValidator"; + + public IMarkerResolution[] getResolutions(IMarker marker) { + ArrayList<IMarkerResolution> resolutions = new ArrayList<IMarkerResolution>(); + if(isNeedToCreate(marker)){ + IFile file = (IFile)marker.getResource(); + IMutableValidator[] validators; + + try { + MutableWorkspaceSettings workspaceSettings = ValidationFramework.getDefault().getWorkspaceSettings(); + validators = workspaceSettings.getValidators(); + if(DisableFaceletHTMLValidatorMarkerResolution.findValidator(validators, VALIDATOR_ID) != null){ + resolutions.add(new DisableFaceletHTMLValidatorMarkerResolution((IFile)marker.getResource(), true)); + } + } catch (InvocationTargetException e) { + JsfUiPlugin.getPluginLog().logError(e); + } + MutableProjectSettings projectSettings = ValidationFramework.getDefault().getProjectSettings(file.getProject()); + validators = projectSettings.getValidators(); + if(DisableFaceletHTMLValidatorMarkerResolution.findValidator(validators, VALIDATOR_ID) != null){ + resolutions.add(new DisableFaceletHTMLValidatorMarkerResolution((IFile)marker.getResource(), false)); + } + } + return resolutions.toArray(new IMarkerResolution[] {}); + } + + private boolean isNeedToCreate(IMarker marker){ + String attribute = marker.getAttribute(ATTRIBUTE_NAME, ""); + if(attribute.equals(VALIDATOR_ID) && marker.getResource() instanceof IFile){ + return true; + } + return false; + } + + public boolean hasResolutions(IMarker marker) { + return isNeedToCreate(marker); + } + +} Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/marker/DisableFaceletHTMLValidatorResolutionGenerator.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties 2011-11-23 19:59:59 UTC (rev 36584) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties 2011-11-23 20:48:38 UTC (rev 36585) @@ -35,4 +35,6 @@ MISSING_NATURES_INFO_MESSAGE_TITLE=Missing Natures SKIP_BUTTON_LABEL=Skip MESSAGES_FILE_RENAME_PARTICIPANT_UPDATE_MESSAGE_BUNDLE_REFERENCES=Update Message Bundle References -MESSAGES_FILE_RENAME_PARTICIPANT_FILE_NAME_SHOULD_BE_WITH_THE_SAME_EXTENSION=New file name should be with the same extension \ No newline at end of file +MESSAGES_FILE_RENAME_PARTICIPANT_FILE_NAME_SHOULD_BE_WITH_THE_SAME_EXTENSION=New file name should be with the same extension +DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_FOR_WORKSPACE=Disable Facelet HTML Validator for Workspace +DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_FOR_PROJECT=Disable Facelet HTML Validator for ''{0}'' project \ No newline at end of file

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36584 - in trunk/build/aggregate/soa-site: web and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-11-23 14:59:59 -0500 (Wed, 23 Nov 2011) New Revision: 36584 Removed: trunk/build/aggregate/soa-site/README.installation.txt trunk/build/aggregate/soa-site/build.xml trunk/build/aggregate/soa-site/index-template.html trunk/build/aggregate/soa-site/remove-references.xsl trunk/build/aggregate/soa-site/remove-uncategorized.xsl trunk/build/aggregate/soa-site/site.xsl trunk/build/aggregate/soa-site/web/site.css Modified: trunk/build/aggregate/soa-site/pom.xml Log: more refactoring & EOU tweaks [can't build soa site locally :{( ] Deleted: trunk/build/aggregate/soa-site/README.installation.txt =================================================================== --- trunk/build/aggregate/soa-site/README.installation.txt 2011-11-23 19:59:50 UTC (rev 36583) +++ trunk/build/aggregate/soa-site/README.installation.txt 2011-11-23 19:59:59 UTC (rev 36584) @@ -1,10 +0,0 @@ -This file is an Eclipse update zip to be used from within an Eclipse installations update manager. - -Do not unzip this zip into Eclipse directly nor into its dropins folder - it will not work. - -In fact, you do not need to unzip this zip at all - you can simply use the Eclipse Update Manager -( Help > Install New Software... > Add... > Archive... ) to perform the installation directly from -this zip file. - -For more information, see https://www.jboss.org/tools/download/installation/update_3_3.html#fromzip - Deleted: trunk/build/aggregate/soa-site/build.xml =================================================================== --- trunk/build/aggregate/soa-site/build.xml 2011-11-23 19:59:50 UTC (rev 36583) +++ trunk/build/aggregate/soa-site/build.xml 2011-11-23 19:59:59 UTC (rev 36584) @@ -1,761 +0,0 @@ -<project default="custom.build" name="jbosstools aggregate site build.xml"> -  - -  - <condition property="output.dir" value="${WORKSPACE}/results" else="${basedir}"> - <available file="${WORKSPACE}/results" /> - </condition> - - <condition property="COMMON_TOOLS" value="/home/hudson/static_build_env/jbds/tools" else="${java.io.tmpdir}"> - <available file="/home/hudson/static_build_env/jbds" type="dir" /> - </condition> - <mkdir dir="${COMMON_TOOLS}" /> - - <condition property="build.xml" value="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml"> - <available file="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml" type="file" /> - </condition> - <condition property="build.xml" value="${basedir}/../../build/build.xml"> - <available file="${basedir}/../../build/build.xml" type="file" /> - </condition> - <condition property="build.xml" value="${basedir}/../../build.xml"> - <available file="${basedir}/../../build.xml" type="file" /> - </condition> -  - - <property name="update.site.source.dir" value="${output.dir}/target/site" /> - -  - <property name="associate.properties" value="associate.properties" /> - <property file="${associate.properties}" /> - <property name="web.content.files" value="index.html, **/*.css, README*, *directory.xml" /> - - <target name="init"> - <ant antfile="${build.xml}" target="init" /> - <taskdef resource="net/sf/antcontrib/antlib.xml"> - <classpath> - <pathelement location="${COMMON_TOOLS}/ant-contrib.jar" /> - </classpath> - </taskdef> - - <available file="${COMMON_TOOLS}/saxon.jar" type="file" property="saxon.jar.exists" /> - <antcall target="get.saxon" /> - </target> - - <target name="custom.build" description="JBT aggregate update site extra processing steps" depends="init,check.target,unpack.content.jar,remove.references,add.associate.sites,remove.uncategorized.category,add.web.content,pack.content.jar,pack.zip,collect.zips,collect.metadata,create.summary.file" /> - - <target name="get.saxon" unless="saxon.jar.exists"> -  - <property name="SAXON_MIRROR" value="http://downloads.sourceforge.net/project/saxon/Saxon-HE/9.3/saxonhe9-3-0-..." /> - <get usetimestamp="true" dest="${COMMON_TOOLS}/saxonhe9-3-0-4j.zip" src="${SAXON_MIRROR}" /> - <mkdir dir="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" /> - <unzip src="${COMMON_TOOLS}/saxonhe9-3-0-4j.zip" dest="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" overwrite="true" /> - <copy file="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_/saxon9he.jar" tofile="${COMMON_TOOLS}/saxon.jar" failonerror="true" /> - <delete dir="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" includeemptydirs="true" quiet="true" /> - </target> - -  - <macrodef name="fetchZipsFromList"> - <attribute name="repo" default="" /> - <sequential> - - <var name="location.cleaned" value="@{repo}" /> - <propertyregex defaultvalue="${location.cleaned}" input="${location.cleaned}" regexp="/all/repo/*$" replace="" casesensitive="true" override="true" property="location.cleaned" /> - <propertyregex defaultvalue="${location.cleaned}" input="${location.cleaned}" regexp="/tools/*$" replace="" casesensitive="true" override="true" property="location.cleaned" /> - - <echo level="verbose">repo = ${location.cleaned}</echo> -  - <var unset="true" name="ALL_ZIPS" /> - <var unset="true" name="wget.return" /> - <if> - <contains string="${location.cleaned}" substring=":/" /> - <then> - <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> - <arg line="${location.cleaned}/logs/zip.list.txt -q --no-clobber --tries=3" /> - </exec> - </then> - <else> - <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/zip.list.txt" /> - </else> - </if> - - <echo level="verbose">Fetch SVN_REVISION.txt if it exists (return 8 if not found)</echo> - <var name="svnRevTXT" value="${aggregate.zips.dir}/SVN_REVISION.txt" /> - <if> - <contains string="${location.cleaned}" substring=":/" /> - <then> - <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> - <arg line="${location.cleaned}/logs/SVN_REVISION.txt -q --no-clobber --tries=3" /> - </exec> - </then> - <else> - <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/SVN_REVISION.txt" /> - </else> - </if> - - <echo level="verbose">Fetch SVN_REVISION.xml if it exists (return 8 if not found)</echo> - <var name="svnRevXML" value="${aggregate.zips.dir}/SVN_REVISION.xml" /> - <if> - <contains string="${location.cleaned}" substring=":/" /> - <then> - <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> - <arg line="${location.cleaned}/logs/SVN_REVISION.xml -q --no-clobber --tries=3" /> - </exec> - </then> - <else> - <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/SVN_REVISION.xml" /> - </else> - </if> - - <echo level="verbose">Fetch build.properties if it exists (return 8 if not found)</echo> - <var name="buildProperties" value="${aggregate.zips.dir}/build.properties" /> - <if> - <contains string="${location.cleaned}" substring=":/" /> - <then> - <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> - <arg line="${location.cleaned}/logs/build.properties -q --no-clobber --tries=3" /> - </exec> - </then> - <else> - <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/build.properties" /> - </else> - </if> - - <if> - <or> - <and> - <contains string="${location.cleaned}" substring=":/" /> - <equals arg1="${wget.return}" arg2="0" /> - <available file="${aggregate.zips.dir}/zip.list.txt" type="file" /> - </and> - <and> - <not> - <contains string="${location.cleaned}" substring=":/" /> - </not> - <available file="${aggregate.zips.dir}/zip.list.txt" type="file" /> - </and> - </or> - <then> -  - <var unset="true" name="ALL_ZIPS" /> - <property file="${aggregate.zips.dir}/zip.list.txt" /> - <if> - <isset property="ALL_ZIPS" /> - <then> - <var name="relativePath" unset="true" /> - <for list="${ALL_ZIPS}" delimiter=", " keepgoing="true" param="zipPath"> - <sequential> - <propertyregex override="true" property="relativePath" defaultvalue="" input="@{zipPath}" regexp="(.+)/([^/]+\.zip)" replace="\1" /> - - <propertyregex override="true" property="svnrevPath" defaultvalue="" input="@{zipPath}" regexp=".zip" replace=".SVN_REVISION" /> - <propertyregex override="true" property="svnrevPath" defaultvalue="${svnrevPath}" input="${svnrevPath}" regexp="-Sources-|-Update-" replace="-" /> - - <propertyregex override="true" property="buildPropertiesPath" defaultvalue="" input="@{zipPath}" regexp=".zip" replace=".build.properties" /> - <propertyregex override="true" property="buildPropertiesPath" defaultvalue="${buildPropertiesPath}" input="${buildPropertiesPath}" regexp="-Sources-|-Update-" replace="-" /> - - <propertyregex override="true" property="filePrefix" defaultvalue="@{zipPath}" input="@{zipPath}" regexp="(.+)/([^/]+)\.zip" replace="\2.build.properties" /> - - <mkdir dir="${aggregate.zips.dir}/${relativePath}" /> -  - <echo level="verbose">repoNum = @{repoNum} -relativePath = ${relativePath} -svnrevPath = ${svnrevPath} -buildPropertiesPath = ${buildPropertiesPath} -zipPath = @{zipPath} -DEST = ${aggregate.zips.dir}/@{zipPath} -</echo> - <echo level="verbose"> Zip URL = ${location.cleaned}/@{zipPath}</echo> - <if> - <isset property="isTest" /> - <then> -  - <echo file="${aggregate.zips.dir}/@{zipPath}">${aggregate.zips.dir}/@{zipPath}</echo> - </then> - <else> - <if> - <contains string="${location.cleaned}" substring=":/" /> - <then> - - <var name="wget.return" unset="true" /> - <exec executable="wget" dir="${aggregate.zips.dir}/${relativePath}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> - <arg line="${location.cleaned}/@{zipPath} -q --no-clobber --tries=3" /> - </exec> - <if> - <not> - <equals arg1="${wget.return}" arg2="0" /> - </not> - <then> - <echo> ** Error [${wget.return}] ** Could not wget ${location.cleaned}/@{zipPath}</echo> - </then> - </if> - </then> - <else> - <copy todir="${aggregate.zips.dir}/${relativePath}" failonerror="false" file="${location.cleaned}/@{zipPath}" /> - </else> - </if> - </else> - </if> - - <if> - <available file="${aggregate.zips.dir}/@{zipPath}" type="file" /> - <then> -  - <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filename = @{zipPath} -</echo> -  - <length file="${aggregate.zips.dir}/@{zipPath}" property="fs.length.b" /> -  -  -  - <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filesize = ${fs.length.b} -</echo> - <var name="fs.length.b" unset="true" /> - <var name="fs.length.kb" unset="true" /> - -  - <checksum file="${aggregate.zips.dir}/@{zipPath}" property="${filePrefix}.filemd5" /> - <propertycopy from="${filePrefix}.filemd5" property="tempmd5" /> - <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filemd5 = ${tempmd5} -</echo> - <var name="${filePrefix}.filemd5" unset="true" /> - <var name="tempmd5" unset="true" /> - </then> - </if> - -  - <if> - <available file="${svnRevTXT}" type="file" /> - <then> - <copy file="${svnRevTXT}" tofile="${aggregate.zips.dir}/${svnrevPath}.txt" /> - </then> - </if> - <if> - <available file="${svnRevXML}" type="file" /> - <then> - <copy file="${svnRevXML}" tofile="${aggregate.zips.dir}/${svnrevPath}.xml" /> - </then> - </if> - <if> - <available file="${buildProperties}" type="file" /> - <then> - <copy file="${buildProperties}" tofile="${aggregate.zips.dir}/${buildPropertiesPath}.txt" /> - </then> - </if> - </sequential> - </for> - <var name="relativePath" unset="true" /> - <var name="svnrevPath" unset="true" /> - <var name="buildPropertiesPath" unset="true" /> - </then> - </if> - <var unset="true" name="ALL_ZIPS" /> - </then> - <else> - <echo> ** Error [${wget.return}] ** Could not wget ${location.cleaned}/logs/zip.list.txt</echo> - </else> - </if> - <var name="location.cleaned" unset="true" /> - <delete quiet="true"> - <fileset dir="${aggregate.zips.dir}" includes="zip.list.txt, SVN_REVISION.txt, SVN_REVISION.xml, build.properties" /> - </delete> - <var name="svnRevFile" unset="true" /> - </sequential> - </macrodef> - -  - <macrodef name="fetchZipsFromMetadata"> - <attribute name="repo" default="" /> - <sequential> - <var name="location.cleaned" value="@{repo}" /> - <echo level="verbose">repo = ${location.cleaned}</echo> -  - <var name="wget.return" unset="true" /> - <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> - <arg line="${location.cleaned}/compositeArtifacts.xml -q --no-clobber --tries=3" /> - </exec> - <if> - <and> - <equals arg1="${wget.return}" arg2="0" /> - <available file="${aggregate.zips.dir}/compositeArtifacts.xml" type="file" /> - </and> - <then> - <echo level="verbose">Got ${aggregate.zips.dir}/compositeArtifacts.xml</echo> - <xmlproperty file="${aggregate.zips.dir}/compositeArtifacts.xml" validate="false" collapseAttributes="true" /> - <echo level="verbose">Found ${repository.children.size} contained repos to search</echo> - -  - <var name="counter" value="" /> -  - <for param="location" list="${repository.children.child.location}"> - <sequential> - <var name="counter" value="${counter}0" /> - <var name="i" unset="true" /> - <length property="i" string="${counter}" /> - <if> - <not> - <contains string="@{location}" substring="/staging.previous/" /> - </not> - <then> - <if> - <available file="/home/hudson/static_build_env/jbds/builds/staging" type="dir" /> - <then> - <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="/home/hudson/static_build_env/jbds/builds/staging/" /> - <if> - <not> - <available file="${location.cleaned}" /> - </not> - <then> - <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" /> - </then> - </if> - </then> - <else> - <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" /> - </else> - </if> - <echo level="error">[${i}/${repository.children.size}] Site URL = ${location.cleaned} (@{location})</echo> - <fetchZipsFromList repo="${location.cleaned}" /> - </then> - <else> - <echo level="error">[${i}/${repository.children.size}] Skip @{location}</echo> - </else> - </if> - </sequential> - </for> - <var name="counter" unset="true" /> - <var name="i" unset="true" /> - - <delete file="${aggregate.zips.dir}/compositeArtifacts.xml" quiet="true" /> - </then> - <else> - <echo> ** Error [${wget.return}] ** Could not wget ${location.cleaned}/compositeArtifacts.xml</echo> - </else> - </if> - </sequential> - </macrodef> - - <target name="add.associate.sites" if="associate.sites"> - <if> - <and> -  - <isset property="associate.sites" /> - <not> - <equals arg1="${associate.sites}" arg2="" /> - </not> - </and> - <then> -  - <var name="associate.sites.0" value="" /> - <for param="associate.site" list="${associate.sites}" delimiter=", - "> - <sequential> - <var name="associate.sites.0" value="${associate.sites.0}00" /> - </sequential> - </for> - <length property="associate.sites.length" string="${associate.sites.0}" /> - - <loadfile srcfile="${update.site.source.dir}/content.xml" property="content.xml"> - <filterchain> - <tailfilter lines="-1" skip="1" /> - </filterchain> - </loadfile> - <echo file="${update.site.source.dir}/content.xml" message="${content.xml}" /> - <echo file="${update.site.source.dir}/content.xml" append="true"> <references size='${associate.sites.length}'> -</echo> - <for param="associate.site" list="${associate.sites}" delimiter=", - "> - <sequential> -  - <echo file="${update.site.source.dir}/content.xml" append="true"> <repository uri='@{associate.site}' url='@{associate.site}' type='0' options='1'/> - <repository uri='@{associate.site}' url='@{associate.site}' type='1' options='1'/> -</echo> - </sequential> - </for> - <echo file="${update.site.source.dir}/content.xml" append="true"> </references> -</repository> -</echo> - </then> - </if> - </target> - - <target name="remove.references"> - <copy file="${update.site.source.dir}/content.xml" tofile="${update.site.source.dir}/content.old.xml" overwrite="true" /> - <xslt style="remove-references.xsl" in="${update.site.source.dir}/content.old.xml" out="${update.site.source.dir}/content.xml" /> - </target> - - <target name="remove.uncategorized.category"> - <copy file="${update.site.source.dir}/content.xml" tofile="${update.site.source.dir}/content.old.xml" overwrite="true" /> - <xslt style="remove-uncategorized.xsl" in="${update.site.source.dir}/content.old.xml" out="${update.site.source.dir}/content.xml" /> - </target> - - <target name="unpack.content.jar"> - <if> - <available file="${update.site.source.dir}/content.jar" type="file" /> - <then> - <unzip src="${update.site.source.dir}/content.jar" dest="${update.site.source.dir}" /> - <delete file="${update.site.source.dir}/content.jar" /> - </then> - </if> - </target> - - <target name="pack.content.jar"> - <zip destfile="${update.site.source.dir}/content.jar" basedir="${update.site.source.dir}" includes="content.xml" /> - <delete file="${update.site.source.dir}/content.xml" /> - <delete file="${update.site.source.dir}/content.old.xml" /> - </target> - - <target name="unpack.zip"> - <unzip src="${output.dir}/target/site_assembly.zip" dest="${update.site.source.dir}" /> - </target> - - <target name="pack.zip"> - <zip destfile="${output.dir}/target/site_assembly.zip" update="true" basedir="${update.site.source.dir}" includes="content.*, ${web.content.files}" /> - </target> - - <target name="check.target"> - <if> - <or> - <not> - <available file="${output.dir}/target/site" type="dir" /> - </not> - <not> - <available file="${output.dir}/target/site_assembly.zip" type="file" /> - </not> - </or> - <then> - <fail> --- -This script must ONLY be called via the pom.xml in this directory, not run directly. -Cannot adjust an update site w/o first building it! --- -To run this build, use Tycho. Try `mvn3 clean install -U -B -fae -q -e` -</fail> - </then> - </if> - </target> - - <target name="add.web.content"> -  - <property name="update.site.description" value="Nightly Build" /> - <if> - <and> - <not> - <isset property="update.site.version" /> - </not> - <isset property="JOB_NAME" /> - <isset property="BUILD_ID" /> - <isset property="BUILD_NUMBER" /> - </and> - <then> -  - <propertyregex override="true" property="BUILD_TS" defaultvalue="${BUILD_ID}" input="${BUILD_ID}" regexp="([0-9]+)-([0-9]+)-([0-9]+)_([0-9]+)-([0-9]+)-([0-9]+)" replace="v\1\2\3-\4\5" /> - <if> - <and> - <isset property="JBT_VERSION" /> - <isset property="BUILD_ALIAS" /> - </and> - <then> - <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\3" /> - </then> - <else> - <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": \1.${BUILD_TS}-H${BUILD_NUMBER}\2\3" /> - </else> - </if> - </then> - <else> - <property name="update.site.version" value="" /> - </else> - </if> - -  - <antcallback target="transform.site.xml" return="site.contents" /> - - <copy todir="${output.dir}" overwrite="true"> - <fileset file="index-template.html" /> - <mapper type="merge" to="index.html" /> - <filterchain> - <expandproperties /> - </filterchain> - </copy> - - <copy todir="${update.site.source.dir}"> - <fileset dir="${output.dir}" includes="${web.content.files}" /> - </copy> - </target> - - <target name="transform.site.xml"> -  - <delete quiet="true" file="${update.site.source.dir}/site.html" /> - <xslt style="site.xsl" in="${update.site.source.dir}/site.xml" out="${update.site.source.dir}/site.html" force="true"> - <classpath location="${COMMON_TOOLS}/saxon.jar" /> - </xslt> -  - <loadfile property="site.contents" srcfile="${update.site.source.dir}/site.html" failonerror="false" /> - <property name="site.contents" value="" /> - <delete file="${update.site.source.dir}/site.html" quiet="true" /> - </target> - -  - <target name="collect.zips" description="collect zips from the sites we aggregated" unless="collect.zips.skip"> - <property name="aggregate.zips.dir" value="${output.dir}/zips" /> - <delete dir="${aggregate.zips.dir}" quiet="true" /> - <mkdir dir="${aggregate.zips.dir}" /> - <if> - <isset property="inputRepo" /> - <then> - <var name="inputRepos" value="1" /> - <var name="inputRepo1" value="${inputRepo}" /> - </then> - </if> - <for list="${inputRepos}" delimiter=", " keepgoing="true" param="repoNum"> - <sequential> - <var name="repo" value="${inputRepo@{repoNum}}" /> - <if> - <contains string="${repo}" substring="composite" /> - <then> - <fetchZipsFromMetadata repo="${repo}" /> - </then> - <else> - <fetchZipsFromList repo="${repo}" /> - </else> - </if> - </sequential> - </for> - </target> - - <target name="test.collect.zips.from.metadata" depends="init"> - <property name="isTest" value="true" /> - <antcall target="collect.zips"> - <param name="inputRepos" value="1" /> - <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk" /> - </antcall> - </target> - - <target name="test.collect.zips.from.metadata.with.errors" depends="init"> - <property name="isTest" value="true" /> - <antcall target="collect.zips"> - <param name="inputRepos" value="1,2" /> - <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/NO_SUCH_B..." /> - </antcall> - </target> - - <target name="test.collect.zips.from.list.xml" depends="init"> - <property name="isTest" value="true" /> - <antcall target="collect.zips"> - <param name="inputRepos" value="1,2,3,4" /> - <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> - <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> - <param name="inputRepo3" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> - <param name="inputRepo4" value="http://download.jboss.org/jbosstools/builds/staging/xulrunner-1.9.1.2" /> - </antcall> - </target> - - <target name="test.collect.zips.from.list.txt" depends="init"> - <property name="isTest" value="true" /> - <antcall target="collect.zips"> - <param name="inputRepos" value="1,2,3,4,5" /> - <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> - <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> - <param name="inputRepo3" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> - <param name="inputRepo4" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1..." /> - <param name="inputRepo5" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1..." /> - </antcall> - </target> - - <target name="test.collect.zips.from.list.with.errors" depends="init"> - <property name="isTest" value="true" /> - <antcall target="collect.zips"> - <param name="inputRepos" value="1,2" /> - <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> - </antcall> - </target> - - <target name="test.collect.zips" depends="test.collect.zips.from.metadata,test.collect.zips.from.list.txt,test.collect.zips.from.list.xml"> - <delete dir="${aggregate.zips.dir}" quiet="true" /> - </target> - - <target name="test.collect.zips.with.error" depends="test.collect.zips.from.metadata.with.errors,test.collect.zips.from.list.with.errors"> - <delete dir="${aggregate.zips.dir}" quiet="true" /> - </target> - - <target name="collect.metadata" description="collect svn revision info + other metadata (JOB_NAME, BUILD_ID, BUILD_NUMBER, WORKSPACE, HUDSON_SLAVE), zip file names+sizes+md5sums"> - <property name="aggregate.zips.dir" value="${output.dir}/zips" /> - <mkdir dir="${aggregate.zips.dir}" /> -  - <if> - <available file="${aggregate.zips.dir}/build.properties.file.txt" type="file" /> - <then> - <property file="${aggregate.zips.dir}/build.properties.file.txt" /> - </then> - </if> - -  - <for param="propsfile"> - <path> - <fileset dir="${aggregate.zips.dir}" includes="*.build.properties.txt, **/*.build.properties.txt" /> - </path> - <sequential> -  - <propertyregex override="true" property="prefix" defaultvalue="" input="@{propsfile}" regexp=".+/([^/]+\.build\.properties)\.txt" replace="\1" /> - <echo level="verbose">Read ${prefix} from @{propsfile}</echo> - - <property file="@{propsfile}" prefix="${prefix}" /> - -  - <propertyregex override="true" property="svnrevTXT" defaultvalue="" input="@{propsfile}" regexp="\.build\.properties\.txt" replace=".SVN_REVISION.txt" /> - <propertyregex override="true" property="svnrevXML" defaultvalue="" input="@{propsfile}" regexp="\.build\.properties\.txt" replace=".SVN_REVISION.xml" /> - <if> - <available file="${svnrevXML}" type="file" /> - <then> -  - <xmlproperty file="${svnrevXML}" collapseAttributes="true" prefix="${prefix}" keeproot="false" /> -  - <if> - <isset property="${prefix}.kind" /> - <then> - <var name="${prefix}.kind" unset="true" /> - </then> - </if> - -  - <if> - <and> - <isset property="${prefix}.revision.module" /> - <isset property="${prefix}.revision.revision" /> - </and> - <then> - <propertycopy from="${prefix}.revision.module" property="temprm.all" override="true" /> - <propertycopy from="${prefix}.revision.revision" property="temprr.all" override="true" /> - <var name="i" value="0" /> - <for list="${temprm.all}" delimiter=", " param="module"> - <sequential> - <math result="i" operand1="1" operation="+" operand2="${i}" datatype="int" /> - <var name="j" value="0" /> - <for list="${temprr.all}" delimiter=", " param="revision"> - <sequential> - <math result="j" operand1="1" operation="+" operand2="${j}" datatype="int" /> - <if> - <equals arg1="${i}" arg2="${j}" /> - <then> - <var name="temprr" value="@{revision}" /> - <if> - <isset property="${prefix}.SVN_REVISION" /> - <then> - <propertycopy from="${prefix}.SVN_REVISION" property="temp.all" override="true" /> - <var name="${prefix}.SVN_REVISION" value="${temp.all},@{module}@${temprr}" /> - <var name="temp.all" unset="true" /> - </then> - <else> - <var name="${prefix}.SVN_REVISION" value="@{module}@${temprr}" /> - </else> - </if> - <var name="temprr" unset="true" /> - </then> - </if> - </sequential> - </for> - <var name="j" unset="true" /> - </sequential> - </for> - <var name="i" unset="true" /> - <var name="temprm.all" unset="true" /> - <var name="temprr.all" unset="true" /> - </then> - </if> - </then> - <elseif> - <available file="${svnrevTXT}" type="file" /> - <then> -  - <loadfile property="${prefix}.SVN_REVISION" srcFile="${svnrevTXT}" /> - <propertycopy from="${prefix}.SVN_REVISION" property="temp" /> - <propertyregex override="true" property="temp" defaultvalue="${temp}" input="${temp}" regexp="[ \n\t]+" replace="," /> - <propertyregex override="true" property="${prefix}.SVN_REVISION" defaultvalue="${temp}" input="${temp}" regexp=",$" replace="" /> - -  - <for list="${temp}" delimiter="," param="pair"> - <sequential> - <propertyregex override="true" property="temprm" defaultvalue="@{pair}" input="@{pair}" regexp="(.+)(a)(.+)" replace="\1" /> - <propertyregex override="true" property="temprr" defaultvalue="@{pair}" input="@{pair}" regexp="(.+)(a)(.+)" replace="\2" /> - <if> - <isset property="${prefix}.revision.module" /> - <then> - <propertycopy from="${prefix}.revision.module" property="temprm.all" override="true" /> - <propertycopy from="${prefix}.revision.revision" property="temprr.all" override="true" /> - <var name="${prefix}.revision.module" value="${temprm.all},${temprm}" /> - <var name="${prefix}.revision.revision" value="${temprr.all},${temprr}" /> - <var name="temprm.all" unset="true" /> - <var name="temprr.all" unset="true" /> - </then> - <else> - <var name="${prefix}.revision.module" value="${temprm}" /> - <var name="${prefix}.revision.revision" value="${temprr}" /> - </else> - </if> - <var name="temprm" unset="true" /> - <var name="temprr" unset="true" /> - </sequential> - </for> - <var name="temp" unset="true" /> - </then> - </elseif> - </if> - - <var name="prefix" unset="true" /> - </sequential> - - </for> - <for param="svnrevfile"> - <path> - <fileset dir="${aggregate.zips.dir}" includes="*.SVN_REVISION.txt, **/*.SVN_REVISION.txt" /> - </path> - <sequential> -  - <propertyregex override="true" property="prefix" defaultvalue="" input="@{propsfile}" regexp=".+/([^/]+\.build\.properties)\.txt" replace="\1" /> - <echo level="verbose">Read ${prefix} from @{propsfile}</echo> - - <property file="@{propsfile}" prefix="${prefix}" /> - - <var name="prefix" unset="true" /> - </sequential> - - </for> -  - <echoproperties format="xml" destfile="${aggregate.zips.dir}/build.properties.all.xml"> - <propertyset> - <propertyref regex=".*\.build\.properties" /> - </propertyset> - </echoproperties> - - </target> - - <target name="test.collect.metadata" depends="init"> - <property name="isTest" value="true" /> - <antcall target="collect.metadata"> - </antcall> - </target> - -  - <target name="create.summary.file" description="create summary file with list of generated files, sizes, and SVN revisions all linked and ordered by source build job"> - </target> - - <target name="test.create.summary.file" depends="test.collect.zips,test.collect.metadata"> - <property name="isTest" value="true" /> - <antcall target="create.summary.file"> - </antcall> - </target> - -</project> Deleted: trunk/build/aggregate/soa-site/index-template.html =================================================================== --- trunk/build/aggregate/soa-site/index-template.html 2011-11-23 19:59:50 UTC (rev 36583) +++ trunk/build/aggregate/soa-site/index-template.html 2011-11-23 19:59:59 UTC (rev 36584) @@ -1,152 +0,0 @@ -<html> -<head> -<title>JBoss Tools - SOA Tooling - ${update.site.description} Update Site${update.site.version}</title> -<style> -@import url("http://download.jboss.org/jbosstools/updates/web/site.css"); -</style> -</head> -<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> -<center> -<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" - cellspacing="0" cellpadding="0" width="920" class="bodyText"> - <tr> - <td colspan="3"><img - src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> - </tr> - <tr> - <td>      </td> - <td>      </td> - <td>      </td> - </tr> - <tr> - <td>      </td> - <td> - <h2 class="title">JBoss Tools - SOA Tooling - ${update.site.description} Update Site</h2> - <table width="100%"> - <tr class="header"> - <td class="sub-header" width="100%"><span>Latest Build${update.site.version}</span></td> - </tr> - - <tr class="light-row" style="height: 30px"> - <td class="bodyText"> - <p class="bodyText">This is the <b>${update.site.description}</b> - Update Site for JBoss Tools - SOA Tooling. - <blockquote style="border: 1px dashed #1778be; padding: 2px"> - <ol> - <li>To <a class="link" - href="http://www.jboss.org/tools/download/installation/update_3_3">install</a> - from this site, start up Eclipse 3.7, then do: - <ul> - <code><strong>Help > Install New Software... ></strong></code> - </ul> - </li> - <li>Copy this site's URL into Eclipse, and hit Enter.</li> - <li>When the site loads, select the features to install, - or click the <code><strong>Select All</strong></code> button.</li> - <li>To properly resolve all dependencies, check - <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul> - - <li>Click <code><strong>Next</strong></code>, agree to the license - terms, and install.</li> - - <p class="bodyText"> - You can also download JBoss Tools as individual zips for - offline installation. See <a class="link" - href="http://www.jboss.org/tools/download">JBoss Tools - Downloads</a>.<br /> If you downloaded this site as a zip, see - <a href="README.installation.txt">Installation README</a>. - See also <a - href="http://www.jboss.org/tools/download/installation">Installation - methods</a>. - </p> - </ol> - </blockquote> - </td> - </tr> - -  - - </table> - </td> - <td>      </td> - </tr> - <tr> - <td></td> - <td> - ${site.contents} - </td> - <td></td> - </tr> - <tr> - <td></td> - <td> - <table width="100%"> - <tr class="header"> - <td class="sub-header" width="100%"><span> Installation - Types</span></td> - </tr> - <tr class="light-row" style="height: 30px"> - <td class="bodyText"> - <p class="bodyText">Depending on how close to the bleeding edge - you like to be, there are several types of releases available.</p> - <br /> - - </td> - </tr> - - <tr class="dark-row" style="height: 30px"> - <td class="bodyText"> - <h4>Stable Releases</h4> - - <p><a href="https://www.jboss.org/tools/download/stable.html">Stable - releases</a> are - as indicated by their name - stable.</p><br/> - - </td> - </tr> - - <tr class="light-row" style="height: 30px"> - <td class="bodyText"> - <h4>Development Milestones</h4> - - <p><a href="https://www.jboss.org/tools/download/dev.html">Development - builds</a>, released once per milestone and only a few times a year, are - fairly stable, but there may be some things which do not yet work. - If you would like to try one of these milestones, we'd greatly - appreciate the assistance in testing and <a - href="https://jira.jboss.org/jira/browse/JBIDE">reporting of - issues in our issue tracker</a>.</p><br/> - - </td> - </tr> - - <tr class="dark-row" style="height: 30px"> - <td class="bodyText"> - <h4>Nightly Builds</h4> - - <p>The <a - href="https://www.jboss.org/tools/download/nightly.html">bleeding - edge</a> contains the latest and greatest new features, but nothing is - stable or guaranteed - yet. If you're using a Milestone and need a - fix, you can update to the latest Nightly, or wait for the next - Milestone.</p><br/> - </td> - </tr> - </table> - </td> - </tr> -</table> -</center> -</html> Modified: trunk/build/aggregate/soa-site/pom.xml =================================================================== --- trunk/build/aggregate/soa-site/pom.xml 2011-11-23 19:59:50 UTC (rev 36583) +++ trunk/build/aggregate/soa-site/pom.xml 2011-11-23 19:59:59 UTC (rev 36584) @@ -4,13 +4,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.aggregate.site</artifactId> - <version>0.0.1-SNAPSHOT</version> + <artifactId>org.jboss.tools.site</artifactId> + <version>0.0.2-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.site.aggregate.soa-tooling</artifactId> + <artifactId>org.jboss.tools.site.soa-tooling</artifactId> <name>JBoss Tools - SOA Tooling Site</name> - <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> <build> <plugins> @@ -26,9 +25,15 @@ <quiet>true</quiet> <tasks>  - <ant antfile="build.xml"> + <condition property="output.dir" value="${WORKSPACE}/results" + else="${basedir}"> + <available file="${WORKSPACE}/results" /> + </condition> + <ant antfile="build.xml" target="custom.build" dir="../"> + <property name="output.dir" value="${output.dir}" /> <property name="inputRepo" value="${jbosstools-nightly-staging-composite}" /> + <property name="update.site.name" value="JBoss Tools - SOA Tooling"/> <property name="JBT_VERSION" value="${JBT_VERSION}" /> <property name="BUILD_ALIAS" value="${BUILD_ALIAS}" /> </ant> Deleted: trunk/build/aggregate/soa-site/remove-references.xsl =================================================================== --- trunk/build/aggregate/soa-site/remove-references.xsl 2011-11-23 19:59:50 UTC (rev 36583) +++ trunk/build/aggregate/soa-site/remove-references.xsl 2011-11-23 19:59:59 UTC (rev 36584) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"> - -<xsl:template match="/"> - <xsl:apply-templates select="*"/> -</xsl:template> - - -<xsl:template match="*"> - <xsl:copy > - <xsl:for-each select="@*"> - <xsl:copy /> - </xsl:for-each> - <xsl:apply-templates /> - </xsl:copy> -</xsl:template> - -<xsl:template match="references" /> - -</xsl:stylesheet> \ No newline at end of file Deleted: trunk/build/aggregate/soa-site/remove-uncategorized.xsl =================================================================== --- trunk/build/aggregate/soa-site/remove-uncategorized.xsl 2011-11-23 19:59:50 UTC (rev 36583) +++ trunk/build/aggregate/soa-site/remove-uncategorized.xsl 2011-11-23 19:59:59 UTC (rev 36584) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"> - -<xsl:template match="/"> - <xsl:apply-templates select="*"/> -</xsl:template> - - -<xsl:template match="*"> - <xsl:copy > - <xsl:for-each select="@*"> - <xsl:copy /> - </xsl:for-each> - <xsl:apply-templates /> - </xsl:copy> -</xsl:template> - -<xsl:template match="unit[contains(@id,'site.xml.Default')]" /> - -</xsl:stylesheet> \ No newline at end of file Deleted: trunk/build/aggregate/soa-site/site.xsl =================================================================== --- trunk/build/aggregate/soa-site/site.xsl 2011-11-23 19:59:50 UTC (rev 36583) +++ trunk/build/aggregate/soa-site/site.xsl 2011-11-23 19:59:59 UTC (rev 36584) @@ -1,126 +0,0 @@ -<xsl:stylesheet version="2.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xalan="http://xml.apache.org/xalan" - xmlns:saxon="http://saxon.sf.net/" xmlns="http://www.w3.org/1999/xhtml" - extension-element-prefixes="saxon"> - <xsl:output method="html" indent="yes" /> - <xsl:template match="/site"> - <table cellspacing="2" cellpadding="0" border="0"> - <xsl:if test="count(feature[contains(@id,'jboss')])>0"> - <tr style="background-color:#DDDDDD"> - <th style="font-size:small">Feature</th> - <th style="font-size:small">Version</th> - <th style="font-size:small"> - Feature Categor(ies) - </th> - </tr> -  - <xsl:for-each select="feature[contains(@id,'jboss')]"> - <xsl:sort select="@id" /> - <xsl:variable name="rowCol"> - <xsl:if test="position() mod 2 = 1"> - #EEEEEE - </xsl:if> - <xsl:if test="position() mod 2 = 0"> - #FFFFFF - </xsl:if> - </xsl:variable> - - <tr style="background-color:{$rowCol}"> - <td class="rowLine"> - <a href="{@url}" style="font-size:x-small"> - <xsl:value-of select="@id" /> - </a> - </td> - <td> - <span style="font-size:x-small"> - <xsl:value-of select="@version" /> - </span> - </td> - <td> - <xsl:choose> - <xsl:when test="category"> - <xsl:for-each select="category"> - <span style="font-size:x-small"> - | - <xsl:value-of select="@name" /> - </span> - </xsl:for-each> - </xsl:when> - </xsl:choose> - </td> - </tr> - </xsl:for-each> - </xsl:if> - <xsl:if test="count(feature[not(contains(@id,'jboss'))])>0"> - <tr style="background-color:#DDDDDD"> - <th style="font-size:small">Feature</th> - <th style="font-size:small">Version</th> - <th style="font-size:small"> - Feature Categor(ies) - </th> - </tr> -  - <xsl:for-each select="feature[not(contains(@id,'jboss'))]"> - <xsl:sort select="@id" /> - <xsl:variable name="rowCol"> - <xsl:if test="position() mod 2 = 1"> - #EEEEEE - </xsl:if> - <xsl:if test="position() mod 2 = 0"> - #FFFFFF - </xsl:if> - </xsl:variable> - - <tr style="background-color:{$rowCol}"> - <td class="rowLine"> - <a href="{@url}" style="font-size:x-small"> - <xsl:value-of select="@id" /> - </a> - </td> - <td> - <span style="font-size:x-small"> - <xsl:value-of select="@version" /> - </span> - </td> - <td> - <xsl:choose> - <xsl:when test="category"> - <xsl:for-each select="category"> - <span style="font-size:x-small"> - | - <xsl:value-of select="@name" /> - </span> - </xsl:for-each> - </xsl:when> - </xsl:choose> - </td> - </tr> - </xsl:for-each> - </xsl:if> - - <tr style="background-color:#DDDDDD"> - <th colspan="1" style="font-size:small">Metadata</th> - <th colspan="1" style="font-size:small"></th> - <th colspan="1" style="font-size:small"></th> - </tr> - <tr style="background-color:#EEEEEE"> - <td class="rowLine" colspan="1"> - <a href="site.xml" style="font-size:x-small">site.xml</a> - :: - <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> - :: - <a href="content.jar" style="font-size:x-small">content.jar</a> - </td> - <td class="rowLine" colspan="1"> - :: - <a href="plugins/" style="font-size:x-small">plugins</a> - :: - <a href="features/" style="font-size:x-small">features</a> - </td> - <td class="rowLine" colspan="1"> - </td> - </tr> - </table> - <br /> - </xsl:template> -</xsl:stylesheet> Deleted: trunk/build/aggregate/soa-site/web/site.css =================================================================== --- trunk/build/aggregate/soa-site/web/site.css 2011-11-23 19:59:50 UTC (rev 36583) +++ trunk/build/aggregate/soa-site/web/site.css 2011-11-23 19:59:59 UTC (rev 36584) @@ -1,66 +0,0 @@ -< -STYLE type ="text/css">td.spacer { - padding-bottom: 10px; - padding-top: 10px; -} - -.title { - font-family: sans-serif; - color: #1778be; -} - -.bodyText { - font-family: sans-serif; - font-size: 9pt; - color: #000000; -} - -.sub-header { - font-family: sans-serif; - font-style: normal; - font-weight: bold; - font-size: 9pt; - color: white; -} - -.log-text { - font-family: sans-serif; - font-style: normal; - font-weight: lighter; - font-size: 8pt; - color: black; -} - -.big-header { - font-family: sans-serif; - font-style: normal; - font-weight: bold; - font-size: 9pt; - color: white; - border-top: 10px solid white; -} - -.light-row { - background: #FFFFFF -} - -.dark-row { - background: #EEEEEE -} - -.header { - background: #445562 -} - -#indent { - word-wrap: break-word; - width: 300px; - text-indent: 10px; -} - -.link { - color: #187dc6; -} -</ -STYLE -> \ No newline at end of file

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36583 - trunk/build/aggregate/bottests-site/site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-11-23 14:59:50 -0500 (Wed, 23 Nov 2011) New Revision: 36583 Modified: trunk/build/aggregate/bottests-site/site/index.html Log: regen index Modified: trunk/build/aggregate/bottests-site/site/index.html =================================================================== --- trunk/build/aggregate/bottests-site/site/index.html 2011-11-23 19:59:41 UTC (rev 36582) +++ trunk/build/aggregate/bottests-site/site/index.html 2011-11-23 19:59:50 UTC (rev 36583) @@ -80,18 +80,18 @@ </th> </tr> <tr style="background-color:
							#EEEEEE
						"> - <td class="rowLine"><a href="features/org.jboss.tools.bot.test.feature_3.1.0.v20111123-1955-M5.jar" style="font-size:x-small">org.jboss.tools.bot.test.feature</a></td> - <td><span style="font-size:x-small">3.1.0.v20111123-1955-M5</span></td> + <td class="rowLine"><a href="features/org.jboss.tools.bot.test.feature_3.1.0.v20111123-1957-M5.jar" style="font-size:x-small">org.jboss.tools.bot.test.feature</a></td> + <td><span style="font-size:x-small">3.1.0.v20111123-1957-M5</span></td> <td><span style="font-size:x-small"> | - JBoss Tools bot.tests Nightly Build Update Site</span></td> + Bot Tests</span></td> </tr> <tr style="background-color:
							#FFFFFF
						"> <td class="rowLine"><a href="features/org.jboss.tools.test.feature_3.2.0.v20111123-0956-H473-M5.jar" style="font-size:x-small">org.jboss.tools.test.feature</a></td> <td><span style="font-size:x-small">3.2.0.v20111123-0956-H473-M5</span></td> <td><span style="font-size:x-small"> | - JBoss Tools bot.tests Nightly Build Update Site</span></td> + Bot Tests</span></td> </tr> <tr style="background-color:#DDDDDD"> <th colspan="1" style="font-size:small">Metadata</th>

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36582 - in trunk/build/aggregate/bottests-site: features and 5 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-11-23 14:59:41 -0500 (Wed, 23 Nov 2011) New Revision: 36582 Removed: trunk/build/aggregate/bottests-site/site/README.installation.txt trunk/build/aggregate/bottests-site/site/build.xml trunk/build/aggregate/bottests-site/site/index-template.html trunk/build/aggregate/bottests-site/site/remove-references.xsl trunk/build/aggregate/bottests-site/site/remove-uncategorized.xsl trunk/build/aggregate/bottests-site/site/site.xsl Modified: trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/pom.xml trunk/build/aggregate/bottests-site/features/pom.xml trunk/build/aggregate/bottests-site/plugins/pom.xml trunk/build/aggregate/bottests-site/pom.xml trunk/build/aggregate/bottests-site/site/associate.properties trunk/build/aggregate/bottests-site/site/index.html trunk/build/aggregate/bottests-site/site/pom.xml trunk/build/aggregate/bottests-site/site/site.xml trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/pom.xml trunk/build/aggregate/bottests-site/tests/pom.xml Log: more refactoring & EOU tweaks Modified: trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/pom.xml =================================================================== --- trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/pom.xml 2011-11-23 19:59:27 UTC (rev 36581) +++ trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/pom.xml 2011-11-23 19:59:41 UTC (rev 36582) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.tools.bot.tests</groupId> <artifactId>org.jboss.tools.bot.tests.features</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>0.0.2-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.bot.test.feature</artifactId> Modified: trunk/build/aggregate/bottests-site/features/pom.xml =================================================================== --- trunk/build/aggregate/bottests-site/features/pom.xml 2011-11-23 19:59:27 UTC (rev 36581) +++ trunk/build/aggregate/bottests-site/features/pom.xml 2011-11-23 19:59:41 UTC (rev 36582) @@ -3,12 +3,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> - <artifactId>bot.tests</artifactId> - <version>0.0.1-SNAPSHOT</version> + <artifactId>org.jboss.tools.site.bottests.root</artifactId> + <version>0.0.2-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.bot.tests</groupId> <artifactId>org.jboss.tools.bot.tests.features</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>0.0.2-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>org.jboss.tools.bot.test.feature</module> Modified: trunk/build/aggregate/bottests-site/plugins/pom.xml =================================================================== --- trunk/build/aggregate/bottests-site/plugins/pom.xml 2011-11-23 19:59:27 UTC (rev 36581) +++ trunk/build/aggregate/bottests-site/plugins/pom.xml 2011-11-23 19:59:41 UTC (rev 36582) @@ -3,12 +3,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> - <artifactId>bot.tests</artifactId> - <version>0.0.1-SNAPSHOT</version> + <artifactId>org.jboss.tools.site.bottests.root</artifactId> + <version>0.0.2-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.bot.tests</groupId> <artifactId>org.jboss.tools.bot.tests.plugins</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>0.0.2-SNAPSHOT</version> <packaging>pom</packaging> <modules>  Modified: trunk/build/aggregate/bottests-site/pom.xml =================================================================== --- trunk/build/aggregate/bottests-site/pom.xml 2011-11-23 19:59:27 UTC (rev 36581) +++ trunk/build/aggregate/bottests-site/pom.xml 2011-11-23 19:59:41 UTC (rev 36582) @@ -3,13 +3,11 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.aggregate.site</artifactId> - <version>0.0.1-SNAPSHOT</version> + <artifactId>org.jboss.tools.site</artifactId> + <version>0.0.2-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>bot.tests</artifactId> - <version>0.0.1-SNAPSHOT</version> - <name>bot.tests.all</name> + <artifactId>org.jboss.tools.site.bottests.root</artifactId> <packaging>pom</packaging> <modules> <module>plugins</module> Deleted: trunk/build/aggregate/bottests-site/site/README.installation.txt =================================================================== --- trunk/build/aggregate/bottests-site/site/README.installation.txt 2011-11-23 19:59:27 UTC (rev 36581) +++ trunk/build/aggregate/bottests-site/site/README.installation.txt 2011-11-23 19:59:41 UTC (rev 36582) @@ -1,10 +0,0 @@ -This file is an Eclipse update zip to be used from within an Eclipse installations update manager. - -Do not unzip this zip into Eclipse directly nor into its dropins folder - it will not work. - -In fact, you do not need to unzip this zip at all - you can simply use the Eclipse Update Manager -( Help > Install New Software... > Add... > Archive... ) to perform the installation directly from -this zip file. - -For more information, see https://www.jboss.org/tools/download/installation/update_3_3.html#fromzip - Modified: trunk/build/aggregate/bottests-site/site/associate.properties =================================================================== --- trunk/build/aggregate/bottests-site/site/associate.properties 2011-11-23 19:59:27 UTC (rev 36581) +++ trunk/build/aggregate/bottests-site/site/associate.properties 2011-11-23 19:59:41 UTC (rev 36582) @@ -4,4 +4,4 @@ #update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 # associate sites to add to the resulting repo -associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://download.eclipse.org/bpel/update-site/,http://dl.google.com/eclipse/plugin/3.7/ +associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://dl.google.com/eclipse/plugin/3.7/ Deleted: trunk/build/aggregate/bottests-site/site/build.xml =================================================================== --- trunk/build/aggregate/bottests-site/site/build.xml 2011-11-23 19:59:27 UTC (rev 36581) +++ trunk/build/aggregate/bottests-site/site/build.xml 2011-11-23 19:59:41 UTC (rev 36582) @@ -1,762 +0,0 @@ -<project default="custom.build" name="jbosstools aggregate site build.xml"> -  - -  - <condition property="output.dir" value="${WORKSPACE}/results" else="${basedir}"> - <available file="${WORKSPACE}/results" /> - </condition> - - <condition property="COMMON_TOOLS" value="/home/hudson/static_build_env/jbds/tools" else="${java.io.tmpdir}"> - <available file="/home/hudson/static_build_env/jbds" type="dir" /> - </condition> - <mkdir dir="${COMMON_TOOLS}" /> - - <condition property="build.xml" value="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml"> - <available file="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml" type="file" /> - </condition> - <condition property="build.xml" value="${basedir}/../../../build/build.xml"> - <available file="${basedir}/../../../build/build.xml" type="file" /> - </condition> - <condition property="build.xml" value="${basedir}/../../../build.xml"> - <available file="${basedir}/../../../build.xml" type="file" /> - </condition> -  - - <property name="update.site.source.dir" value="${output.dir}/target/site" /> - -  - <property name="associate.properties" value="associate.properties" /> - <property file="${associate.properties}" /> - <property name="web.content.files" value="index.html, **/*.css, README*, *directory.xml" /> - - <target name="init"> - <ant antfile="${build.xml}" target="init" /> - <taskdef resource="net/sf/antcontrib/antlib.xml"> - <classpath> - <pathelement location="${COMMON_TOOLS}/ant-contrib.jar" /> - </classpath> - </taskdef> - - <available file="${COMMON_TOOLS}/saxon.jar" type="file" property="saxon.jar.exists" /> - <antcall target="get.saxon" /> - </target> - -  - <target name="custom.build" description="JBT aggregate update site extra processing steps" depends="init,check.target,unpack.content.jar,remove.references,add.associate.sites,remove.uncategorized.category,add.web.content,pack.content.jar,pack.zip" /> - - <target name="get.saxon" unless="saxon.jar.exists"> -  - <property name="SAXON_MIRROR" value="http://downloads.sourceforge.net/project/saxon/Saxon-HE/9.3/saxonhe9-3-0-..." /> - <get usetimestamp="true" dest="${COMMON_TOOLS}/saxonhe9-3-0-4j.zip" src="${SAXON_MIRROR}" /> - <mkdir dir="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" /> - <unzip src="${COMMON_TOOLS}/saxonhe9-3-0-4j.zip" dest="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" overwrite="true" /> - <copy file="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_/saxon9he.jar" tofile="${COMMON_TOOLS}/saxon.jar" failonerror="true" /> - <delete dir="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" includeemptydirs="true" quiet="true" /> - </target> - -  - <macrodef name="fetchZipsFromList"> - <attribute name="repo" default="" /> - <sequential> - - <var name="location.cleaned" value="@{repo}" /> - <propertyregex defaultvalue="${location.cleaned}" input="${location.cleaned}" regexp="/all/repo/*$" replace="" casesensitive="true" override="true" property="location.cleaned" /> - <propertyregex defaultvalue="${location.cleaned}" input="${location.cleaned}" regexp="/tools/*$" replace="" casesensitive="true" override="true" property="location.cleaned" /> - - <echo level="verbose">repo = ${location.cleaned}</echo> -  - <var unset="true" name="ALL_ZIPS" /> - <var unset="true" name="wget.return" /> - <if> - <contains string="${location.cleaned}" substring=":/" /> - <then> - <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> - <arg line="${location.cleaned}/logs/zip.list.txt -q --no-clobber --tries=3" /> - </exec> - </then> - <else> - <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/zip.list.txt" /> - </else> - </if> - - <echo level="verbose">Fetch SVN_REVISION.txt if it exists (return 8 if not found)</echo> - <var name="svnRevTXT" value="${aggregate.zips.dir}/SVN_REVISION.txt" /> - <if> - <contains string="${location.cleaned}" substring=":/" /> - <then> - <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> - <arg line="${location.cleaned}/logs/SVN_REVISION.txt -q --no-clobber --tries=3" /> - </exec> - </then> - <else> - <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/SVN_REVISION.txt" /> - </else> - </if> - - <echo level="verbose">Fetch SVN_REVISION.xml if it exists (return 8 if not found)</echo> - <var name="svnRevXML" value="${aggregate.zips.dir}/SVN_REVISION.xml" /> - <if> - <contains string="${location.cleaned}" substring=":/" /> - <then> - <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> - <arg line="${location.cleaned}/logs/SVN_REVISION.xml -q --no-clobber --tries=3" /> - </exec> - </then> - <else> - <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/SVN_REVISION.xml" /> - </else> - </if> - - <echo level="verbose">Fetch build.properties if it exists (return 8 if not found)</echo> - <var name="buildProperties" value="${aggregate.zips.dir}/build.properties" /> - <if> - <contains string="${location.cleaned}" substring=":/" /> - <then> - <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> - <arg line="${location.cleaned}/logs/build.properties -q --no-clobber --tries=3" /> - </exec> - </then> - <else> - <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/build.properties" /> - </else> - </if> - - <if> - <or> - <and> - <contains string="${location.cleaned}" substring=":/" /> - <equals arg1="${wget.return}" arg2="0" /> - <available file="${aggregate.zips.dir}/zip.list.txt" type="file" /> - </and> - <and> - <not> - <contains string="${location.cleaned}" substring=":/" /> - </not> - <available file="${aggregate.zips.dir}/zip.list.txt" type="file" /> - </and> - </or> - <then> -  - <var unset="true" name="ALL_ZIPS" /> - <property file="${aggregate.zips.dir}/zip.list.txt" /> - <if> - <isset property="ALL_ZIPS" /> - <then> - <var name="relativePath" unset="true" /> - <for list="${ALL_ZIPS}" delimiter=", " keepgoing="true" param="zipPath"> - <sequential> - <propertyregex override="true" property="relativePath" defaultvalue="" input="@{zipPath}" regexp="(.+)/([^/]+\.zip)" replace="\1" /> - - <propertyregex override="true" property="svnrevPath" defaultvalue="" input="@{zipPath}" regexp=".zip" replace=".SVN_REVISION" /> - <propertyregex override="true" property="svnrevPath" defaultvalue="${svnrevPath}" input="${svnrevPath}" regexp="-Sources-|-Update-" replace="-" /> - - <propertyregex override="true" property="buildPropertiesPath" defaultvalue="" input="@{zipPath}" regexp=".zip" replace=".build.properties" /> - <propertyregex override="true" property="buildPropertiesPath" defaultvalue="${buildPropertiesPath}" input="${buildPropertiesPath}" regexp="-Sources-|-Update-" replace="-" /> - - <propertyregex override="true" property="filePrefix" defaultvalue="@{zipPath}" input="@{zipPath}" regexp="(.+)/([^/]+)\.zip" replace="\2.build.properties" /> - - <mkdir dir="${aggregate.zips.dir}/${relativePath}" /> -  - <echo level="verbose">repoNum = @{repoNum} -relativePath = ${relativePath} -svnrevPath = ${svnrevPath} -buildPropertiesPath = ${buildPropertiesPath} -zipPath = @{zipPath} -DEST = ${aggregate.zips.dir}/@{zipPath} -</echo> - <echo level="verbose"> Zip URL = ${location.cleaned}/@{zipPath}</echo> - <if> - <isset property="isTest" /> - <then> -  - <echo file="${aggregate.zips.dir}/@{zipPath}">${aggregate.zips.dir}/@{zipPath}</echo> - </then> - <else> - <if> - <contains string="${location.cleaned}" substring=":/" /> - <then> - - <var name="wget.return" unset="true" /> - <exec executable="wget" dir="${aggregate.zips.dir}/${relativePath}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> - <arg line="${location.cleaned}/@{zipPath} -q --no-clobber --tries=3" /> - </exec> - <if> - <not> - <equals arg1="${wget.return}" arg2="0" /> - </not> - <then> - <echo> ** Error [${wget.return}] ** Could not wget ${location.cleaned}/@{zipPath}</echo> - </then> - </if> - </then> - <else> - <copy todir="${aggregate.zips.dir}/${relativePath}" failonerror="false" file="${location.cleaned}/@{zipPath}" /> - </else> - </if> - </else> - </if> - - <if> - <available file="${aggregate.zips.dir}/@{zipPath}" type="file" /> - <then> -  - <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filename = @{zipPath} -</echo> -  - <length file="${aggregate.zips.dir}/@{zipPath}" property="fs.length.b" /> -  -  -  - <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filesize = ${fs.length.b} -</echo> - <var name="fs.length.b" unset="true" /> - <var name="fs.length.kb" unset="true" /> - -  - <checksum file="${aggregate.zips.dir}/@{zipPath}" property="${filePrefix}.filemd5" /> - <propertycopy from="${filePrefix}.filemd5" property="tempmd5" /> - <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filemd5 = ${tempmd5} -</echo> - <var name="${filePrefix}.filemd5" unset="true" /> - <var name="tempmd5" unset="true" /> - </then> - </if> - -  - <if> - <available file="${svnRevTXT}" type="file" /> - <then> - <copy file="${svnRevTXT}" tofile="${aggregate.zips.dir}/${svnrevPath}.txt" /> - </then> - </if> - <if> - <available file="${svnRevXML}" type="file" /> - <then> - <copy file="${svnRevXML}" tofile="${aggregate.zips.dir}/${svnrevPath}.xml" /> - </then> - </if> - <if> - <available file="${buildProperties}" type="file" /> - <then> - <copy file="${buildProperties}" tofile="${aggregate.zips.dir}/${buildPropertiesPath}.txt" /> - </then> - </if> - </sequential> - </for> - <var name="relativePath" unset="true" /> - <var name="svnrevPath" unset="true" /> - <var name="buildPropertiesPath" unset="true" /> - </then> - </if> - <var unset="true" name="ALL_ZIPS" /> - </then> - <else> - <echo> ** Error [${wget.return}] ** Could not wget ${location.cleaned}/logs/zip.list.txt</echo> - </else> - </if> - <var name="location.cleaned" unset="true" /> - <delete quiet="true"> - <fileset dir="${aggregate.zips.dir}" includes="zip.list.txt, SVN_REVISION.txt, SVN_REVISION.xml, build.properties" /> - </delete> - <var name="svnRevFile" unset="true" /> - </sequential> - </macrodef> - -  - <macrodef name="fetchZipsFromMetadata"> - <attribute name="repo" default="" /> - <sequential> - <var name="location.cleaned" value="@{repo}" /> - <echo level="verbose">repo = ${location.cleaned}</echo> -  - <var name="wget.return" unset="true" /> - <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> - <arg line="${location.cleaned}/compositeArtifacts.xml -q --no-clobber --tries=3" /> - </exec> - <if> - <and> - <equals arg1="${wget.return}" arg2="0" /> - <available file="${aggregate.zips.dir}/compositeArtifacts.xml" type="file" /> - </and> - <then> - <echo level="verbose">Got ${aggregate.zips.dir}/compositeArtifacts.xml</echo> - <xmlproperty file="${aggregate.zips.dir}/compositeArtifacts.xml" validate="false" collapseAttributes="true" /> - <echo level="verbose">Found ${repository.children.size} contained repos to search</echo> - -  - <var name="counter" value="" /> -  - <for param="location" list="${repository.children.child.location}"> - <sequential> - <var name="counter" value="${counter}0" /> - <var name="i" unset="true" /> - <length property="i" string="${counter}" /> - <if> - <not> - <contains string="@{location}" substring="/staging.previous/" /> - </not> - <then> - <if> - <available file="/home/hudson/static_build_env/jbds/builds/staging" type="dir" /> - <then> - <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="/home/hudson/static_build_env/jbds/builds/staging/" /> - <if> - <not> - <available file="${location.cleaned}" /> - </not> - <then> - <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" /> - </then> - </if> - </then> - <else> - <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" /> - </else> - </if> - <echo level="error">[${i}/${repository.children.size}] Site URL = ${location.cleaned} (@{location})</echo> - <fetchZipsFromList repo="${location.cleaned}" /> - </then> - <else> - <echo level="error">[${i}/${repository.children.size}] Skip @{location}</echo> - </else> - </if> - </sequential> - </for> - <var name="counter" unset="true" /> - <var name="i" unset="true" /> - - <delete file="${aggregate.zips.dir}/compositeArtifacts.xml" quiet="true" /> - </then> - <else> - <echo> ** Error [${wget.return}] ** Could not wget ${location.cleaned}/compositeArtifacts.xml</echo> - </else> - </if> - </sequential> - </macrodef> - - <target name="add.associate.sites" if="associate.sites"> - <if> - <and> -  - <isset property="associate.sites" /> - <not> - <equals arg1="${associate.sites}" arg2="" /> - </not> - </and> - <then> -  - <var name="associate.sites.0" value="" /> - <for param="associate.site" list="${associate.sites}" delimiter=", - "> - <sequential> - <var name="associate.sites.0" value="${associate.sites.0}00" /> - </sequential> - </for> - <length property="associate.sites.length" string="${associate.sites.0}" /> - - <loadfile srcfile="${update.site.source.dir}/content.xml" property="content.xml"> - <filterchain> - <tailfilter lines="-1" skip="1" /> - </filterchain> - </loadfile> - <echo file="${update.site.source.dir}/content.xml" message="${content.xml}" /> - <echo file="${update.site.source.dir}/content.xml" append="true"> <references size='${associate.sites.length}'> -</echo> - <for param="associate.site" list="${associate.sites}" delimiter=", - "> - <sequential> -  - <echo file="${update.site.source.dir}/content.xml" append="true"> <repository uri='@{associate.site}' url='@{associate.site}' type='0' options='1'/> - <repository uri='@{associate.site}' url='@{associate.site}' type='1' options='1'/> -</echo> - </sequential> - </for> - <echo file="${update.site.source.dir}/content.xml" append="true"> </references> -</repository> -</echo> - </then> - </if> - </target> - - <target name="remove.references"> - <copy file="${update.site.source.dir}/content.xml" tofile="${update.site.source.dir}/content.old.xml" overwrite="true" /> - <xslt style="remove-references.xsl" in="${update.site.source.dir}/content.old.xml" out="${update.site.source.dir}/content.xml" /> - </target> - - <target name="remove.uncategorized.category"> - <copy file="${update.site.source.dir}/content.xml" tofile="${update.site.source.dir}/content.old.xml" overwrite="true" /> - <xslt style="remove-uncategorized.xsl" in="${update.site.source.dir}/content.old.xml" out="${update.site.source.dir}/content.xml" /> - </target> - - <target name="unpack.content.jar"> - <if> - <available file="${update.site.source.dir}/content.jar" type="file" /> - <then> - <unzip src="${update.site.source.dir}/content.jar" dest="${update.site.source.dir}" /> - <delete file="${update.site.source.dir}/content.jar" /> - </then> - </if> - </target> - - <target name="pack.content.jar"> - <zip destfile="${update.site.source.dir}/content.jar" basedir="${update.site.source.dir}" includes="content.xml" /> - <delete file="${update.site.source.dir}/content.xml" /> - <delete file="${update.site.source.dir}/content.old.xml" /> - </target> - - <target name="unpack.zip"> - <unzip src="${output.dir}/target/site_assembly.zip" dest="${update.site.source.dir}" /> - </target> - - <target name="pack.zip"> - <zip destfile="${output.dir}/target/site_assembly.zip" update="true" basedir="${update.site.source.dir}" includes="content.*, ${web.content.files}" /> - </target> - - <target name="check.target"> - <if> - <or> - <not> - <available file="${output.dir}/target/site" type="dir" /> - </not> - <not> - <available file="${output.dir}/target/site_assembly.zip" type="file" /> - </not> - </or> - <then> - <fail> --- -This script must ONLY be called via the pom.xml in this directory, not run directly. -Cannot adjust an update site w/o first building it! --- -To run this build, use Tycho. Try `mvn3 clean install -U -B -fae -q -e` -</fail> - </then> - </if> - </target> - - <target name="add.web.content"> -  - <property name="update.site.description" value="Nightly Build" /> - <if> - <and> - <not> - <isset property="update.site.version" /> - </not> - <isset property="JOB_NAME" /> - <isset property="BUILD_ID" /> - <isset property="BUILD_NUMBER" /> - </and> - <then> -  - <propertyregex override="true" property="BUILD_TS" defaultvalue="${BUILD_ID}" input="${BUILD_ID}" regexp="([0-9]+)-([0-9]+)-([0-9]+)_([0-9]+)-([0-9]+)-([0-9]+)" replace="v\1\2\3-\4\5" /> - <if> - <and> - <isset property="JBT_VERSION" /> - <isset property="BUILD_ALIAS" /> - </and> - <then> - <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\3" /> - </then> - <else> - <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": \1.${BUILD_TS}-H${BUILD_NUMBER}\2\3" /> - </else> - </if> - </then> - <else> - <property name="update.site.version" value="" /> - </else> - </if> - -  - <antcallback target="transform.site.xml" return="site.contents" /> - - <copy todir="${output.dir}" overwrite="true"> - <fileset file="index-template.html" /> - <mapper type="merge" to="index.html" /> - <filterchain> - <expandproperties /> - </filterchain> - </copy> - - <copy todir="${update.site.source.dir}"> - <fileset dir="${output.dir}" includes="${web.content.files}" /> - </copy> - </target> - - <target name="transform.site.xml"> -  - <delete quiet="true" file="${update.site.source.dir}/site.html" /> - <xslt style="site.xsl" in="${update.site.source.dir}/site.xml" out="${update.site.source.dir}/site.html" force="true"> - <classpath location="${COMMON_TOOLS}/saxon.jar" /> - </xslt> -  - <loadfile property="site.contents" srcfile="${update.site.source.dir}/site.html" failonerror="false" /> - <property name="site.contents" value="" /> - <delete file="${update.site.source.dir}/site.html" quiet="true" /> - </target> - -  - <target name="collect.zips" description="collect zips from the sites we aggregated" unless="collect.zips.skip"> - <property name="aggregate.zips.dir" value="${output.dir}/zips" /> - <delete dir="${aggregate.zips.dir}" quiet="true" /> - <mkdir dir="${aggregate.zips.dir}" /> - <if> - <isset property="inputRepo" /> - <then> - <var name="inputRepos" value="1" /> - <var name="inputRepo1" value="${inputRepo}" /> - </then> - </if> - <for list="${inputRepos}" delimiter=", " keepgoing="true" param="repoNum"> - <sequential> - <var name="repo" value="${inputRepo@{repoNum}}" /> - <if> - <contains string="${repo}" substring="composite" /> - <then> - <fetchZipsFromMetadata repo="${repo}" /> - </then> - <else> - <fetchZipsFromList repo="${repo}" /> - </else> - </if> - </sequential> - </for> - </target> - - <target name="test.collect.zips.from.metadata" depends="init"> - <property name="isTest" value="true" /> - <antcall target="collect.zips"> - <param name="inputRepos" value="1" /> - <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk" /> - </antcall> - </target> - - <target name="test.collect.zips.from.metadata.with.errors" depends="init"> - <property name="isTest" value="true" /> - <antcall target="collect.zips"> - <param name="inputRepos" value="1,2" /> - <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/NO_SUCH_B..." /> - </antcall> - </target> - - <target name="test.collect.zips.from.list.xml" depends="init"> - <property name="isTest" value="true" /> - <antcall target="collect.zips"> - <param name="inputRepos" value="1,2,3,4" /> - <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> - <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> - <param name="inputRepo3" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> - <param name="inputRepo4" value="http://download.jboss.org/jbosstools/builds/staging/xulrunner-1.9.1.2" /> - </antcall> - </target> - - <target name="test.collect.zips.from.list.txt" depends="init"> - <property name="isTest" value="true" /> - <antcall target="collect.zips"> - <param name="inputRepos" value="1,2,3,4,5" /> - <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> - <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> - <param name="inputRepo3" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> - <param name="inputRepo4" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1..." /> - <param name="inputRepo5" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1..." /> - </antcall> - </target> - - <target name="test.collect.zips.from.list.with.errors" depends="init"> - <property name="isTest" value="true" /> - <antcall target="collect.zips"> - <param name="inputRepos" value="1,2" /> - <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> - </antcall> - </target> - - <target name="test.collect.zips" depends="test.collect.zips.from.metadata,test.collect.zips.from.list.txt,test.collect.zips.from.list.xml"> - <delete dir="${aggregate.zips.dir}" quiet="true" /> - </target> - - <target name="test.collect.zips.with.error" depends="test.collect.zips.from.metadata.with.errors,test.collect.zips.from.list.with.errors"> - <delete dir="${aggregate.zips.dir}" quiet="true" /> - </target> - - <target name="collect.metadata" description="collect svn revision info + other metadata (JOB_NAME, BUILD_ID, BUILD_NUMBER, WORKSPACE, HUDSON_SLAVE), zip file names+sizes+md5sums"> - <property name="aggregate.zips.dir" value="${output.dir}/zips" /> - <mkdir dir="${aggregate.zips.dir}" /> -  - <if> - <available file="${aggregate.zips.dir}/build.properties.file.txt" type="file" /> - <then> - <property file="${aggregate.zips.dir}/build.properties.file.txt" /> - </then> - </if> - -  - <for param="propsfile"> - <path> - <fileset dir="${aggregate.zips.dir}" includes="*.build.properties.txt, **/*.build.properties.txt" /> - </path> - <sequential> -  - <propertyregex override="true" property="prefix" defaultvalue="" input="@{propsfile}" regexp=".+/([^/]+\.build\.properties)\.txt" replace="\1" /> - <echo level="verbose">Read ${prefix} from @{propsfile}</echo> - - <property file="@{propsfile}" prefix="${prefix}" /> - -  - <propertyregex override="true" property="svnrevTXT" defaultvalue="" input="@{propsfile}" regexp="\.build\.properties\.txt" replace=".SVN_REVISION.txt" /> - <propertyregex override="true" property="svnrevXML" defaultvalue="" input="@{propsfile}" regexp="\.build\.properties\.txt" replace=".SVN_REVISION.xml" /> - <if> - <available file="${svnrevXML}" type="file" /> - <then> -  - <xmlproperty file="${svnrevXML}" collapseAttributes="true" prefix="${prefix}" keeproot="false" /> -  - <if> - <isset property="${prefix}.kind" /> - <then> - <var name="${prefix}.kind" unset="true" /> - </then> - </if> - -  - <if> - <and> - <isset property="${prefix}.revision.module" /> - <isset property="${prefix}.revision.revision" /> - </and> - <then> - <propertycopy from="${prefix}.revision.module" property="temprm.all" override="true" /> - <propertycopy from="${prefix}.revision.revision" property="temprr.all" override="true" /> - <var name="i" value="0" /> - <for list="${temprm.all}" delimiter=", " param="module"> - <sequential> - <math result="i" operand1="1" operation="+" operand2="${i}" datatype="int" /> - <var name="j" value="0" /> - <for list="${temprr.all}" delimiter=", " param="revision"> - <sequential> - <math result="j" operand1="1" operation="+" operand2="${j}" datatype="int" /> - <if> - <equals arg1="${i}" arg2="${j}" /> - <then> - <var name="temprr" value="@{revision}" /> - <if> - <isset property="${prefix}.SVN_REVISION" /> - <then> - <propertycopy from="${prefix}.SVN_REVISION" property="temp.all" override="true" /> - <var name="${prefix}.SVN_REVISION" value="${temp.all},@{module}@${temprr}" /> - <var name="temp.all" unset="true" /> - </then> - <else> - <var name="${prefix}.SVN_REVISION" value="@{module}@${temprr}" /> - </else> - </if> - <var name="temprr" unset="true" /> - </then> - </if> - </sequential> - </for> - <var name="j" unset="true" /> - </sequential> - </for> - <var name="i" unset="true" /> - <var name="temprm.all" unset="true" /> - <var name="temprr.all" unset="true" /> - </then> - </if> - </then> - <elseif> - <available file="${svnrevTXT}" type="file" /> - <then> -  - <loadfile property="${prefix}.SVN_REVISION" srcFile="${svnrevTXT}" /> - <propertycopy from="${prefix}.SVN_REVISION" property="temp" /> - <propertyregex override="true" property="temp" defaultvalue="${temp}" input="${temp}" regexp="[ \n\t]+" replace="," /> - <propertyregex override="true" property="${prefix}.SVN_REVISION" defaultvalue="${temp}" input="${temp}" regexp=",$" replace="" /> - -  - <for list="${temp}" delimiter="," param="pair"> - <sequential> - <propertyregex override="true" property="temprm" defaultvalue="@{pair}" input="@{pair}" regexp="(.+)(a)(.+)" replace="\1" /> - <propertyregex override="true" property="temprr" defaultvalue="@{pair}" input="@{pair}" regexp="(.+)(a)(.+)" replace="\2" /> - <if> - <isset property="${prefix}.revision.module" /> - <then> - <propertycopy from="${prefix}.revision.module" property="temprm.all" override="true" /> - <propertycopy from="${prefix}.revision.revision" property="temprr.all" override="true" /> - <var name="${prefix}.revision.module" value="${temprm.all},${temprm}" /> - <var name="${prefix}.revision.revision" value="${temprr.all},${temprr}" /> - <var name="temprm.all" unset="true" /> - <var name="temprr.all" unset="true" /> - </then> - <else> - <var name="${prefix}.revision.module" value="${temprm}" /> - <var name="${prefix}.revision.revision" value="${temprr}" /> - </else> - </if> - <var name="temprm" unset="true" /> - <var name="temprr" unset="true" /> - </sequential> - </for> - <var name="temp" unset="true" /> - </then> - </elseif> - </if> - - <var name="prefix" unset="true" /> - </sequential> - - </for> - <for param="svnrevfile"> - <path> - <fileset dir="${aggregate.zips.dir}" includes="*.SVN_REVISION.txt, **/*.SVN_REVISION.txt" /> - </path> - <sequential> -  - <propertyregex override="true" property="prefix" defaultvalue="" input="@{propsfile}" regexp=".+/([^/]+\.build\.properties)\.txt" replace="\1" /> - <echo level="verbose">Read ${prefix} from @{propsfile}</echo> - - <property file="@{propsfile}" prefix="${prefix}" /> - - <var name="prefix" unset="true" /> - </sequential> - - </for> -  - <echoproperties format="xml" destfile="${aggregate.zips.dir}/build.properties.all.xml"> - <propertyset> - <propertyref regex=".*\.build\.properties" /> - </propertyset> - </echoproperties> - - </target> - - <target name="test.collect.metadata" depends="init"> - <property name="isTest" value="true" /> - <antcall target="collect.metadata"> - </antcall> - </target> - -  - <target name="create.summary.file" description="create summary file with list of generated files, sizes, and SVN revisions all linked and ordered by source build job"> - </target> - - <target name="test.create.summary.file" depends="test.collect.zips,test.collect.metadata"> - <property name="isTest" value="true" /> - <antcall target="create.summary.file"> - </antcall> - </target> - -</project> Deleted: trunk/build/aggregate/bottests-site/site/index-template.html =================================================================== --- trunk/build/aggregate/bottests-site/site/index-template.html 2011-11-23 19:59:27 UTC (rev 36581) +++ trunk/build/aggregate/bottests-site/site/index-template.html 2011-11-23 19:59:41 UTC (rev 36582) @@ -1,153 +0,0 @@ -<html> -<head> -<title>JBoss Tools - Bot Tests - ${update.site.description} Update Site${update.site.version}</title> -<style> -@import url("http://download.jboss.org/jbosstools/updates/web/site.css"); -</style> -</head> -<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> -<center> -<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" - cellspacing="0" cellpadding="0" width="920" class="bodyText"> - <tr> - <td colspan="3"><img - src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> - </tr> - <tr> - <td>      </td> - <td>      </td> - <td>      </td> - </tr> - <tr> - <td>      </td> - <td> - <h2 class="title">JBoss Tools - Bot Tests - ${update.site.description} Update Site</h2> - <table width="100%"> - <tr class="header"> - <td class="sub-header" width="100%"><span>Latest Build${update.site.version}</span></td> - </tr> - - <tr class="light-row" style="height: 30px"> - <td class="bodyText"> - <p class="bodyText">This is the <b>${update.site.description}</b> - Update Site for JBoss Tools - Bot Tests. - <blockquote style="border: 1px dashed #1778be; padding: 2px"> - <ol> - <li>To <a class="link" - href="http://www.jboss.org/tools/download/installation/update_3_3">install</a> - from this site, start up Eclipse 3.7, then do: - <ul> - <code><strong>Help > Install New Software... ></strong></code> - </ul> - </li> - <li>Copy this site's URL into Eclipse, and hit Enter.</li> - <li>When the site loads, select the features to install, - or click the <code><strong>Select All</strong></code> button.</li> - <li>To properly resolve all dependencies, check - <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul> - - <li>Click <code><strong>Next</strong></code>, agree to the license - terms, and install.</li> - - <p class="bodyText"> - You can also download JBoss Tools as individual zips for - offline installation. See <a class="link" - href="http://www.jboss.org/tools/download">JBoss Tools - Downloads</a>.<br /> If you downloaded this site as a zip, see - <a href="README.installation.txt">Installation README</a>. - See also <a - href="http://www.jboss.org/tools/download/installation">Installation - methods</a>. - </p> - </ol> - </blockquote> - </td> - </tr> - -  - - </table> - </td> - <td>      </td> - </tr> - <tr> - <td></td> - <td> - ${site.contents} - </td> - <td></td> - </tr> - <tr> - <td></td> - <td> - <table width="100%"> - <tr class="header"> - <td class="sub-header" width="100%"><span> Installation - Types</span></td> - </tr> - <tr class="light-row" style="height: 30px"> - <td class="bodyText"> - <p class="bodyText">Depending on how close to the bleeding edge - you like to be, there are several types of releases available.</p> - <br /> - - </td> - </tr> - - <tr class="dark-row" style="height: 30px"> - <td class="bodyText"> - <h4>Stable Releases</h4> - - <p><a href="https://www.jboss.org/tools/download/stable.html">Stable - releases</a> are - as indicated by their name - stable.</p><br/> - - </td> - </tr> - - <tr class="light-row" style="height: 30px"> - <td class="bodyText"> - <h4>Development Milestones</h4> - - <p><a href="https://www.jboss.org/tools/download/dev.html">Development - builds</a>, released once per milestone and only a few times a year, are - fairly stable, but there may be some things which do not yet work. - If you would like to try one of these milestones, we'd greatly - appreciate the assistance in testing and <a - href="https://jira.jboss.org/jira/browse/JBIDE">reporting of - issues in our issue tracker</a>.</p><br/> - - </td> - </tr> - - <tr class="dark-row" style="height: 30px"> - <td class="bodyText"> - <h4>Nightly Builds</h4> - - <p>The <a - href="https://www.jboss.org/tools/download/nightly.html">bleeding - edge</a> contains the latest and greatest new features, but nothing is - stable or guaranteed - yet. If you're using a Milestone and need a - fix, you can update to the latest Nightly, or wait for the next - Milestone.</p><br/> - </td> - </tr> - </table> - </td> - </tr> -</table> -</center> -</html> Modified: trunk/build/aggregate/bottests-site/site/index.html =================================================================== --- trunk/build/aggregate/bottests-site/site/index.html 2011-11-23 19:59:27 UTC (rev 36581) +++ trunk/build/aggregate/bottests-site/site/index.html 2011-11-23 19:59:41 UTC (rev 36582) @@ -63,23 +63,6 @@ </blockquote> </td> </tr> - -  - </table> </td> <td>      </td> @@ -97,15 +80,15 @@ </th> </tr> <tr style="background-color:
							#EEEEEE
						"> - <td class="rowLine"><a href="features/org.jboss.tools.bot.test.feature_3.1.0.v20111101-0205-Beta1.jar" style="font-size:x-small">org.jboss.tools.bot.test.feature</a></td> - <td><span style="font-size:x-small">3.1.0.v20111101-0205-Beta1</span></td> + <td class="rowLine"><a href="features/org.jboss.tools.bot.test.feature_3.1.0.v20111123-1955-M5.jar" style="font-size:x-small">org.jboss.tools.bot.test.feature</a></td> + <td><span style="font-size:x-small">3.1.0.v20111123-1955-M5</span></td> <td><span style="font-size:x-small"> | JBoss Tools bot.tests Nightly Build Update Site</span></td> </tr> <tr style="background-color:
							#FFFFFF
						"> - <td class="rowLine"><a href="features/org.jboss.tools.test.feature_3.2.0.v20111101-0124-H459-Beta1.jar" style="font-size:x-small">org.jboss.tools.test.feature</a></td> - <td><span style="font-size:x-small">3.2.0.v20111101-0124-H459-Beta1</span></td> + <td class="rowLine"><a href="features/org.jboss.tools.test.feature_3.2.0.v20111123-0956-H473-M5.jar" style="font-size:x-small">org.jboss.tools.test.feature</a></td> + <td><span style="font-size:x-small">3.2.0.v20111123-0956-H473-M5</span></td> <td><span style="font-size:x-small"> | JBoss Tools bot.tests Nightly Build Update Site</span></td> @@ -126,7 +109,10 @@ <a href="plugins/" style="font-size:x-small">plugins</a> :: <a href="features/" style="font-size:x-small">features</a></td> - <td class="rowLine" colspan="1"></td> + <td class="rowLine" colspan="1"> + + + </td> </tr> </table><br xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan"></br> </td> Modified: trunk/build/aggregate/bottests-site/site/pom.xml =================================================================== --- trunk/build/aggregate/bottests-site/site/pom.xml 2011-11-23 19:59:27 UTC (rev 36581) +++ trunk/build/aggregate/bottests-site/site/pom.xml 2011-11-23 19:59:41 UTC (rev 36582) @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> - <artifactId>bot.tests</artifactId> - <version>0.0.1-SNAPSHOT</version> + <artifactId>org.jboss.tools.site</artifactId> + <version>0.0.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent> - <groupId>org.jboss.tools.bot.tests</groupId> - <artifactId>org.jboss.tools.bot.tests.site</artifactId> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.site.bottests</artifactId> <name>JBoss Tools - Bot Tests Site</name> - <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> <build> <plugins> @@ -26,9 +26,15 @@ <quiet>true</quiet> <tasks>  - <ant antfile="build.xml"> + <condition property="output.dir" value="${WORKSPACE}/results" + else="${basedir}"> + <available file="${WORKSPACE}/results" /> + </condition> + <ant antfile="build.xml" target="basic.build" dir="../../"> + <property name="output.dir" value="${output.dir}" /> <property name="inputRepo" value="${jbosstools-nightly-staging-composite}" /> + <property name="update.site.name" value="JBoss Tools - Bot Tests"/> <property name="JBT_VERSION" value="${JBT_VERSION}" /> <property name="BUILD_ALIAS" value="${BUILD_ALIAS}" /> </ant> Deleted: trunk/build/aggregate/bottests-site/site/remove-references.xsl =================================================================== --- trunk/build/aggregate/bottests-site/site/remove-references.xsl 2011-11-23 19:59:27 UTC (rev 36581) +++ trunk/build/aggregate/bottests-site/site/remove-references.xsl 2011-11-23 19:59:41 UTC (rev 36582) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"> - -<xsl:template match="/"> - <xsl:apply-templates select="*"/> -</xsl:template> - - -<xsl:template match="*"> - <xsl:copy > - <xsl:for-each select="@*"> - <xsl:copy /> - </xsl:for-each> - <xsl:apply-templates /> - </xsl:copy> -</xsl:template> - -<xsl:template match="references" /> - -</xsl:stylesheet> \ No newline at end of file Deleted: trunk/build/aggregate/bottests-site/site/remove-uncategorized.xsl =================================================================== --- trunk/build/aggregate/bottests-site/site/remove-uncategorized.xsl 2011-11-23 19:59:27 UTC (rev 36581) +++ trunk/build/aggregate/bottests-site/site/remove-uncategorized.xsl 2011-11-23 19:59:41 UTC (rev 36582) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"> - -<xsl:template match="/"> - <xsl:apply-templates select="*"/> -</xsl:template> - - -<xsl:template match="*"> - <xsl:copy > - <xsl:for-each select="@*"> - <xsl:copy /> - </xsl:for-each> - <xsl:apply-templates /> - </xsl:copy> -</xsl:template> - -<xsl:template match="unit[contains(@id,'site.xml.Default')]" /> - -</xsl:stylesheet> \ No newline at end of file Modified: trunk/build/aggregate/bottests-site/site/site.xml =================================================================== --- trunk/build/aggregate/bottests-site/site/site.xml 2011-11-23 19:59:27 UTC (rev 36581) +++ trunk/build/aggregate/bottests-site/site/site.xml 2011-11-23 19:59:41 UTC (rev 36582) @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <site> <description>To install these features, point Eclipse at this site.</description> -  - <category-def label="JBoss Tools bot.tests Nightly Build Update Site" name="JBoss Tools bot.tests Nightly Build Update Site"> - <description>JBoss Tools bot.tests Nightly Build Update Site: contains all features in this build.</description> +  + <category-def label="Bot Tests" name="Bot Tests"> + <description>Bot Tests: contains all features in this build.</description> </category-def> <feature url="features/org.jboss.tools.bot.test.feature_0.0.0.jar" id="org.jboss.tools.bot.test.feature" version="0.0.0"> - <category name="JBoss Tools bot.tests Nightly Build Update Site"/> + <category name="Bot Tests"/> </feature> <feature url="features/org.jboss.tools.test.feature_0.0.0.jar" id="org.jboss.tools.test.feature" version="0.0.0"> - <category name="JBoss Tools bot.tests Nightly Build Update Site"/> + <category name="Bot Tests"/> </feature> </site> Deleted: trunk/build/aggregate/bottests-site/site/site.xsl =================================================================== --- trunk/build/aggregate/bottests-site/site/site.xsl 2011-11-23 19:59:27 UTC (rev 36581) +++ trunk/build/aggregate/bottests-site/site/site.xsl 2011-11-23 19:59:41 UTC (rev 36582) @@ -1,126 +0,0 @@ -<xsl:stylesheet version="2.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xalan="http://xml.apache.org/xalan" - xmlns:saxon="http://saxon.sf.net/" xmlns="http://www.w3.org/1999/xhtml" - extension-element-prefixes="saxon"> - <xsl:output method="html" indent="yes" /> - <xsl:template match="/site"> - <table cellspacing="2" cellpadding="0" border="0"> - <xsl:if test="count(feature[contains(@id,'jboss')])>0"> - <tr style="background-color:#DDDDDD"> - <th style="font-size:small">Feature</th> - <th style="font-size:small">Version</th> - <th style="font-size:small"> - Feature Categor(ies) - </th> - </tr> -  - <xsl:for-each select="feature[contains(@id,'jboss')]"> - <xsl:sort select="@id" /> - <xsl:variable name="rowCol"> - <xsl:if test="position() mod 2 = 1"> - #EEEEEE - </xsl:if> - <xsl:if test="position() mod 2 = 0"> - #FFFFFF - </xsl:if> - </xsl:variable> - - <tr style="background-color:{$rowCol}"> - <td class="rowLine"> - <a href="{@url}" style="font-size:x-small"> - <xsl:value-of select="@id" /> - </a> - </td> - <td> - <span style="font-size:x-small"> - <xsl:value-of select="@version" /> - </span> - </td> - <td> - <xsl:choose> - <xsl:when test="category"> - <xsl:for-each select="category"> - <span style="font-size:x-small"> - | - <xsl:value-of select="@name" /> - </span> - </xsl:for-each> - </xsl:when> - </xsl:choose> - </td> - </tr> - </xsl:for-each> - </xsl:if> - <xsl:if test="count(feature[not(contains(@id,'jboss'))])>0"> - <tr style="background-color:#DDDDDD"> - <th style="font-size:small">Feature</th> - <th style="font-size:small">Version</th> - <th style="font-size:small"> - Feature Categor(ies) - </th> - </tr> -  - <xsl:for-each select="feature[not(contains(@id,'jboss'))]"> - <xsl:sort select="@id" /> - <xsl:variable name="rowCol"> - <xsl:if test="position() mod 2 = 1"> - #EEEEEE - </xsl:if> - <xsl:if test="position() mod 2 = 0"> - #FFFFFF - </xsl:if> - </xsl:variable> - - <tr style="background-color:{$rowCol}"> - <td class="rowLine"> - <a href="{@url}" style="font-size:x-small"> - <xsl:value-of select="@id" /> - </a> - </td> - <td> - <span style="font-size:x-small"> - <xsl:value-of select="@version" /> - </span> - </td> - <td> - <xsl:choose> - <xsl:when test="category"> - <xsl:for-each select="category"> - <span style="font-size:x-small"> - | - <xsl:value-of select="@name" /> - </span> - </xsl:for-each> - </xsl:when> - </xsl:choose> - </td> - </tr> - </xsl:for-each> - </xsl:if> - - <tr style="background-color:#DDDDDD"> - <th colspan="1" style="font-size:small">Metadata</th> - <th colspan="1" style="font-size:small"></th> - <th colspan="1" style="font-size:small"></th> - </tr> - <tr style="background-color:#EEEEEE"> - <td class="rowLine" colspan="1"> - <a href="site.xml" style="font-size:x-small">site.xml</a> - :: - <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> - :: - <a href="content.jar" style="font-size:x-small">content.jar</a> - </td> - <td class="rowLine" colspan="1"> - :: - <a href="plugins/" style="font-size:x-small">plugins</a> - :: - <a href="features/" style="font-size:x-small">features</a> - </td> - <td class="rowLine" colspan="1"> - </td> - </tr> - </table> - <br /> - </xsl:template> -</xsl:stylesheet> Modified: trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/pom.xml =================================================================== --- trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/pom.xml 2011-11-23 19:59:27 UTC (rev 36581) +++ trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/pom.xml 2011-11-23 19:59:41 UTC (rev 36582) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.tools.bot.tests</groupId> <artifactId>org.jboss.tools.bot.tests.tests</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>0.0.2-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.drools</groupId> <artifactId>org.jboss.tools.drools.ui.bot.test</artifactId> Modified: trunk/build/aggregate/bottests-site/tests/pom.xml =================================================================== --- trunk/build/aggregate/bottests-site/tests/pom.xml 2011-11-23 19:59:27 UTC (rev 36581) +++ trunk/build/aggregate/bottests-site/tests/pom.xml 2011-11-23 19:59:41 UTC (rev 36582) @@ -3,12 +3,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> - <artifactId>bot.tests</artifactId> - <version>0.0.1-SNAPSHOT</version> + <artifactId>org.jboss.tools.site.bottests.root</artifactId> + <version>0.0.2-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.bot.tests</groupId> <artifactId>org.jboss.tools.bot.tests.tests</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>0.0.2-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>org.jboss.tools.drools.ui.bot.test</module>

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36581 - trunk/build/aggregate.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-11-23 14:59:27 -0500 (Wed, 23 Nov 2011) New Revision: 36581 Modified: trunk/build/aggregate/index-template.html Log: add dash to separate name and type Modified: trunk/build/aggregate/index-template.html =================================================================== --- trunk/build/aggregate/index-template.html 2011-11-23 19:59:19 UTC (rev 36580) +++ trunk/build/aggregate/index-template.html 2011-11-23 19:59:27 UTC (rev 36581) @@ -1,6 +1,6 @@ <html> <head> -<title>${update.site.name} ${update.site.description} Update Site${update.site.version}</title> +<title>${update.site.name} - ${update.site.description} Update Site${update.site.version}</title> <style> @import url("http://download.jboss.org/jbosstools/updates/web/site.css"); </style> @@ -21,7 +21,7 @@ <tr> <td>      </td> <td> - <h2 class="title">${update.site.name} ${update.site.description} Update Site</h2> + <h2 class="title">${update.site.name} - ${update.site.description} Update Site</h2> <table width="100%"> <tr class="header"> <td class="sub-header" width="100%"><span>Latest Build${update.site.version}</span></td>

13 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits November 2011