March 2011 - jbosstools-commits - Jboss List Archives

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

by jbosstools-commits＠lists.jboss.org

Author: jlukas(a)redhat.com Date: 2011-03-29 17:34:18 -0400 (Tue, 29 Mar 2011) New Revision: 30124 Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WebServiceClientWizard.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WsWizardBase.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WsClientTest.java Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/WSAllBotTests.launch trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WebServiceWizard.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/BottomUpWSTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/TopDownWSTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java Log: adding test for ws client Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test ___________________________________________________________________ Modified: svn:ignore - target buildlog.latest.txt bin build *.class screenshots + target buildlog.latest.txt bin build *.class screenshots .springBeans Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/WSAllBotTests.launch =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/WSAllBotTests.launch 2011-03-29 21:16:05 UTC (rev 30123) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/WSAllBotTests.launch 2011-03-29 21:34:18 UTC (rev 30124) @@ -9,6 +9,13 @@ <booleanAttribute key="clearConfig" value="true"/> <booleanAttribute key="clearws" value="true"/> <booleanAttribute key="clearwslog" value="false"/> +<booleanAttribute key="com.mountainminds.eclemma.core.INPLACE_INSTRUMENTATION" value="true"/> +<listAttribute key="com.mountainminds.eclemma.core.INSTRUMENTATION_PATHS"> +<listEntry value="/org.jboss.tools.ws.ui/target/classes"/> +<listEntry value="/org.jboss.tools.ws.creation.ui/target/classes"/> +<listEntry value="/org.jboss.tools.ws.core/target/classes"/> +<listEntry value="/org.jboss.tools.ws.creation.core/bin"/> +</listAttribute> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> <booleanAttribute key="default" value="true"/> <booleanAttribute key="includeOptional" value="true"/> @@ -30,9 +37,9 @@ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.ws.ui.bot.test"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms256m -Xmx512m -Dswtbot.test.properties.file=${env_var:HOME}/swtbot.properties -Dusage_reporting_enabled=false"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms256m -Xmx1024m -Dswtbot.test.properties.file=${env_var:HOME}/swtbot.properties -Dusage_reporting_enabled=false"/> <stringAttribute key="pde.version" value="3.3"/> -<stringAttribute key="product" value="org.eclipse.platform.ide"/> +<stringAttribute key="product" value="org.jboss.tools.tests.product"/> <booleanAttribute key="show_selected_only" value="false"/> <booleanAttribute key="tracing" value="false"/> <booleanAttribute key="useCustomFeatures" value="false"/> Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2011-03-29 21:16:05 UTC (rev 30123) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2011-03-29 21:34:18 UTC (rev 30124) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007-2009 Red Hat, Inc. + * Copyright (c) 2007-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, @@ -15,6 +15,7 @@ import org.jboss.tools.ws.ui.bot.test.jbt.WsTesterTest; import org.jboss.tools.ws.ui.bot.test.wtp.BottomUpWSTest; import org.jboss.tools.ws.ui.bot.test.wtp.TopDownWSTest; +import org.jboss.tools.ws.ui.bot.test.wtp.WsClientTest; import org.junit.runner.RunWith; import org.junit.runners.Suite.SuiteClasses; @@ -36,10 +37,11 @@ * * @author Lukas Jungmann */ -@SuiteClasses({ +@SuiteClasses({ SampleWSTest.class, BottomUpWSTest.class, TopDownWSTest.class, + WsClientTest.class, WsTesterTest.class }) @RunWith(RequirementAwareSuite.class) Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WebServiceClientWizard.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WebServiceClientWizard.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WebServiceClientWizard.java 2011-03-29 21:34:18 UTC (rev 30124) @@ -0,0 +1,35 @@ +/******************************************************************************* + * 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.ws.ui.bot.test.uiutils.wizards; + +import org.eclipse.swt.widgets.Shell; + +public class WebServiceClientWizard extends WsWizardBase { + + public WebServiceClientWizard() { + super(); + } + + public WebServiceClientWizard(Shell shell) { + super(shell); + } + + @Override + protected String getSourceComboLabel() { + return "Service definition:"; + } + + public WebServiceClientWizard setClientProject(String name) { + setTargetProject("Client project:", name); + return this; + } + +} Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WebServiceWizard.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WebServiceWizard.java 2011-03-29 21:16:05 UTC (rev 30123) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WebServiceWizard.java 2011-03-29 21:34:18 UTC (rev 30124) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Red Hat, Inc. + * Copyright (c) 2010-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, @@ -10,20 +10,9 @@ ******************************************************************************/ package org.jboss.tools.ws.ui.bot.test.uiutils.wizards; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.swt.widgets.Scale; import org.eclipse.swt.widgets.Shell; -import org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotCombo; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.eclipse.ui.forms.widgets.Hyperlink; -import org.jboss.tools.ui.bot.ext.parts.SWTBotHyperlinkExt; -import org.jboss.tools.ui.bot.ext.parts.SWTBotScaleExt; -public class WebServiceWizard extends Wizard { +public class WebServiceWizard extends WsWizardBase { public enum Service_Type { BOTTOM_UP, TOP_DOWN; @@ -44,15 +33,6 @@ } } - public enum Slider_Level { - TEST, START, INSTALL, DEPLOY, ASSEMBLE, DEVELOP, NO_CLIENT; - - @Override - public String toString() { - return name().charAt(0) + name().substring(1).toLowerCase(); - } - } - public WebServiceWizard() { super(); } @@ -71,57 +51,29 @@ return s.startsWith("Bottom up") ? Service_Type.BOTTOM_UP : Service_Type.TOP_DOWN; } - public WebServiceWizard setServiceSource(String s) { - SWTBotCombo c = null; + @Override + protected String getSourceComboLabel() { + String s = null; switch (getServiceType()) { case BOTTOM_UP: - c = bot().comboBoxWithLabel("Service implementation:"); + s = "Service implementation:"; break; case TOP_DOWN: - c = bot().comboBoxWithLabel("Service definition:"); + s = "Service definition:"; break; default: throw new IllegalArgumentException("Unknown type: " + this); } - c.typeText(s); - return this; + return s; } - public WebServiceWizard setServerRuntime(String name) { - findLink("Server runtime:").get(0).click(); - SWTBotShell sh = bot().activeShell(); - SWTBotTree tree = sh.bot().treeInGroup("Server runtime:"); - tree.expandNode("Existing Servers", name).select(); - sh.bot().button("OK").click(); - sleep(50); - return this; - } - - public WebServiceWizard setWebServiceRuntime(String name) { - findLink("Web service runtime:").get(0).click(); - SWTBotShell sh = bot().activeShell(); - SWTBotTree tree = sh.bot().treeInGroup("Web service runtime:"); - tree.select(name); - sh.bot().button("OK").click(); - sleep(50); - return this; - } - public WebServiceWizard setServiceProject(String name) { - findLink("Service project:").get(0).click(); - SWTBotShell sh = bot().activeShell(); - sh.bot().comboBoxWithLabel("Service project:").setSelection(name); - sh.bot().button("OK").click(); - sleep(50); + setTargetProject("Service project:", name); return this; } public WebServiceWizard setServiceEARProject(String name) { - findLink("Service EAR project:").get(0).click(); - SWTBotShell sh = bot().activeShell(); - sh.bot().comboBoxWithLabel("Service EAR project:").setSelection(name); - sh.bot().button("OK").click(); - sleep(50); + setTargetProject("Service EAR project:", name); return this; } @@ -129,42 +81,16 @@ if (Slider_Level.NO_CLIENT == level) { throw new UnsupportedOperationException("Unsupported level: " + level); } - scale(0).setSelection(level.ordinal()); + setSlider(level, 0); return this; } public WebServiceWizard setClientSlider(Slider_Level level) { - scale(1).setSelection(level.ordinal()); + setSlider(level, 1); return this; } public boolean isClientEnabled() { - return scale(1).isEnabled(); - } - - //second panel - public WebServiceWizard setPackageName(String pkg) { - bot().textWithLabel("Package name").typeText(pkg); - return this; - } - - private List<SWTBotHyperlinkExt> findLink(String text) { - List<? extends Hyperlink> widgets = bot().widgets(WidgetMatcherFactory.widgetOfType(Hyperlink.class)); - List<SWTBotHyperlinkExt> ret = new ArrayList<SWTBotHyperlinkExt>(); - for (Hyperlink h: widgets) { - if (h.getText().indexOf(text) > -1) { - ret.add(new SWTBotHyperlinkExt(h)); - } - } - return ret; - } - - private SWTBotScaleExt scale(int i) { - List<? extends Scale> widgets = bot().widgets(WidgetMatcherFactory.widgetOfType(Scale.class)); - List<SWTBotScaleExt> ret = new ArrayList<SWTBotScaleExt>(); - for (Scale s: widgets) { - ret.add(new SWTBotScaleExt(s)); - } - return ret.get(i); - } + return isScaleEnabled(1); + } } Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WsWizardBase.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WsWizardBase.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WsWizardBase.java 2011-03-29 21:34:18 UTC (rev 30124) @@ -0,0 +1,129 @@ +/******************************************************************************* + * 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.ws.ui.bot.test.uiutils.wizards; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.swt.widgets.Scale; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotCombo; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.eclipse.ui.forms.widgets.Hyperlink; +import org.jboss.tools.ui.bot.ext.parts.SWTBotHyperlinkExt; +import org.jboss.tools.ui.bot.ext.parts.SWTBotScaleExt; + +public abstract class WsWizardBase extends Wizard { + + public enum Slider_Level { + TEST, START, INSTALL, DEPLOY, ASSEMBLE, DEVELOP, NO_CLIENT; + + @Override + public String toString() { + return name().charAt(0) + name().substring(1).toLowerCase(); + } + } + + public WsWizardBase() { + super(); + } + + public WsWizardBase(Shell shell) { + super(shell); + } + + public WsWizardBase setSource(String s) { + SWTBotCombo c = bot().comboBoxWithLabel(getSourceComboLabel()); + c.typeText(s); + return this; + } + + public WsWizardBase setServerRuntime(String name) { + setServerRuntime(name, 0); + return this; + } + + public WsWizardBase setWebServiceRuntime(String name) { + setWebServiceRuntime(name, 0); + return this; + } + + protected abstract String getSourceComboLabel(); + + protected WsWizardBase setServerRuntime(String name, int idx) { + findLink("Server runtime:").get(idx).click(); + SWTBotShell sh = bot().activeShell(); + SWTBotTree tree = sh.bot().treeInGroup("Server runtime:"); + tree.expandNode("Existing Servers", name).select(); + sh.bot().button("OK").click(); + sleep(50); + return this; + } + + protected WsWizardBase setWebServiceRuntime(String name, int idx) { + findLink("Web service runtime:").get(0).click(); + sleep(100); + SWTBotShell sh = bot().activeShell(); + sleep(100); + SWTBotTree tree = sh.bot().treeInGroup("Web service runtime:"); + tree.select(name); + sh.bot().button("OK").click(); + sleep(50); + return this; + } + + protected WsWizardBase setTargetProject(String label, String name) { + findLink(label).get(0).click(); + SWTBotShell sh = bot().activeShell(); + sh.bot().comboBoxWithLabel(label).setSelection(name); + sh.bot().button("OK").click(); + sleep(50); + return this; + } + + public WsWizardBase setSlider(Slider_Level level, int idx) { + scale(idx).setSelection(level.ordinal()); + return this; + } + + //second panel + public WsWizardBase setPackageName(String pkg) { + bot().textWithLabel("Package name").typeText(pkg); + return this; + } + + + protected boolean isScaleEnabled(int i) { + return scale(i).isEnabled(); + } + + private List<SWTBotHyperlinkExt> findLink(String text) { + List<? extends Hyperlink> widgets = bot().widgets(WidgetMatcherFactory.widgetOfType(Hyperlink.class)); + List<SWTBotHyperlinkExt> ret = new ArrayList<SWTBotHyperlinkExt>(); + for (Hyperlink h: widgets) { + if (h.getText().indexOf(text) > -1) { + ret.add(new SWTBotHyperlinkExt(h)); + } + } + return ret; + } + + private SWTBotScaleExt scale(int i) { + List<? extends Scale> widgets = bot().widgets(WidgetMatcherFactory.widgetOfType(Scale.class)); + List<SWTBotScaleExt> ret = new ArrayList<SWTBotScaleExt>(); + for (Scale s: widgets) { + ret.add(new SWTBotScaleExt(s)); + } + return ret.get(i); + } +} Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/BottomUpWSTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/BottomUpWSTest.java 2011-03-29 21:16:05 UTC (rev 30123) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/BottomUpWSTest.java 2011-03-29 21:34:18 UTC (rev 30124) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Red Hat, Inc. + * Copyright (c) 2010-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, @@ -15,7 +15,7 @@ import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WebServiceWizard.Service_Type; -import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WebServiceWizard.Slider_Level; +import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WsWizardBase.Slider_Level; import org.junit.Test; Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/TopDownWSTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/TopDownWSTest.java 2011-03-29 21:16:05 UTC (rev 30123) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/TopDownWSTest.java 2011-03-29 21:34:18 UTC (rev 30124) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Red Hat, Inc. + * Copyright (c) 2010-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, @@ -15,7 +15,7 @@ import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WebServiceWizard.Service_Type; -import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WebServiceWizard.Slider_Level; +import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WsWizardBase.Slider_Level; import org.junit.Test; @SWTBotTestRequires(server=@Server(),perspective="Java EE") @@ -91,7 +91,17 @@ topDownWS(); } +// @Test +// public void testDefaultPkg() { +// setLevel(Slider_Level.ASSEMBLE); +// topDownWS(null); +// } + private void topDownWS() { + topDownWS("ws." + getWsName().toLowerCase()); + } + + private void topDownWS(String pkg) { String s = readStream(TopDownWSTest.class.getResourceAsStream("/resources/jbossws/ClassB.wsdl")); String[] tns = getWsPackage().split("\\."); StringBuilder sb = new StringBuilder(); @@ -101,14 +111,14 @@ } sb.append(tns[0]); String src = MessageFormat.format(s, sb.toString(), getWsName()); - String pkg = "ws." + getWsName().toLowerCase(); createService(Service_Type.TOP_DOWN, "/" + getWsProjectName() + "/src/" + getWsName() + ".wsdl", getLevel(), pkg, src); + switch (getLevel()) { - case DEVELOP: - case ASSEMBLE: - case DEPLOY: - runProject(getEarProjectName()); - break; + case DEVELOP: + case ASSEMBLE: + case DEPLOY: + runProject(getEarProjectName()); + break; } assertServiceDeployed(getWSDLUrl(), 10000); // servers.removeAllProjectsFromServer(configuredState.getServer().name); Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java 2011-03-29 21:16:05 UTC (rev 30123) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java 2011-03-29 21:34:18 UTC (rev 30124) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Red Hat, Inc. + * Copyright (c) 2010-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, @@ -33,22 +33,19 @@ import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner; import org.eclipse.swtbot.swt.finder.widgets.SWTBotCombo; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotScale; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.JavaEEEnterpriseApplicationProject; import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.WebServicesWSDL; -import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.WebServicesWebServiceClient; -import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.WebServlet; -import org.jboss.tools.ui.bot.ext.parts.SWTBotHyperlinkExt; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.jboss.tools.ws.ui.bot.test.uiutils.actions.NewFileWizardAction; import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.DynamicWebProjectWizard; +import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WebServiceClientWizard; import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WebServiceWizard; import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WebServiceWizard.Service_Type; -import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WebServiceWizard.Slider_Level; import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.Wizard; +import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WsWizardBase.Slider_Level; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -113,37 +110,32 @@ return "http://localhost:8080/" + getWsProjectName() + "/" + getWsName() + "?wsdl"; } - protected void createClient(String projectName, String servletName,String wsdlDef, int type) { - createProject(projectName); - SWTBot wiz = open.newObject(WebServicesWebServiceClient.LABEL); - wiz.comboBoxWithLabel( - WebServicesWebServiceClient.TEXT_SERVICE_DEFINITION).setText( - wsdlDef); - SWTBotScale slider = bot.scale(); - slider.setValue(type); - selectJbossWSRuntime(); - bot.sleep(TIME_1S); // wait for wizard to validate wsdl url and - // enable Finish button - open.finish(wiz); - projectExplorer.selectProject(projectName); - // create servlet which will invoke service - createInvokingServlet(servletName); - } - - /** - * checks if 'Web Service Runtime' is set to 'JbossWS' and possibly sets it correctly - * @param wiz wizard page of new Web Service - */ - @Deprecated - protected void selectJbossWSRuntime() { - SWTBotHyperlinkExt link = bot.hyperlink(1); - String linkText = link.getText(); - if (!linkText.contains("JBossWS")) { - link.click(); - SWTBot dBot = bot.activeShell().bot(); - dBot.tree().select("JBossWS"); - open.finish(dBot,IDELabel.Button.OK); + protected void createClient(String wsdl, String targetProject, Slider_Level level, String pkg) { + new NewFileWizardAction().run().selectTemplate("Web Services", "Web Service Client").next(); + WebServiceClientWizard w = new WebServiceClientWizard(); + w.setSource(wsdl); + w.setSlider(level, 0); + w.setServerRuntime(configuredState.getServer().name); + w.setWebServiceRuntime("JBossWS"); + w.setClientProject(targetProject); + if (pkg != null && !"".equals(pkg.trim())) { + w.next(); + w.setPackageName(pkg); } + w.finish(); + util.waitForNonIgnoredJobs(); + bot.sleep(1000); + + //let's fail if there's some error in the wizard, + //and close error dialog and the wizard so other tests + //can continue + if (bot.activeShell().getText().contains("Error")) { + SWTBotShell sh = bot.activeShell(); + String msg = sh.bot().text().getText(); + sh.bot().button(0).click(); + w.cancel(); + Assert.fail(msg); + } } protected void createService(Service_Type t, String source, Slider_Level level, String pkg, String code) { @@ -174,7 +166,7 @@ new NewFileWizardAction().run().selectTemplate("Web Services", "Web Service").next(); WebServiceWizard wsw = new WebServiceWizard(); wsw.setServiceType(t); - wsw.setServiceSource(source); + wsw.setSource(source); wsw.setServerRuntime(configuredState.getServer().name); wsw.setWebServiceRuntime("JBossWS"); wsw.setServiceProject(getWsProjectName()); @@ -223,22 +215,6 @@ return bot.editorByTitle(s + ".wsdl"); } - protected void createInvokingServlet(String servletName) { - String PKG_NAME="jbossws"; - SWTBot wiz = open.newObject(WebServlet.LABEL); - wiz.textWithLabel(WebServlet.TEXT_JAVA_PACKAGE).setText( - PKG_NAME); - wiz.textWithLabel(WebServlet.TEXT_CLASS_NAME).setText( - servletName); - open.finish(wiz); - eclipse.setClassContentFromResource(bot - .editorByTitle(servletName - + ".java"), true, - org.jboss.tools.ws.ui.bot.test.Activator.PLUGIN_ID, - PKG_NAME, servletName - + ".java.servlet"); - } - protected void createProject(String name) { new NewFileWizardAction().run().selectTemplate("Web", "Dynamic Web Project").next(); new DynamicWebProjectWizard().setProjectName(name).finish(); Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WsClientTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WsClientTest.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WsClientTest.java 2011-03-29 21:34:18 UTC (rev 30124) @@ -0,0 +1,90 @@ +/******************************************************************************* + * 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.ws.ui.bot.test.wtp; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WsWizardBase.Slider_Level; +import org.junit.Assert; +import org.junit.Test; + +@SWTBotTestRequires(server=@Server(),perspective="Java EE") +public class WsClientTest extends WSTestBase { + + @Override + protected String getWsProjectName() { + return "client"; + } + + @Override + protected String getWsPackage() { + return "client." + getLevel().toString().toLowerCase(); + } + + @Override + protected String getWsName() { + return null; + } + + @Test + public void testDeployClient() { + setLevel(Slider_Level.DEPLOY); + clientTest(getWsPackage()); + } + + @Test + public void testAssembleClient() { + setLevel(Slider_Level.ASSEMBLE); + clientTest(getWsPackage()); + } + + @Test + public void testDevelopClient() { + setLevel(Slider_Level.DEVELOP); + clientTest(getWsPackage()); + } + + @Test + public void testInstallClient() { + setLevel(Slider_Level.INSTALL); + clientTest(getWsPackage()); + } + + @Test + public void testStartClient() { + setLevel(Slider_Level.START); + clientTest(getWsPackage()); + } + + @Test + public void testTestClient() { + setLevel(Slider_Level.TEST); + clientTest(getWsPackage()); + } + + @Test + public void testDefaultPkg() { + setLevel(Slider_Level.ASSEMBLE); + clientTest(null); + } + + private void clientTest(String targetPkg) { + createClient("http://footballpool.dataaccess.eu/data/info.wso?WSDL", getWsProjectName(), getLevel(), targetPkg); + IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(getWsProjectName()); + String pkg = (targetPkg != null && !"".equals(targetPkg.trim())) ? getWsPackage() : "eu.dataaccess.footballpool"; + String cls = "src/" + pkg.replace('.', '/') + "/Info.java"; + Assert.assertTrue(p.getFile(cls).exists()); + cls = "src/" + pkg.replace('.', '/') + "/clientsample/ClientSample.java"; + Assert.assertTrue(p.getFile(cls).exists()); + } +}

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r30123 - trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray.

by jbosstools-commits＠lists.jboss.org

Author: bbrodt Date: 2011-03-29 17:16:05 -0400 (Tue, 29 Mar 2011) New Revision: 30123 Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/MultiViewerSelectionProvider.java Log: https://issues.jboss.org/browse/JBIDE-8541 Applied patch from Bugzilla 341200 Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/MultiViewerSelectionProvider.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/MultiViewerSelectionProvider.java 2011-03-29 21:08:44 UTC (rev 30122) +++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/tray/MultiViewerSelectionProvider.java 2011-03-29 21:16:05 UTC (rev 30123) @@ -1,12 +1,9 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are 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: - * IBM Corporation - initial API and implementation + * Copyright (c) 2005 IBM Corporation and others. All rights reserved. This program and the accompanying materials are + * 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: IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.bpel.common.ui.tray; @@ -18,6 +15,7 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartViewer; +import org.eclipse.jface.viewers.IPostSelectionProvider; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionProvider; @@ -26,179 +24,196 @@ import org.eclipse.jface.viewers.StructuredSelection; /** - * @author IBM, Original Contribution. + * @author IBM, Original Contribution. * @author Michal Chmielewski (michal.chmielewski(a)oracle.com) * @date Jun 5, 2007 - * + * */ -public class MultiViewerSelectionProvider implements ISelectionProvider { +public class MultiViewerSelectionProvider implements ISelectionProvider, IPostSelectionProvider { - static ISelectionChangedListener[] EMPTY_LISTENERS = {}; - - protected List<EditPartViewer> viewers = new ArrayList<EditPartViewer>(); - protected List<ISelectionChangedListener> listeners; - protected boolean changingSelection = false; - protected boolean broadcastingSelectionChange = false; - protected IStructuredSelection cachedSelection; - - /** - * Brand new shiny MultiViewerSelectionProvider - * @param viewer - */ - - public MultiViewerSelectionProvider(EditPartViewer viewer) { - this(); - addViewer(viewer); - } - - /** - * Brand new shiny MultiViewerSelectionProvider - */ - - public MultiViewerSelectionProvider() { - this.listeners = new ArrayList<ISelectionChangedListener>(); - } - - /** - * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) - */ - public void addSelectionChangedListener(ISelectionChangedListener listener) { - listeners.add(listener); - } + static ISelectionChangedListener[] EMPTY_LISTENERS = {}; - - /** - * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) - */ - public void removeSelectionChangedListener(ISelectionChangedListener listener) { - listeners.remove(listener); - } + protected List<EditPartViewer> viewers = new ArrayList<EditPartViewer>(); - /** - * Add the viewer to the list of viewers that are listening for selection changes. - * - * @param viewer - */ - - public void addViewer(EditPartViewer viewer) { - viewers.add(viewer); - viewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - if (changingSelection) { - return; - } - setSelection(event.getSelection()); - } - }); - } - - - /** - * Get the current selection - * - * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection() - */ - - public ISelection getSelection() { - if (cachedSelection == null) { - List<EditPartViewer> result = new ArrayList<EditPartViewer>(); - for(EditPartViewer next : viewers) { - result.addAll( next.getSelectedEditParts() ); - } - cachedSelection = calculateSelection(new StructuredSelection(result)); - } - return cachedSelection; - } + protected List<ISelectionChangedListener> listeners = new ArrayList<ISelectionChangedListener>(); - /** - * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection) - */ - public void setSelection(ISelection selection) { - if (selection instanceof IStructuredSelection == false) { - return; - } - - cachedSelection = calculateSelection( (IStructuredSelection) selection); - internalSetSelection(cachedSelection); - fireSelectionChanged(this, cachedSelection); - } - - protected void fireSelectionChanged(ISelectionProvider provider, ISelection selection) { - SelectionChangedEvent event = new SelectionChangedEvent(provider, selection); - try { - broadcastingSelectionChange = true; - for(ISelectionChangedListener listener : this.listeners.toArray( EMPTY_LISTENERS ) ) { - listener.selectionChanged(event); - } - } finally { - broadcastingSelectionChange = false; - } - } - - protected IStructuredSelection calculateSelection (IStructuredSelection baseSelection) { - - List<EditPart> result = new ArrayList<EditPart>(); - for(EditPartViewer viewer : viewers) { - - Map<Object,EditPart> registry = viewer.getEditPartRegistry(); - - for( Object n : baseSelection.toArray() ) { - EditPart part = (EditPart) n; - Object model = part.getModel(); - EditPart viewerEditPart = registry.get(model); - if (viewerEditPart != null) { - result.add(viewerEditPart); - } - } - } - if (result.isEmpty()) { - return StructuredSelection.EMPTY; - } - return new StructuredSelection(result); - } - - // TODO: try getting rid of the isEmpty() check here and in the same - // place in AdaptingSelectionProvider. - - // Set selection to each of the viewers and make sure we ignore callbacks - - protected void internalSetSelection (IStructuredSelection selection) { - if (selection == null || selection.isEmpty() ) { - return; - } - - try { - changingSelection = true; - - for(EditPartViewer viewer : viewers) { - - Map<Object,EditPart> registry = viewer.getEditPartRegistry(); - List<EditPart> newList = new ArrayList<EditPart>(); - Set<EditPart> newSet = new HashSet<EditPart>(); - - for(Object n : selection.toArray() ) { - EditPart part = (EditPart) n; - Object model = part.getModel(); - EditPart viewerEditPart = registry.get(model); - if (viewerEditPart != null && newSet.add(viewerEditPart)) { - newList.add(viewerEditPart); - } - } - viewer.setSelection(new StructuredSelection(newList)); - } - } finally { - changingSelection = false; - } - } - - /** - * Answer true if we are broadcasting a selection change. - * - * @return answer true if we are broadcasting selection change. - */ - - public boolean isBroadcastingSelectionChange() { - return broadcastingSelectionChange; - } + protected List<ISelectionChangedListener> postListeners = new ArrayList<ISelectionChangedListener>(); + + protected boolean changingSelection = false; + + protected boolean broadcastingSelectionChange = false; + + protected IStructuredSelection cachedSelection; + + /** + * Brand new shiny MultiViewerSelectionProvider + */ + public MultiViewerSelectionProvider() { + // Empty constructor + } + + /** + * Brand new shiny MultiViewerSelectionProvider + * + * @param viewer + */ + public MultiViewerSelectionProvider(EditPartViewer viewer) { + addViewer(viewer); + } + + /** + * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) + */ + public void addSelectionChangedListener(ISelectionChangedListener listener) { + listeners.add(listener); + } + + /** + * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) + */ + public void removeSelectionChangedListener(ISelectionChangedListener listener) { + listeners.remove(listener); + } + + /** + * @see org.eclipse.jface.viewers.IPostSelectionProvider#addPostSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) + */ + public void addPostSelectionChangedListener(ISelectionChangedListener listener) { + postListeners.add(listener); + } + + /** + * @see org.eclipse.jface.viewers.IPostSelectionProvider#removePostSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) + */ + public void removePostSelectionChangedListener(ISelectionChangedListener listener) { + postListeners.remove(listener); + } + + /** + * Add the viewer to the list of viewers that are listening for selection changes. + * + * @param viewer + */ + public void addViewer(EditPartViewer viewer) { + viewers.add(viewer); + viewer.addSelectionChangedListener(new ISelectionChangedListener() { + public void selectionChanged(SelectionChangedEvent event) { + if (changingSelection) { + return; + } + setSelection(event.getSelection()); + } + }); + } + + /** + * Get the current selection + * + * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection() + */ + public ISelection getSelection() { + if (cachedSelection == null) { + List<EditPartViewer> result = new ArrayList<EditPartViewer>(); + for (EditPartViewer next : viewers) { + result.addAll(next.getSelectedEditParts()); + } + cachedSelection = calculateSelection(new StructuredSelection(result)); + } + return cachedSelection; + } + + /** + * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection) + */ + public void setSelection(ISelection selection) { + if (selection instanceof IStructuredSelection == false) { + return; + } + + cachedSelection = calculateSelection((IStructuredSelection) selection); + internalSetSelection(cachedSelection); + fireSelectionChanged(this, cachedSelection); + } + + protected void fireSelectionChanged(ISelectionProvider provider, ISelection selection) { + SelectionChangedEvent event = new SelectionChangedEvent(provider, selection); + try { + broadcastingSelectionChange = true; + for (ISelectionChangedListener listener : this.listeners.toArray(EMPTY_LISTENERS)) { + listener.selectionChanged(event); + } + for (ISelectionChangedListener listener : this.postListeners.toArray(EMPTY_LISTENERS)) { + listener.selectionChanged(event); + } + } finally { + broadcastingSelectionChange = false; + } + } + + protected IStructuredSelection calculateSelection(IStructuredSelection baseSelection) { + + List<EditPart> result = new ArrayList<EditPart>(); + for (EditPartViewer viewer : viewers) { + + Map<Object, EditPart> registry = viewer.getEditPartRegistry(); + + for (Object n : baseSelection.toArray()) { + EditPart part = (EditPart) n; + Object model = part.getModel(); + EditPart viewerEditPart = registry.get(model); + if (viewerEditPart != null) { + result.add(viewerEditPart); + } + } + } + if (result.isEmpty()) { + return StructuredSelection.EMPTY; + } + return new StructuredSelection(result); + } + + // TODO: try getting rid of the isEmpty() check here and in the same + // place in AdaptingSelectionProvider. + + // Set selection to each of the viewers and make sure we ignore callbacks + + protected void internalSetSelection(IStructuredSelection selection) { + if (selection == null || selection.isEmpty()) { + return; + } + + try { + changingSelection = true; + + for (EditPartViewer viewer : viewers) { + + Map<Object, EditPart> registry = viewer.getEditPartRegistry(); + List<EditPart> newList = new ArrayList<EditPart>(); + Set<EditPart> newSet = new HashSet<EditPart>(); + + for (Object n : selection.toArray()) { + EditPart part = (EditPart) n; + Object model = part.getModel(); + EditPart viewerEditPart = registry.get(model); + if (viewerEditPart != null && newSet.add(viewerEditPart)) { + newList.add(viewerEditPart); + } + } + viewer.setSelection(new StructuredSelection(newList)); + } + } finally { + changingSelection = false; + } + } + + /** + * Answer true if we are broadcasting a selection change. + * + * @return answer true if we are broadcasting selection change. + */ + + public boolean isBroadcastingSelectionChange() { + return broadcastingSelectionChange; + } }

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r30122 - trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2011-03-29 17:08:44 -0400 (Tue, 29 Mar 2011) New Revision: 30122 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSF2CCAttrsHyperlinkPartitioner.java Log: JBIDE-7461 OpenOns for #{cc.attrs.*} @Override annotation problem is fixed Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSF2CCAttrsHyperlinkPartitioner.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSF2CCAttrsHyperlinkPartitioner.java 2011-03-29 20:22:33 UTC (rev 30121) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSF2CCAttrsHyperlinkPartitioner.java 2011-03-29 21:08:44 UTC (rev 30122) @@ -43,7 +43,9 @@ return JSF2_CC_ATTRIBUTE_PARTITION; } - @Override + /** + * Recognizes the region as having JSF2 CC Attribute reference + */ public boolean recognize(IDocument document, IHyperlinkRegion region) { StructuredModelWrapper smw = new StructuredModelWrapper(); smw.init(document);

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r30121 - in trunk/cdi/plugins/org.jboss.tools.cdi.solder.core: src/org/jboss/tools/cdi/solder/core and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-03-29 16:22:33 -0400 (Tue, 29 Mar 2011) New Revision: 30121 Added: trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/src/org/jboss/tools/cdi/solder/core/BeanNameFeature.java trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/src/org/jboss/tools/cdi/solder/core/CDISolderConstants.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/plugin.xml trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/src/org/jboss/tools/cdi/solder/core/CDISolderCoreExtension.java Log: JBIDE-3120 https://issues.jboss.org/browse/JBIDE-3120 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/plugin.xml =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/plugin.xml 2011-03-29 20:21:01 UTC (rev 30120) +++ trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/plugin.xml 2011-03-29 20:22:33 UTC (rev 30121) @@ -5,8 +5,7 @@ point="org.jboss.tools.cdi.core.cdiextensions"> <cdiextension class="org.jboss.tools.cdi.solder.core.CDISolderCoreExtension" - runtime="org.jboss.seam.solder.core.CoreExtension" - features=""> + runtime="org.jboss.seam.solder.core.CoreExtension"> </cdiextension> </extension> </plugin> Added: trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/src/org/jboss/tools/cdi/solder/core/BeanNameFeature.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/src/org/jboss/tools/cdi/solder/core/BeanNameFeature.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/src/org/jboss/tools/cdi/solder/core/BeanNameFeature.java 2011-03-29 20:22:33 UTC (rev 30121) @@ -0,0 +1,32 @@ +/******************************************************************************* + * 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.cdi.solder.core; + +import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.extension.feature.IBeanNameFeature; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class BeanNameFeature implements IBeanNameFeature { + /** + * The singleton instance that processes requests without building inner state. + */ + public static final IBeanNameFeature instance = new BeanNameFeature(); + + public String computeBeanName(IBean bean) { + + return null; + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/src/org/jboss/tools/cdi/solder/core/BeanNameFeature.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/src/org/jboss/tools/cdi/solder/core/CDISolderConstants.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/src/org/jboss/tools/cdi/solder/core/CDISolderConstants.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/src/org/jboss/tools/cdi/solder/core/CDISolderConstants.java 2011-03-29 20:22:33 UTC (rev 30121) @@ -0,0 +1,11 @@ +package org.jboss.tools.cdi.solder.core; + +import org.jboss.tools.cdi.core.CDIConstants; + +public interface CDISolderConstants extends CDIConstants { + public String EXACT_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.core.Exact"; + public String FULLY_QUALIFIED_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.core.FullyQualified"; + public String REQUIRES_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.core.Requires"; + public String VETO_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.core.Veto"; + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/src/org/jboss/tools/cdi/solder/core/CDISolderConstants.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/src/org/jboss/tools/cdi/solder/core/CDISolderCoreExtension.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/src/org/jboss/tools/cdi/solder/core/CDISolderCoreExtension.java 2011-03-29 20:21:01 UTC (rev 30120) +++ trunk/cdi/plugins/org.jboss.tools.cdi.solder.core/src/org/jboss/tools/cdi/solder/core/CDISolderCoreExtension.java 2011-03-29 20:22:33 UTC (rev 30121) @@ -1,11 +1,14 @@ package org.jboss.tools.cdi.solder.core; import org.jboss.tools.cdi.core.extension.ICDIExtension; +import org.jboss.tools.cdi.core.extension.feature.IBeanNameFeature; public class CDISolderCoreExtension implements ICDIExtension { public Object getAdapter(Class adapter) { - // TODO Auto-generated method stub + if(adapter == IBeanNameFeature.class) { + return BeanNameFeature.instance; + } return null; }

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r30120 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: src/org/jboss/tools/cdi/core/test/extension and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-03-29 16:21:01 -0400 (Tue, 29 Mar 2011) New Revision: 30120 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/plugin.xml trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/CDIExtensionImpl.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/ExtensionFactoryTest.java Log: JBIDE-3120 https://issues.jboss.org/browse/JBIDE-3120 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/plugin.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/plugin.xml 2011-03-29 20:20:18 UTC (rev 30119) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/plugin.xml 2011-03-29 20:21:01 UTC (rev 30120) @@ -5,8 +5,7 @@ point="org.jboss.tools.cdi.core.cdiextensions"> <cdiextension class="org.jboss.tools.cdi.core.test.extension.CDIExtensionImpl" - runtime="org.jboss.tools.cdi.core.fake.FakeExtension" - features="feature_1,feature_2"> + runtime="org.jboss.tools.cdi.core.fake.FakeExtension"> </cdiextension> </extension> </plugin> Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/CDIExtensionImpl.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/CDIExtensionImpl.java 2011-03-29 20:20:18 UTC (rev 30119) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/CDIExtensionImpl.java 2011-03-29 20:21:01 UTC (rev 30120) @@ -1,11 +1,20 @@ package org.jboss.tools.cdi.core.test.extension; +import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.extension.ICDIExtension; +import org.jboss.tools.cdi.core.extension.feature.IBeanNameFeature; -public class CDIExtensionImpl implements ICDIExtension { +public class CDIExtensionImpl implements ICDIExtension, IBeanNameFeature { public Object getAdapter(Class adapter) { + if(adapter == IBeanNameFeature.class) { + return this; + } return null; } + public String computeBeanName(IBean bean) { + return null; + } + } Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/ExtensionFactoryTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/ExtensionFactoryTest.java 2011-03-29 20:20:18 UTC (rev 30119) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/ExtensionFactoryTest.java 2011-03-29 20:21:01 UTC (rev 30120) @@ -3,13 +3,14 @@ import java.util.Set; import org.jboss.tools.cdi.core.extension.CDIExtensionFactory; +import org.jboss.tools.cdi.core.extension.feature.IBeanNameFeature; import junit.framework.TestCase; public class ExtensionFactoryTest extends TestCase { public void testExtensionFactory() throws Exception { - Set<String> clss = CDIExtensionFactory.getInstance().getExtensionClassesByfeature("feature_1"); + Set<String> clss = CDIExtensionFactory.getInstance().getExtensionClassesByFeature(IBeanNameFeature.class); System.out.println(clss.size()); }

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r30119 - in trunk/cdi/plugins/org.jboss.tools.cdi.core: schema and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-03-29 16:20:18 -0400 (Tue, 29 Mar 2011) New Revision: 30119 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF trunk/cdi/plugins/org.jboss.tools.cdi.core/schema/cdiextensions.exsd Log: JBIDE-3120 https://issues.jboss.org/browse/JBIDE-3120 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2011-03-29 20:19:58 UTC (rev 30118) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2011-03-29 20:20:18 UTC (rev 30119) @@ -29,6 +29,7 @@ Bundle-Vendor: JBoss by Red Hat Export-Package: org.jboss.tools.cdi.core, org.jboss.tools.cdi.core.extension, + org.jboss.tools.cdi.core.extension.feature, org.jboss.tools.cdi.core.preferences, org.jboss.tools.cdi.internal.core.ca, org.jboss.tools.cdi.internal.core.el, Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/schema/cdiextensions.exsd =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/schema/cdiextensions.exsd 2011-03-29 20:19:58 UTC (rev 30118) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/schema/cdiextensions.exsd 2011-03-29 20:20:18 UTC (rev 30119) @@ -66,13 +66,6 @@ </documentation> </annotation> </attribute> - <attribute name="features" type="string"> - <annotation> - <documentation> - Comma separated list of ids of features supported by this cdi extension. This is an optimisation parameter that allows to access at a specific feature request only instances of extensions registered for that feature. - </documentation> - </annotation> - </attribute> </complexType> </element>

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r30118 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: core/extension/feature and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-03-29 16:19:58 -0400 (Tue, 29 Mar 2011) New Revision: 30118 Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IBeanNameFeature.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionFactory.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionManager.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/ICDIExtension.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java Log: JBIDE-3120 https://issues.jboss.org/browse/JBIDE-3120 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionFactory.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionFactory.java 2011-03-29 18:37:05 UTC (rev 30117) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionFactory.java 2011-03-29 20:19:58 UTC (rev 30118) @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.Platform; import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.extension.feature.IBeanNameFeature; /** * Loads Eclipse extension point 'org.jboss.tools.cdi.core.cdiextensions' @@ -29,12 +30,11 @@ * Attributes: * 'runtime' - Qualified name of CDI runtime extension implementation class. * 'class' - Qualified name of JBoss Tools CDI model extension implementation class. - * 'features' - It is not planned to add regular methods to this interface, + * Implements: + * IAdaptable - It is not planned to add regular methods to ICDIExtension, * all features that are to be provided by implementations, will be available * through IAdaptable. In that way, adding to core support of a new feature * will not require to implement new methods in existing extensions. - * In order to efficiently request only relevant implementations, - * extensions must register supported features in this attribute. * * @author Viacheslav Kabanovich * @@ -42,6 +42,10 @@ public class CDIExtensionFactory { static CDIExtensionFactory factory = null; public static String POINT_ID = "org.jboss.tools.cdi.core.cdiextensions"; + + public static Class<?>[] FEATURES = { + IBeanNameFeature.class + }; public static CDIExtensionFactory getInstance() { if(factory == null) { @@ -59,7 +63,7 @@ /** * Maps features to fully qualified names of implementations of ICDIExtention. */ - private Map<String, Set<String>> featureToDesign = new HashMap<String, Set<String>>(); + private Map<Class<?>, Set<String>> featureToDesign = new HashMap<Class<?>, Set<String>>(); /** * Maps fully qualified names of implementations of ICDIExtention to their Class objects. @@ -93,17 +97,17 @@ runtimeToDesign.put(runtime, classes); } classes.add(cls); - - String features = c.getAttribute("features"); - StringTokenizer st = new StringTokenizer(features, ","); - while(st.hasMoreTokens()) { - String feature = st.nextToken(); - classes = featureToDesign.get(feature); - if(classes == null) { - classes = new HashSet<String>(); - featureToDesign.put(feature, classes); + + for (Class<?> f: FEATURES) { + Object adapter = adaptTo(extension, f); + if(adapter != null) { + classes = featureToDesign.get(f); + if(classes == null) { + classes = new HashSet<String>(); + featureToDesign.put(f, classes); + } + classes.add(cls); } - classes.add(cls); } } } @@ -112,10 +116,10 @@ return runtimeToDesign.get(qualifiedName); } - public Set<String> getFeatures() { + public Set<Class<?>> getFeatures() { return featureToDesign.keySet(); } - public Set<String> getExtensionClassesByfeature(String featureName) { + public Set<String> getExtensionClassesByFeature(Class<?> featureName) { return featureToDesign.get(featureName); } @@ -134,4 +138,13 @@ return null; } + static <F> F adaptTo(ICDIExtension extension, Class<F> feature) { + if(extension == null || feature == null) return null; + Class<?> cls = extension.getClass(); + if(feature.isAssignableFrom(cls)) { + return (F)extension; + } + return (F)extension.getAdapter(feature); + } + } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionManager.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionManager.java 2011-03-29 18:37:05 UTC (rev 30117) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionManager.java 2011-03-29 20:19:58 UTC (rev 30118) @@ -10,13 +10,20 @@ ******************************************************************************/ package org.jboss.tools.cdi.core.extension; + import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; import org.jboss.tools.cdi.core.CDICoreNature; +import org.jboss.tools.cdi.core.extension.feature.IBeanNameFeature; +/** + * + * @author Viacheslav Kabanovich + * + */ public class CDIExtensionManager { CDICoreNature n; /** @@ -32,7 +39,9 @@ /** * Mapping of feature ids to extension instances. */ - Map<String, Set<ICDIExtension>> featureToExtensions = new HashMap<String, Set<ICDIExtension>>(); + Map<Class<?>, Set<ICDIExtension>> featureToExtensions = new HashMap<Class<?>, Set<ICDIExtension>>(); + + FeatureStorage featureStorage = new FeatureStorage(); public CDIExtensionManager(CDICoreNature n) { this.n = n; @@ -68,13 +77,12 @@ private void addRuntime(String runtime) { CDIExtensionFactory factory = CDIExtensionFactory.getInstance(); Set<String> clss = factory.getExtensionClassesByRuntime(runtime); - if(clss != null) for (String cls: clss) { + if(clss != null && !clss.isEmpty()) for (String cls: clss) { ICDIExtension ext = factory.createExtensionInstance(cls); if(ext == null) continue; - //TODO initialize ext object. instances.put(cls, ext); - for (String feature: CDIExtensionFactory.getInstance().getFeatures()) { - if(factory.getExtensionClassesByfeature(feature).contains(cls)) { + for (Class<?> feature: CDIExtensionFactory.getInstance().getFeatures()) { + if(factory.getExtensionClassesByFeature(feature).contains(cls)) { Set<ICDIExtension> es = featureToExtensions.get(feature); if(es == null) { es = new HashSet<ICDIExtension>(); @@ -83,6 +91,7 @@ es.add(ext); } } + featureStorage.clean(); } } @@ -91,8 +100,8 @@ for (String cls: clss) { ICDIExtension ext = instances.remove(cls); if(ext != null) { - String[] is = featureToExtensions.keySet().toArray(new String[0]); - for (String feature: is) { + Class<?>[] is = featureToExtensions.keySet().toArray(new Class<?>[0]); + for (Class<?> feature: is) { Set<ICDIExtension> es = featureToExtensions.get(feature); if(es != null) { es.remove(ext); @@ -101,12 +110,47 @@ } } } + if(!clss.isEmpty()) { + featureStorage.clean(); + } } static Set<ICDIExtension> EMPTY = new HashSet<ICDIExtension>(); - public Set<ICDIExtension> getExtensions(String feature) { + public Set<ICDIExtension> getExtensions(Class<?> feature) { return featureToExtensions.containsKey(feature) ? featureToExtensions.get(feature) : EMPTY; } + public Set<IBeanNameFeature> getBeanNameFeature() { + Set<IBeanNameFeature> result = featureStorage.beanName; + if(result == null) { + featureStorage.beanName = result = getFeature(IBeanNameFeature.class); + } + return result; + } + + private <F extends Object> Set<F> getFeature(Class<F> cls) { + Set<F> result = new HashSet<F>(); + Set<ICDIExtension> extensions = getExtensions(cls); + if(!extensions.isEmpty()) { + for (ICDIExtension ext: extensions) { + F feature = CDIExtensionFactory.adaptTo(ext, cls); + if(feature != null) { + result.add(feature); + } + } + } + return result; + } + + class FeatureStorage { + Set<IBeanNameFeature> beanName = null; + + void clean() { + beanName = null; + } + + + } + } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/ICDIExtension.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/ICDIExtension.java 2011-03-29 18:37:05 UTC (rev 30117) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/ICDIExtension.java 2011-03-29 20:19:58 UTC (rev 30118) @@ -20,13 +20,11 @@ * where attribute 'runtime' is assigned to a CDI runtime extension implementation class qualified name * and attribute 'class' is assigned to a JBoss Tools CDI model extension implementation class * qualified name. - * It is not planned to add regular methods to this interface, all features that are to be provided - * by implementations, will be available through IAdaptable. In that way, adding to core support of - * a new feature will not require to implement new methods in existing extensions. In order to - * let core efficiently request only relevant implementations, extensions must register supported - * features in attribute 'features' of extension point. + * It is not planned to add methods to this interface, all features that are to be provided + * by implementations, will be available either through IAdaptable or by direct implementing feature + * interfaces. In that way, adding to core support of a new feature will not require to implement + * new methods in existing extensions. * - * * @author Viacheslav Kabanovich * */ Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IBeanNameFeature.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IBeanNameFeature.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IBeanNameFeature.java 2011-03-29 20:19:58 UTC (rev 30118) @@ -0,0 +1,26 @@ +/******************************************************************************* + * 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.cdi.core.extension.feature; + +import org.jboss.tools.cdi.core.IBean; + +/** + * This feature is invoked by bean when it computes its name. + * The first non-null value is accepted. + * + * @author Viacheslav Kabanovich + * + */ +public interface IBeanNameFeature { + public static String ID = "org.jboss.tools.cdi.core.extension.feature.IBeanNameFeature"; + + public String computeBeanName(IBean bean); +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IBeanNameFeature.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java 2011-03-29 18:37:05 UTC (rev 30117) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java 2011-03-29 20:19:58 UTC (rev 30118) @@ -17,6 +17,7 @@ import org.eclipse.jdt.core.JavaModelException; import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.ICDIElement; +import org.jboss.tools.cdi.core.extension.CDIExtensionManager; /** * @@ -31,6 +32,11 @@ return parent != null ? parent.getCDIProject() : null; } + public CDIExtensionManager getExtensionManager() { + CDIProject project = getCDIProject(); + return project == null ? null : project.getNature().getExtensionManager(); + } + protected ParametedType getObjectType(IMember context) { try { return getCDIProject().getNature().getTypeFactory().getParametedType(context, "QObject;"); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-03-29 18:37:05 UTC (rev 30117) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-03-29 20:19:58 UTC (rev 30118) @@ -41,6 +41,7 @@ import org.jboss.tools.cdi.core.IStereotype; import org.jboss.tools.cdi.core.IStereotypeDeclaration; import org.jboss.tools.cdi.core.ITypeDeclaration; +import org.jboss.tools.cdi.core.extension.feature.IBeanNameFeature; import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.FieldDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition; @@ -313,6 +314,15 @@ if(specialized != null) { return specialized.getName(); } + + Set<IBeanNameFeature> fs = getExtensionManager().getBeanNameFeature(); + if(fs != null) for (IBeanNameFeature f: fs) { + String result = f.computeBeanName(this); + if(result != null) { + return result; + } + } + AnnotationDeclaration named = findNamedAnnotation(); if(named == null) return null; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2011-03-29 18:37:05 UTC (rev 30117) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2011-03-29 20:19:58 UTC (rev 30118) @@ -22,6 +22,7 @@ import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IType; import org.jboss.tools.cdi.core.CDIConstants; +import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.IAnnotated; import org.jboss.tools.cdi.core.IAnnotationDeclaration; @@ -38,6 +39,7 @@ * */ public abstract class AbstractMemberDefinition implements IAnnotated { + CDICoreNature project; protected List<IAnnotationDeclaration> annotations = new ArrayList<IAnnotationDeclaration>(); protected IAnnotatable member; protected Map<String, AnnotationDeclaration> annotationsByType = new HashMap<String, AnnotationDeclaration>(); @@ -62,7 +64,18 @@ return null; } + public PackageDefinition getPackageDefinition() { + AbstractTypeDefinition t = getTypeDefinition(); + if(t == null) return null; + String qn = t.getQualifiedName(); + if(qn == null) return null; + int d = qn.lastIndexOf('.'); + String packageName = (d < 0) ? "" : qn.substring(0, d); + return project.getDefinitions().getPackageDefinition(packageName); + } + protected void init(IType contextType, DefinitionContext context) throws CoreException { + project = context.getProject(); resource = ((IJavaElement)member).getResource(); IAnnotation[] ts = member.getAnnotations(); for (int i = 0; i < ts.length; i++) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2011-03-29 18:37:05 UTC (rev 30117) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2011-03-29 20:19:58 UTC (rev 30118) @@ -351,6 +351,10 @@ } return result; } + + public PackageDefinition getPackageDefinition(String packageName) { + return packageDefinitions.get(packageName); + } }

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r30117 - trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2011-03-29 14:37:05 -0400 (Tue, 29 Mar 2011) New Revision: 30117 Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CCAttrsOpenOnTest.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java Log: JBIDE-7461 OpenOns for #{cc.attrs.*} JUnit Test is added Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CCAttrsOpenOnTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CCAttrsOpenOnTest.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CCAttrsOpenOnTest.java 2011-03-29 18:37:05 UTC (rev 30117) @@ -0,0 +1,193 @@ +/******************************************************************************* + * 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.text.ext.test; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.FindReplaceDocumentAdapter; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.hyperlink.IHyperlink; +import org.eclipse.jface.text.source.ISourceViewer; +import org.eclipse.swt.graphics.Point; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.Utils; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.WorkbenchUtils; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +/** + * + * @author Victor V. Rubezhny + * + */ +public class JSF2CCAttrsOpenOnTest extends TestCase { + private static final String PROJECT_NAME = "JSF2CompositeOpenOn"; + private static final String PAGE_NAME = PROJECT_NAME+"/WebContent/resources/demo/input.xhtml"; + + public IProject project = null; + + protected void setUp() { + project = ResourcesPlugin.getWorkspace().getRoot().getProject( + PROJECT_NAME); + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false); + JobUtils.waitForIdle(); + } + + protected void tearDown() { + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false); + } + + public JSF2CCAttrsOpenOnTest() { + super("JSF2 OpenOn on CC Attributes test"); + } + + static String COMPOSITE_URI = "http://java.sun.com/jsf/composite"; + static String COMPOSITE_INTERFACE_NODE = ":interface"; + static String COMPOSITE_ATTRIBUTE_NODE = ":attribute"; + static String COMPOSITE_NAME_ATTRIBUTE = "name"; + + + public void testCCInterface() throws PartInitException, BadLocationException { + final String editorName = "input.xhtml"; + final String elToTest = "cc.attrs"; + IEditorPart editor = WorkbenchUtils.openEditor(PAGE_NAME); + assertTrue(editor instanceof JSPMultiPageEditor); + JobUtils.waitForIdle(); + JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor; + ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer(); + + IDocument document = viewer.getDocument(); + IRegion reg = new FindReplaceDocumentAdapter(document).find(0, + elToTest, true, true, false, false); + + assertNotNull("CC Interface reference: "+elToTest+" not found",reg); + + IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, true); // new Region(reg.getOffset() + reg.getLength(), 0) + + assertNotNull("Hyperlinks for CC Interface :"+elToTest+" are not found",links); + + assertTrue("Hyperlinks for CC Interface: "+elToTest+" are not found",links.length!=0); + + for(IHyperlink link : links){ + assertNotNull(link.toString()); + + link.open(); + JobUtils.waitForIdle(2000); + + IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + if(editorName.equals(resultEditor.getTitle())){ + + assertTrue("Opened editor is not JSPMultiPageEditor: "+resultEditor.getClass().getName(), (resultEditor instanceof JSPMultiPageEditor)); + + JSPMultiPageEditor multyPageEditor = (JSPMultiPageEditor) resultEditor; + viewer = multyPageEditor.getSourceEditor().getTextViewer(); + assertNotNull("An error occured while trying to access the editor's viewer!", viewer); + document = viewer.getDocument(); + assertNotNull("An error occured while trying to access the viewer's document!", document); + Point sel = viewer.getSelectedRange(); + assertNotNull("An error occured while trying to access the viewer's selection!", viewer); + + StructuredModelWrapper smw = new StructuredModelWrapper(); + smw.init(document); + try { + Document xmlDocument = smw.getDocument(); + assertNotNull("An error occured while trying to access the structured document!", xmlDocument); + + Node node = Utils.findNodeForOffset(xmlDocument, sel.x); + assertNotNull("The document selection is not a CC Interface!", node); + + assertTrue("The document selection is not a CC Interface!", COMPOSITE_URI.equals(node.getNamespaceURI())); + assertTrue("The document selection is not a CC Interface!", node.getNodeName().endsWith(COMPOSITE_INTERFACE_NODE)); + return; + } finally { + smw.dispose(); + } + } + } + } + + public void testCCInterfaceAttrs() throws PartInitException, BadLocationException { + final String editorName = "input.xhtml"; + final String elToTest = "cc.attrs.action"; + final String atributeAction = "action"; + IEditorPart editor = WorkbenchUtils.openEditor(PAGE_NAME); + assertTrue(editor instanceof JSPMultiPageEditor); + JobUtils.waitForIdle(); + JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor; + ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer(); + + IDocument document = viewer.getDocument(); + IRegion reg = new FindReplaceDocumentAdapter(document).find(0, + elToTest, true, true, false, false); + assertNotNull("CC Interface reference: "+elToTest+" not found",reg); + + reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset(), + atributeAction, true, true, false, false); + assertNotNull("CC Interface reference: "+elToTest+" not found",reg); + + + IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, true); // new Region(reg.getOffset() + reg.getLength(), 0) + + assertNotNull("Hyperlinks for CC Interface :"+elToTest+" are not found",links); + + assertTrue("Hyperlinks for CC Interface: "+elToTest+" are not found",links.length!=0); + + for(IHyperlink link : links){ + assertNotNull(link.toString()); + + link.open(); + JobUtils.waitForIdle(2000); + + IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + if(editorName.equals(resultEditor.getTitle())){ + + assertTrue("Opened editor is not JSPMultiPageEditor: "+resultEditor.getClass().getName(), (resultEditor instanceof JSPMultiPageEditor)); + + JSPMultiPageEditor multyPageEditor = (JSPMultiPageEditor) resultEditor; + viewer = multyPageEditor.getSourceEditor().getTextViewer(); + assertNotNull("An error occured while trying to access the editor's viewer!", viewer); + document = viewer.getDocument(); + assertNotNull("An error occured while trying to access the viewer's document!", document); + Point sel = viewer.getSelectedRange(); + assertNotNull("An error occured while trying to access the viewer's selection!", viewer); + + StructuredModelWrapper smw = new StructuredModelWrapper(); + smw.init(document); + try { + Document xmlDocument = smw.getDocument(); + assertNotNull("An error occured while trying to access the structured document!", xmlDocument); + + Node node = Utils.findNodeForOffset(xmlDocument, sel.x); + assertNotNull("The document selection is not a CC Interface!", node); + + assertTrue("The document selection is not a CC Interface!", COMPOSITE_URI.equals(node.getNamespaceURI())); + assertTrue("The document selection is not a CC Interface!", node.getNodeName().endsWith(COMPOSITE_ATTRIBUTE_NODE)); + assertTrue("The document selection points to wrong CC Interface Attribute!", atributeAction.equals(((Element)node).getAttribute(COMPOSITE_NAME_ATTRIBUTE))); + return; + } finally { + smw.dispose(); + } + } + } + } +} + Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSF2CCAttrsOpenOnTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java 2011-03-29 17:28:12 UTC (rev 30116) +++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java 2011-03-29 18:37:05 UTC (rev 30117) @@ -35,6 +35,10 @@ "org.jboss.tools.jsf.text.ext.test", new String[]{"projects/JSF2CompositeOpenOn"}, new String[]{"JSF2CompositeOpenOn"})); + suite.addTest(new ProjectImportTestSetup(new TestSuite(JSF2CCAttrsOpenOnTest.class), + "org.jboss.tools.jsf.text.ext.test", + new String[]{"projects/JSF2CompositeOpenOn"}, + new String[]{"JSF2CompositeOpenOn"})); return suite; } } \ No newline at end of file

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r30116 - tags/jbosstools-3.2.0.Final.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-03-29 13:28:12 -0400 (Tue, 29 Mar 2011) New Revision: 30116 Added: tags/jbosstools-3.2.0.Final/jbosstools-3.2.x/ Log: Tagged from jbosstools-3.2_stable_branch.aggregate #329, rev 29183 - see https://fisheye.jboss.org/changelog/~startDate=2011-02-08,endDate=2011-02... and https://fisheye.jboss.org/changelog/JBossTools?cs=29183

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r30115 - in trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevStudio_Trunk/job: jbosstools-3.3_trunk.aggregate and 39 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-03-29 13:15:55 -0400 (Tue, 29 Mar 2011) New Revision: 30115 Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... Log: update configs to tweak documentation Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -25,14 +25,16 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting -P helios :: use .target file to provision target -P helios-no-target :: don't use .target file to provision target; instead generate on the fly from MANIFEST.MF and feature.xml files -P helios-local-target :: use /home/hudson/static_build_env/jbds/target-platform/e36-wtp322.target as target against which to resolve deps -P hudson :: add hudson job # to generated plugin/feature qualifiers -P coverage :: support emma + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -25,8 +25,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -P helios :: use .target file to provision target -P helios-no-target :: don't use .target file to provision target; instead generate on the fly from MANIFEST.MF and feature.xml files -P helios-local-target :: use /home/hudson/static_build_env/jbds/target-platform/e36-wtp322.target as target against which to resolve deps Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -25,9 +25,11 @@ osgi-test:test :: just (re-)run test(s) -P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting +-P hudson :: enable hudson build ID in feature/plugin qualifiers + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -23,8 +23,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -23,8 +23,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -23,8 +23,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -24,8 +24,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -23,8 +23,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -32,8 +32,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -23,8 +23,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -23,8 +23,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -23,8 +23,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -24,8 +24,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -24,8 +24,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -24,8 +24,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -23,8 +23,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -24,8 +24,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -24,8 +24,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -23,8 +23,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -24,8 +24,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -24,8 +24,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -24,8 +24,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -23,8 +23,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -24,8 +24,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -23,8 +23,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -24,8 +24,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -24,8 +24,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -24,8 +24,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -24,8 +24,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -24,8 +24,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -24,8 +24,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -23,8 +23,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -24,8 +24,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -24,8 +24,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -27,13 +27,15 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting -P local.site :: use local path as target against which to resolve deps -Dlocal.site=file://home/hudson/static_build_env/jbds/target-platform_3.3.indigo/e37M5-wtp33M5.target/ :: set local path -P hudson :: add hudson job # to generated plugin/feature qualifiers -P coverage :: support emma + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -25,6 +25,8 @@ install :: build, test, and install into m2 repo <a href="http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle...">*</a> osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting -Dmaven.test.skip :: to compile but not run tests in conjunction with integration-test or install phase -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -Dcoverage :: enable Emma test coverage reporting Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -23,8 +23,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -25,8 +25,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -24,8 +24,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -29,11 +29,13 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting -P helios-local-target :: don't use .target file to provision target; instead generate on the fly from MANIFEST.MF and feature.xml files -P galileo :: enable galileo dependencies -P hudson :: enable hudson build ID in feature/plugin qualifiers + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end Modified: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... =================================================================== --- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:13:10 UTC (rev 30114) +++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 17:15:55 UTC (rev 30115) @@ -28,8 +28,10 @@ install :: build, test, and install into m2 repo * osgi-test:test :: just (re-)run test(s) +-P hudson :: enable hudson build ID in feature/plugin qualifiers +-P coverage :: enable coverage reporting + -Dmaven.test.skip :: skip compiling and running tests - -Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo -fae :: fail at end

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 March 2011