June 2011 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r32122 - trunk/download.jboss.org/jbosstools/builds/cascade.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-06-15 13:01:39 -0400 (Wed, 15 Jun 2011) New Revision: 32122 Modified: trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt Log: bpel now depends on archives Modified: trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt =================================================================== --- trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2011-06-15 14:51:04 UTC (rev 32121) +++ trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2011-06-15 17:01:39 UTC (rev 32122) @@ -1,4 +1,4 @@ -Revised swimlanes, as implemented in 3.2_stable_branch and 3.3_trunk jobs, 2011/05/01 +Revised swimlanes, as implemented in 3.2_stable_branch and 3.3_trunk jobs, 2011/06/15 ------------------------ @@ -14,10 +14,12 @@ examples -> portlet -bpel, birt, portlet, modeshape, profiler, smooks, tptp -> tests +birt, portlet, modeshape, profiler, smooks, tptp -> tests ws, deltacloud -> as -> archives, jmx -> tests +bpel -> archives + jbpm -> flow, common -> tests esb -> jst -> common -> tests

14 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r32121 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-06-15 10:51:04 -0400 (Wed, 15 Jun 2011) New Revision: 32121 Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java Log: [JBIDE-9054] corrected warnings by removing unneeded local vars Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java 2011-06-15 14:47:40 UTC (rev 32120) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java 2011-06-15 14:51:04 UTC (rev 32121) @@ -41,7 +41,6 @@ } public static IPath[] getChanged() { - ArrayList<IPath> tmp = changed; return (IPath[]) changed.toArray(new IPath[changed.size()]); }

14 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r32120 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-06-15 10:47:40 -0400 (Wed, 15 Jun 2011) New Revision: 32120 Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTestDynUtil.java Log: [JBIDE-9054] corrected warnings by removing unneeded imports, local vars Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTestDynUtil.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTestDynUtil.java 2011-06-15 11:54:53 UTC (rev 32119) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTestDynUtil.java 2011-06-15 14:47:40 UTC (rev 32120) @@ -3,7 +3,6 @@ import java.io.IOException; import java.util.Arrays; -import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.core.resources.ResourcesPlugin; @@ -62,8 +61,6 @@ } protected void addOneReference(IVirtualComponent parent, IVirtualReference ref) throws CoreException { - String path, archiveName; - IDataModelProvider provider = new AddReferenceDataModelProvider(); IDataModel dm = DataModelFactory.createDataModel(provider); dm.setProperty(IAddReferenceDataModelProperties.SOURCE_COMPONENT, parent);

14 years, 10 months

1
0
0 / 0

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

by jbosstools-commits＠lists.jboss.org

Author: vpakan(a)redhat.com Date: 2011-06-15 07:54:53 -0400 (Wed, 15 Jun 2011) New Revision: 32119 Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/FacesConfigCodeCompletionTest.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ReflectionsHelper.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ContentAssistBot.java Log: Added faces-config.xml file Code Completion Test. Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2011-06-15 09:41:53 UTC (rev 32118) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2011-06-15 11:54:53 UTC (rev 32119) @@ -15,6 +15,7 @@ import org.jboss.tools.jsf.ui.bot.test.smoke.AddRemoveJSFCapabilitiesTest; import org.jboss.tools.jsf.ui.bot.test.smoke.CodeCompletionTest; import org.jboss.tools.jsf.ui.bot.test.smoke.CreateNewJSFProjectTest; +import org.jboss.tools.jsf.ui.bot.test.smoke.FacesConfigCodeCompletionTest; import org.jboss.tools.jsf.ui.bot.test.smoke.OpenOnTest; import org.jboss.tools.jsf.ui.bot.test.templates.SetTemplateForUnknownTagTest; import org.jboss.tools.jsf.ui.bot.test.templates.UnknownTemplateTest; @@ -42,6 +43,7 @@ suite.addTestSuite(JSF2AttributeRenameTest.class); suite.addTestSuite(OpenOnTest.class); suite.addTestSuite(CodeCompletionTest.class); + suite.addTestSuite(FacesConfigCodeCompletionTest.class); return suite; } } \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-06-15 09:41:53 UTC (rev 32118) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-06-15 11:54:53 UTC (rev 32119) @@ -144,7 +144,7 @@ "Editor Text is\n" + editor.getText(), editor.getText().contains(expectedInsertedText)); editor.save(); - // check Content Assist insertion of jsfc attribute attribute + // check Content Assist content of jsfc attribute attribute ContentAssistHelper.checkContentAssistContent(SWTTestExt.bot, FACELETS_TEST_PAGE, expectedInsertedText, Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/FacesConfigCodeCompletionTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/FacesConfigCodeCompletionTest.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/FacesConfigCodeCompletionTest.java 2011-06-15 11:54:53 UTC (rev 32119) @@ -0,0 +1,204 @@ +/******************************************************************************* + * 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, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.ui.bot.test.smoke; + +import java.util.LinkedList; +import java.util.List; + +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; +import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.helper.ContentAssistHelper; +import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt; +import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; +/** * Test Code Completion functionality of faces-config.xml file + * @author Vladimir Pakan + * + */ +public class FacesConfigCodeCompletionTest extends JSFAutoTestCase{ + + private static final String FACES_CONFIG_FILE_NAME = "faces-config.xml"; + private SWTBotEditor facesConfigEditor; + + @Override + protected void setUp() throws Exception { + super.setUp(); + facesConfigEditor = eclipse.openFile(VPEAutoTestCase.JBT_TEST_PROJECT_NAME, + "WebContent", + "WEB-INF", + FacesConfigCodeCompletionTest.FACES_CONFIG_FILE_NAME); + new SWTBotEditorExt(facesConfigEditor.toTextEditor().getReference(),bot) + .selectPage(IDELabel.FacesConfigEditor.SOURCE_TAB_LABEL); + } + @Override + protected void tearDown() throws Exception { + if (facesConfigEditor != null){ + facesConfigEditor.saveAndClose(); + } + super.tearDown(); + } + /** + * Test Code Completion functionality of faces-config.xml file + */ + public void testCodeCompletionOfFacesConfig(){ + String textToSelect = "<managed-bean>"; + // check Content Assist inside <faces-config> node + ContentAssistHelper.checkContentAssistContent(SWTTestExt.bot, + FacesConfigCodeCompletionTest.FACES_CONFIG_FILE_NAME, + textToSelect, + 0, + 0, + 0, + getInsideFacesConfigTagProposalList()); + textToSelect = "<description>User Name Bean</description>"; + // check Content Assist inside <managed-bean> node + ContentAssistHelper.checkContentAssistContent(SWTTestExt.bot, + FacesConfigCodeCompletionTest.FACES_CONFIG_FILE_NAME, + textToSelect, + 0, + 0, + 0, + getInsideManagedBeanTagProposalList()); + textToSelect = "<property-name>name</property-name>"; + // check Content Assist inside <managed-property> node + ContentAssistHelper.checkContentAssistContent(SWTTestExt.bot, + FacesConfigCodeCompletionTest.FACES_CONFIG_FILE_NAME, + textToSelect, + 0, + 0, + 0, + getInsideManagedPropertyTagProposalList()); + textToSelect = "<from-view-id>"; + // check Content Assist inside <navigation-rule> node + ContentAssistHelper.checkContentAssistContent(SWTTestExt.bot, + FacesConfigCodeCompletionTest.FACES_CONFIG_FILE_NAME, + textToSelect, + 0, + 0, + 0, + getInsideNavigationRuleTagProposalList()); + textToSelect = "<from-outcome>"; + // check Content Assist inside <navigation-case> node + ContentAssistHelper.checkContentAssistContent(SWTTestExt.bot, + FacesConfigCodeCompletionTest.FACES_CONFIG_FILE_NAME, + textToSelect, + 0, + 0, + 0, + getInsideNavigationCaseTagProposalList()); + } + /** + * Returns list of expected proposals inside <faces-config> tag + * @return + */ + private static List<String> getInsideFacesConfigTagProposalList(){ + LinkedList<String> result = new LinkedList<String>(); + + result.add("application"); + result.add("component"); + result.add("converter"); + result.add("faces-config-extension"); + result.add("factory"); + result.add("lifecycle"); + result.add("managed-bean"); + result.add("navigation-rule"); + result.add("referenced-bean"); + result.add("render-kit"); + result.add("validator"); + result.add("XSL processing instruction - XSL processing instruction"); + result.add("comment - xml comment"); + result.add("user : User"); + + return result; + } + /** + * Returns list of expected proposals inside <managed-bean> tag + * @return + */ + private static List<String> getInsideManagedBeanTagProposalList(){ + LinkedList<String> result = new LinkedList<String>(); + + result.add("description"); + result.add("display-name"); + result.add("icon"); + result.add("list-entries"); + result.add("managed-bean-class"); + result.add("managed-bean-extension"); + result.add("managed-bean-name"); + result.add("managed-bean-scope"); + result.add("managed-property"); + result.add("map-entries"); + result.add("XSL processing instruction - XSL processing instruction"); + result.add("comment - xml comment"); + result.add("user : User"); + return result; + } + /** + * Returns list of expected proposals inside <managed-property> tag + * @return + */ + private static List<String> getInsideManagedPropertyTagProposalList(){ + LinkedList<String> result = new LinkedList<String>(); + + result.add("description"); + result.add("display-name"); + result.add("icon"); + result.add("list-entries"); + result.add("map-entries"); + result.add("null-value"); + result.add("property-class"); + result.add("property-name"); + result.add("value"); + result.add("XSL processing instruction - XSL processing instruction"); + result.add("comment - xml comment"); + result.add("user : User"); + return result; + } + /** + * Returns list of expected proposals inside <navigation-rule> tag + * @return + */ + private static List<String> getInsideNavigationRuleTagProposalList(){ + LinkedList<String> result = new LinkedList<String>(); + + result.add("description"); + result.add("display-name"); + result.add("icon"); + result.add("from-view-id"); + result.add("navigation-case"); + result.add("navigation-rule-extension"); + result.add("XSL processing instruction - XSL processing instruction"); + result.add("comment - xml comment"); + result.add("user : User"); + return result; + } + /** + * Returns list of expected proposals inside <navigation-case> tag + * @return + */ + private static List<String> getInsideNavigationCaseTagProposalList(){ + LinkedList<String> result = new LinkedList<String>(); + + result.add("description"); + result.add("display-name"); + result.add("from-action"); + result.add("icon"); + result.add("from-outcome"); + result.add("redirect"); + result.add("to-view-id"); + result.add("XSL processing instruction - XSL processing instruction"); + result.add("comment - xml comment"); + result.add("user : User"); + return result; + } + +} \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/FacesConfigCodeCompletionTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ReflectionsHelper.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ReflectionsHelper.java 2011-06-15 09:41:53 UTC (rev 32118) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ReflectionsHelper.java 2011-06-15 11:54:53 UTC (rev 32119) @@ -12,6 +12,8 @@ package org.jboss.tools.ui.bot.ext.helper; import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import org.apache.log4j.Logger; /** @@ -35,5 +37,73 @@ return null; } } + /** + * Invoke method methodName of class clazz on instance and return return value + * @param <T> + * @param clazz + * @param methodName + * @param instance + * @param resultClazz + * @return + * @throws SecurityException + * @throws NoSuchMethodException + * @throws IllegalArgumentException + * @throws IllegalAccessException + * @throws InvocationTargetException + */ + @SuppressWarnings("unchecked") + public static <T> T retrieveMethodReturnValue(Class<?> clazz, + String methodName, Object instance, Class<T> resultClazz) + throws SecurityException, NoSuchMethodException, + IllegalArgumentException, IllegalAccessException, + InvocationTargetException { + + Method[] methods = clazz.getDeclaredMethods(); + boolean notFound = true; + int index = 0; + while (notFound && methods.length > index) { + if (methods[index].getName().equals(methodName)) { + notFound = false; + } else { + index++; + } + } + + if (!notFound) { + methods[index].setAccessible(true); + Object value = methods[index].invoke(instance); + if (value != null) { + return (T) value; + } else { + return null; + } + + } else { + throw new NoSuchMethodException(methodName); + } + } + /** + * Returns true if class clazz implements method methodName + * @param clazz + * @param methodName + * @return + */ + public static boolean isClassImplementingMethod(Class<?> clazz, + String methodName) { + + Method[] methods = clazz.getDeclaredMethods(); + boolean notFound = true; + int index = 0; + while (notFound && methods.length > index) { + if (methods[index].getName().equals(methodName)) { + notFound = false; + } else { + index++; + } + } + + return !notFound; + + } } Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ContentAssistBot.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ContentAssistBot.java 2011-06-15 09:41:53 UTC (rev 32118) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ContentAssistBot.java 2011-06-15 11:54:53 UTC (rev 32119) @@ -5,6 +5,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; @@ -18,10 +19,13 @@ import org.eclipse.swtbot.swt.finder.results.VoidResult; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; +import org.eclipse.ui.IEditorPart; import org.eclipse.ui.editors.text.TextEditor; import org.eclipse.ui.forms.editor.FormEditor; +import org.eclipse.ui.part.MultiPageEditorPart; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.swtbot.swt.finder.results.Result; +import org.jboss.tools.ui.bot.ext.helper.ReflectionsHelper; /** * This provides working Content assist functionality. @@ -130,6 +134,55 @@ }); } + /* More accurate check here will be + (oEditor instanceof org.jboss.tools.common.model.ui.editor.EditorPartWrapper) + but using Reflections dependency on org.jboss.tools.common.model.ui.editor is omitted + */ + else if (ReflectionsHelper.isClassImplementingMethod(oEditor.getClass(), "getEditor")){ + final IEditorPart innerEditor; + try { + innerEditor = (IEditorPart)ReflectionsHelper.retrieveMethodReturnValue( + oEditor.getClass(), + "getEditor", + oEditor, + IEditorPart.class); + if (innerEditor instanceof MultiPageEditorPart){ + textEditor = syncExec(new Result<ITextEditor>() { + public ITextEditor run() { + ITextEditor result = null; + try { + result = (ITextEditor)ReflectionsHelper.retrieveMethodReturnValue(MultiPageEditorPart.class, + "getActiveEditor", + innerEditor, + IEditorPart.class); + } catch (SecurityException e) { + e.printStackTrace(); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (NoSuchMethodException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + } + return result; + } + }); + } + + } catch (SecurityException e1) { + e1.printStackTrace(); + } catch (IllegalArgumentException e1) { + e1.printStackTrace(); + } catch (NoSuchMethodException e1) { + e1.printStackTrace(); + } catch (IllegalAccessException e1) { + e1.printStackTrace(); + } catch (InvocationTargetException e1) { + e1.printStackTrace(); + } + } else{ textEditor = (ITextEditor)oEditor; }

14 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r32118 - in trunk/as: plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2011-06-15 05:41:53 -0400 (Wed, 15 Jun 2011) New Revision: 32118 Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTestDynUtil.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListener.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListenerManager.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/wtp/ProjectCreationUtil.java Log: /JBIDE-9133 - test to trunk Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListener.java 2011-06-15 09:36:33 UTC (rev 32117) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListener.java 2011-06-15 09:41:53 UTC (rev 32118) @@ -31,4 +31,9 @@ public void publishStarted(IServer server){} public void publishFinished(IServer server, IStatus status){} public void cleanUp(IServer server) {} + public boolean canHandleServer(IServer server) { + if (!UnitedServerListenerManager.isJBossServer(server)) + return false; + return true; + } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListenerManager.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListenerManager.java 2011-06-15 09:36:33 UTC (rev 32117) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListenerManager.java 2011-06-15 09:41:53 UTC (rev 32118) @@ -48,18 +48,16 @@ ServerCore.addServerLifecycleListener(this); IServer[] allServers = ServerCore.getServers(); for( int i = 0; i < allServers.length; i++ ) { - if (isJBossServer(allServers[i])) { - allServers[i].addServerListener(this); - allServers[i].addPublishListener(this); - } + allServers[i].addServerListener(this); + allServers[i].addPublishListener(this); } } + public synchronized UnitedServerListener[] getListeners() { return (UnitedServerListener[]) list.toArray(new UnitedServerListener[list.size()]); } - - private boolean isJBossServer(IServer server) { + public static boolean isJBossServer(IServer server) { if (server == null) { return false; } @@ -97,65 +95,53 @@ } public void serverAdded(IServer server) { - if (!isJBossServer(server)) { - return; - } server.addServerListener(this); server.addPublishListener(this); UnitedServerListener[] listeners = getListeners(); for( int i = 0; i < listeners.length; i++) { - listeners[i].serverAdded(server); + if( listeners[i].canHandleServer(server)) + listeners[i].serverAdded(server); } } public void serverChanged(IServer server) { - if (!isJBossServer(server)) { - return; - } UnitedServerListener[] listeners = getListeners(); for( int i = 0; i < listeners.length; i++) { - listeners[i].serverChanged(server); + if( listeners[i].canHandleServer(server)) + listeners[i].serverChanged(server); } } public void serverRemoved(IServer server) { - if (!isJBossServer(server)) { - return; - } server.removeServerListener(this); server.removePublishListener(this); UnitedServerListener[] listeners = getListeners(); for( int i = 0; i < listeners.length; i++) { - listeners[i].serverRemoved(server); + if( listeners[i].canHandleServer(server)) + listeners[i].serverRemoved(server); } } public void serverChanged(ServerEvent event) { IServer server = event.getServer(); - if (!isJBossServer(server)) { - return; - } UnitedServerListener[] listeners = getListeners(); for( int i = 0; i < listeners.length; i++) { - listeners[i].serverChanged(event); + if( listeners[i].canHandleServer(server)) + listeners[i].serverChanged(event); } } public void publishStarted(IServer server) { - if (!isJBossServer(server)) { - return; - } UnitedServerListener[] listeners = getListeners(); for( int i = 0; i < listeners.length; i++) { - listeners[i].publishStarted(server); + if( listeners[i].canHandleServer(server)) + listeners[i].publishStarted(server); } } public void publishFinished(IServer server, IStatus status) { - if (!isJBossServer(server)) { - return; - } UnitedServerListener[] listeners = getListeners(); for( int i = 0; i < listeners.length; i++) { - listeners[i].publishFinished(server, status); + if( listeners[i].canHandleServer(server)) + listeners[i].publishFinished(server, status); } } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2011-06-15 09:36:33 UTC (rev 32117) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2011-06-15 09:41:53 UTC (rev 32118) @@ -15,6 +15,7 @@ import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.server.UnitedServerListener; +import org.jboss.ide.eclipse.as.core.server.UnitedServerListenerManager; import org.jboss.ide.eclipse.as.core.util.FileUtil; import org.jboss.ide.eclipse.as.core.util.ServerUtil; @@ -26,6 +27,10 @@ return instance; } + public boolean canHandleServer(IServer server) { + return true; + } + public void serverAdded(IServer server) { ServerUtil.createStandardFolders(server); } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2011-06-15 09:36:33 UTC (rev 32117) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2011-06-15 09:41:53 UTC (rev 32118) @@ -35,6 +35,7 @@ import org.jboss.ide.eclipse.as.test.publishing.v2.JSTDeployBinaryChildModuleTest; import org.jboss.ide.eclipse.as.test.publishing.v2.JSTDeploymentTester; import org.jboss.ide.eclipse.as.test.publishing.v2.JSTDeploymentWarUpdateXML; +import org.jboss.ide.eclipse.as.test.publishing.v2.MockJSTPublisherTestDynUtil; import org.jboss.ide.eclipse.as.test.publishing.v2.SingleFileDeployableMockDeploymentTester; import org.jboss.ide.eclipse.as.test.publishing.v2.MockJSTPublisherTest; import org.jboss.ide.eclipse.as.test.publishing.v2.SingleFileDeploymentTester; @@ -50,6 +51,7 @@ suite.addTestSuite(JSTDeploymentWarUpdateXML.class); suite.addTestSuite(SingleFileDeployableMockDeploymentTester.class); suite.addTestSuite(MockJSTPublisherTest.class); + suite.addTestSuite(MockJSTPublisherTestDynUtil.class); suite.addTestSuite(JBIDE1657Test.class); suite.addTestSuite(JBIDE2512aTest.class); suite.addTestSuite(JBIDE2512bTest.class); Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java 2011-06-15 09:36:33 UTC (rev 32117) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java 2011-06-15 09:41:53 UTC (rev 32118) @@ -3,6 +3,7 @@ import java.io.IOException; import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.wst.server.core.IModule; @@ -11,20 +12,30 @@ import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils; public class MockJSTPublisherTest extends AbstractJSTDeploymentTester { - public void testNormalLogic() throws CoreException, IOException { + public void setUp() throws Exception { + } + + protected IProject createProject() throws Exception { + return createEARProject(); + } + + public void testNormalLogic() throws CoreException, IOException, Exception { + server = ServerRuntimeUtils.createMockDeployOnlyServer(); server = ServerRuntimeUtils.useMockPublishMethod(server); + project = createProject(); MockPublishMethod.reset(); theTest(false); } - public void testForced7Logic() throws CoreException, IOException { + public void testForced7Logic() throws CoreException, IOException, Exception { server = ServerRuntimeUtils.createMockJBoss7Server(); server = ServerRuntimeUtils.useMockPublishMethod(server); + project = createProject(); MockPublishMethod.reset(); theTest(true); } - private void theTest(boolean isAs7) throws CoreException, IOException { + protected void theTest(boolean isAs7) throws CoreException, IOException { IModule mod = ServerUtil.getModule(project); server = ServerRuntimeUtils.addModule(server, mod); @@ -85,15 +96,15 @@ new String[] { "newModule.ear.deployed", "newModule.ear.failed" }); } - private void assertRemoved(boolean isAs7, String[] nonAs7, String[] as7) { + protected void assertRemoved(boolean isAs7, String[] nonAs7, String[] as7) { assertExpectedArtifacts(isAs7, nonAs7, as7, MockPublishMethod.getRemoved()); } - private void assertChanged(boolean isAs7, String[] nonAs7, String[] as7) { + protected void assertChanged(boolean isAs7, String[] nonAs7, String[] as7) { assertExpectedArtifacts(isAs7, nonAs7, as7, MockPublishMethod.getChanged()); } - private void assertExpectedArtifacts(boolean isAs7, String[] nonAs7, String[] as7, IPath[] artifacts) { + protected void assertExpectedArtifacts(boolean isAs7, String[] nonAs7, String[] as7, IPath[] artifacts) { if (isAs7) { assertEquals(as7.length, artifacts.length); } else { @@ -117,7 +128,7 @@ } } - private boolean contains(String expectedPath, IPath[] paths) { + protected boolean contains(String expectedPath, IPath[] paths) { for (IPath path : paths) { if (expectedPath.equals(path.toString())) { return true; Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTestDynUtil.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTestDynUtil.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTestDynUtil.java 2011-06-15 09:41:53 UTC (rev 32118) @@ -0,0 +1,105 @@ +package org.jboss.ide.eclipse.as.test.publishing.v2; + +import java.io.IOException; +import java.util.Arrays; + +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IWorkspaceRunnable; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.datamodel.properties.IAddReferenceDataModelProperties; +import org.eclipse.wst.common.componentcore.internal.operation.AddReferenceDataModelProvider; +import org.eclipse.wst.common.componentcore.internal.resources.VirtualReference; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.componentcore.resources.IVirtualReference; +import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider; +import org.eclipse.wst.server.core.IModule; +import org.eclipse.wst.server.core.ServerUtil; +import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils; +import org.jboss.ide.eclipse.as.test.util.wtp.JavaEEFacetConstants; +import org.jboss.ide.eclipse.as.test.util.wtp.OperationTestCase; +import org.jboss.ide.eclipse.as.test.util.wtp.ProjectCreationUtil; + +public class MockJSTPublisherTestDynUtil extends MockJSTPublisherTest { + protected IProject createProject() throws Exception { + IDataModel dm = ProjectCreationUtil.getWebDataModel(MODULE_NAME, null, null, CONTENT_DIR, null, JavaEEFacetConstants.WEB_25, false); + OperationTestCase.runAndVerify(dm); + IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(MODULE_NAME); + System.out.println(p.getLocation().toOSString()); + + IDataModel dm2 = ProjectCreationUtil.getUtilityProjectCreationDataModel("util", null); + OperationTestCase.runAndVerify(dm2); + IProject p2 = ResourcesPlugin.getWorkspace().getRoot().getProject("util"); + System.out.println(p2.getLocation().toOSString()); + + final IVirtualComponent webComponent = ComponentCore.createComponent(p); + + final IVirtualReference ref = new VirtualReference(webComponent, + ComponentCore.createComponent(p2, false)); + ref.setArchiveName("util.jar"); + ref.setRuntimePath(new Path("WEB-INF").append("lib").makeAbsolute()); + + IWorkspaceRunnable runnable = new IWorkspaceRunnable(){ + public void run(IProgressMonitor monitor) throws CoreException{ + addOneReference(webComponent, ref); + } + }; + try { + ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor()); + } catch( CoreException e ) { + throw e; + } + + return p; + } + + protected void addOneReference(IVirtualComponent parent, IVirtualReference ref) throws CoreException { + String path, archiveName; + + IDataModelProvider provider = new AddReferenceDataModelProvider(); + IDataModel dm = DataModelFactory.createDataModel(provider); + dm.setProperty(IAddReferenceDataModelProperties.SOURCE_COMPONENT, parent); + dm.setProperty(IAddReferenceDataModelProperties.TARGET_REFERENCE_LIST, Arrays.asList(ref)); + + IStatus stat = dm.validateProperty(IAddReferenceDataModelProperties.TARGET_REFERENCE_LIST); + if (!stat.isOK()) + throw new CoreException(stat); + try { + IStatus s = dm.getDefaultOperation().execute(new NullProgressMonitor(), null); + if (!stat.isOK()) + throw new CoreException(stat); + } catch(Exception e) { + fail(); + } + } + + + protected void theTest(boolean isAs7) throws CoreException, IOException { + + IModule mod = ServerUtil.getModule(project); + server = ServerRuntimeUtils.addModule(server, mod); + ServerRuntimeUtils.publish(server); + String[] nonAS7 = new String[]{ + "newModule.war", "newModule.war/META-INF", "newModule.war/META-INF/MANIFEST.MF", + "newModule.war/WEB-INF/classes", "newModule.war/WEB-INF/lib", "newModule.war/WEB-INF/web.xml", + "newModule.war/WEB-INF/lib/util.jar" + }; + + String[] as7 = new String[]{ + "newModule.war", "newModule.war/META-INF", "newModule.war/META-INF/MANIFEST.MF", + "newModule.war/WEB-INF/classes", "newModule.war/WEB-INF/lib", "newModule.war/WEB-INF/web.xml", + "newModule.war/WEB-INF/lib/util.jar", "newModule.war.dodeploy" + }; + + assertChanged( isAs7, nonAS7, as7 ); + MockPublishMethod.reset(); + } +} Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/wtp/ProjectCreationUtil.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/wtp/ProjectCreationUtil.java 2011-06-15 09:36:33 UTC (rev 32117) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/wtp/ProjectCreationUtil.java 2011-06-15 09:41:53 UTC (rev 32118) @@ -19,6 +19,8 @@ import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties; import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetProjectCreationDataModelProperties; import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties; +import org.eclipse.jst.j2ee.project.facet.IJavaUtilityProjectCreationDataModelProperties; +import org.eclipse.jst.j2ee.project.facet.JavaUtilityProjectCreationDataModelProvider; import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties; import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetInstallDataModelProperties; @@ -56,6 +58,27 @@ public static final String CONNECTOR_PROJ_15 = "myConnector_15"; /** + * Creates and returns a utility project DM provider with the given name and of the given version. + * If earName is not null then util project will be added to the EAR with earName + * + * @param projName name of the project to create + * @param earName name of the ear to add the project too, if NULL then don't add to an EAR + * @param version version of Application Client to use + * @return a Utility Project Data Model with the appropriate properties set + */ + public static IDataModel getUtilityProjectCreationDataModel(String projName, String earName){ + IDataModel dm = DataModelFactory.createDataModel(new JavaUtilityProjectCreationDataModelProvider()); + dm.setProperty(IJavaUtilityProjectCreationDataModelProperties.PROJECT_NAME, projName); + dm.setProperty(IJavaUtilityProjectCreationDataModelProperties.SOURCE_FOLDER, "src"); + if(earName != null) { + dm.setProperty(IJavaUtilityProjectCreationDataModelProperties.EAR_PROJECT_NAME, earName); + } + return dm; + } + + + + /** * Creates and returns an Connector Data Model with the given name and of the given version. * If earName is not null then Connector will be added to the EAR with earName. * Can also specify none default source folder

14 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r32117 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-06-15 05:36:33 -0400 (Wed, 15 Jun 2011) New Revision: 32117 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java Log: [JBIDE-9054] corrected warnings by removing reference to deprecated constants class Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-06-15 08:36:32 UTC (rev 32116) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-06-15 09:36:33 UTC (rev 32117) @@ -22,7 +22,6 @@ import org.eclipse.wst.server.core.ServerCore; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.Messages; -import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; @@ -112,8 +111,8 @@ // create temp deploy folder JBossServer ds = ( JBossServer)server.loadAdapter(JBossServer.class, null); if( ds != null && !isJBoss7(server)) { - File d1 = new File(location, IJBossServerConstants.DEPLOY); - File d2 = new File(location, IJBossServerConstants.TEMP_DEPLOY); + File d1 = new File(location, IJBossRuntimeResourceConstants.DEPLOY); + File d2 = new File(location, IJBossToolingConstants.TEMP_DEPLOY); d1.mkdirs(); d2.mkdirs(); if( !new File(ds.getDeployFolder()).equals(d1)) @@ -124,9 +123,9 @@ IJBossServerRuntime jbsrt = (IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor()); if( jbsrt != null ) { String config = jbsrt.getJBossConfiguration(); - IPath newTemp = new Path(IJBossServerConstants.SERVER).append(config) - .append(IJBossServerConstants.TMP) - .append(IJBossServerConstants.JBOSSTOOLS_TMP).makeRelative(); + IPath newTemp = new Path(IJBossRuntimeResourceConstants.SERVER).append(config) + .append(IJBossToolingConstants.TMP) + .append(IJBossToolingConstants.JBOSSTOOLS_TMP).makeRelative(); IPath newTempAsGlobal = ServerUtil.makeGlobal(jbsrt, newTemp); newTempAsGlobal.toFile().mkdirs(); }

14 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r32116 - in trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7: src/org/jboss/ide/eclipse/as/management/as7 and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-06-15 04:36:32 -0400 (Wed, 15 Jun 2011) New Revision: 32116 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/Activator.java Log: [JBIDE-9141] remove reference to UI Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-06-15 06:56:40 UTC (rev 32115) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-06-15 08:36:32 UTC (rev 32116) @@ -4,8 +4,7 @@ Bundle-SymbolicName: org.jboss.ide.eclipse.as.management.as7 Bundle-Version: 0.2.0.qualifier Bundle-Activator: org.jboss.ide.eclipse.as.management.as7.Activator -Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", - org.eclipse.core.runtime;bundle-version="3.7.0", +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.jboss.ide.eclipse.as.core Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/Activator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/Activator.java 2011-06-15 06:56:40 UTC (rev 32115) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/Activator.java 2011-06-15 08:36:32 UTC (rev 32116) @@ -1,12 +1,12 @@ package org.jboss.ide.eclipse.as.management.as7; -import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.eclipse.core.runtime.Plugin; import org.osgi.framework.BundleContext; /** * The activator class controls the plug-in life cycle */ -public class Activator extends AbstractUIPlugin { +public class Activator extends Plugin { // The plug-in ID public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.management.as7"; //$NON-NLS-1$

14 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r32115 - branches/jbosstools-3.2.x/build/results.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-06-15 02:56:40 -0400 (Wed, 15 Jun 2011) New Revision: 32115 Modified: branches/jbosstools-3.2.x/build/results/build.xml Log: backport changes to results/build.xml from trunk Modified: branches/jbosstools-3.2.x/build/results/build.xml =================================================================== --- branches/jbosstools-3.2.x/build/results/build.xml 2011-06-15 06:56:27 UTC (rev 32114) +++ branches/jbosstools-3.2.x/build/results/build.xml 2011-06-15 06:56:40 UTC (rev 32115) @@ -1,4 +1,4 @@ -<project default="buildResults.aggregate"> +<project default="buildResults.single">  <property name="ZIPSUFFIX" value="SNAPSHOT" /> @@ -101,10 +101,22 @@  + <target name="buildResults.single" depends="init" description="generate buildResults.html from build properties"> + <ant target="collect.zips" antfile="../aggregate/site/build.xml"> + <property name="inputRepos" value="2" /> + <property name="inputRepo1" value="file://${input.dir}/all/repo/" /> + <property name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/${JOB_NAME}/all/repo/" /> + </ant> + <ant target="collect.metadata" antfile="../aggregate/site/build.xml"> + </ant> + <antcall target="buildResults" /> + </target> + <target name="buildResults.aggregate" depends="init" description="generate buildResults.html from build properties"> <ant target="collect.zips" antfile="../aggregate/site/build.xml"> - <property name="inputRepos" value="1" /> - <property name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stabl..." /> + <property name="inputRepos" value="2" /> + <property name="inputRepo1" value="file://${input.dir}/all/repo/" /> + <property name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stabl..." /> </ant> <ant target="collect.metadata" antfile="../aggregate/site/build.xml"> </ant> @@ -134,22 +146,37 @@ </target> <target name="buildResults" description="generate buildResults.html from build properties" depends="init"> - <for param="propertiesFile" delimiter=", " list="zips/build.properties.all.xml, ../../logs/zips/build.properties.all.xml"> + <var name="propertiesFileFound" unset="true" /> + <for param="propertiesFile" delimiter=", " list="${output.dir}/zips/build.properties.all.xml, zips/build.properties.all.xml, ../../logs/zips/build.properties.all.xml"> <sequential> <if> - <available file="@{propertiesFile}" type="file"/> + <and> + <available file="@{propertiesFile}" type="file" /> + <not> + <isset property="propertiesFileFound" /> + </not> + </and> <then> - <delete quiet="true" file="buildResults.out.html" /> - <xslt in="@{propertiesFile}" out="buildResults.out.html" style="buildResults.xsl" force="true"> + <var name="propertiesFileFound" value="true" /> + <delete quiet="true" file="buildResults.html" /> + <xslt in="@{propertiesFile}" out="buildResults.html" style="buildResults.xsl" force="true"> <classpath location="${COMMON_TOOLS}/saxon.jar" /> </xslt> </then> <else> - <echo>Could not generate buildResults.out.html from zips/build.properties.all.xml - file does not exist!</echo> </else> </if> </sequential> </for> + <if> + <not> + <isset property="propertiesFileFound" /> + </not> + <then> + <echo>Could not generate buildResults.html from zips/build.properties.all.xml - file does not exist!</echo> + </then> + </if> + <var name="propertiesFileFound" unset="true" /> </target> </project>

14 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r32114 - branches/jbosstools-3.2.x/build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-06-15 02:56:27 -0400 (Wed, 15 Jun 2011) New Revision: 32114 Modified: branches/jbosstools-3.2.x/build/publish.sh Log: backport changes to publish.sh from trunk Modified: branches/jbosstools-3.2.x/build/publish.sh =================================================================== --- branches/jbosstools-3.2.x/build/publish.sh 2011-06-15 06:44:07 UTC (rev 32113) +++ branches/jbosstools-3.2.x/build/publish.sh 2011-06-15 06:56:27 UTC (rev 32114) @@ -8,6 +8,9 @@ # where to create the stuff to publish STAGINGDIR=${WORKSPACE}/results/${JOB_NAME} +# for trunk, use "trunk" or "trunk/soa" instead of generated path from job name +PUBLISHPATHSUFFIX=""; if [[ $1 ]]; then PUBLISHPATHSUFFIX="$1"; fi + # https://jira.jboss.org/browse/JBIDE-6956 "jbosstools-3.2.0.M2" is too verbose, use "3.2.0.M2" instead JOBNAMEREDUX=${JOB_NAME/.aggregate}; JOBNAMEREDUX=${JOBNAMEREDUX/jbosstools-} @@ -216,7 +219,8 @@ RESULTS_DIR=${buildxml/\/build.xml/} fi done -if [[ ${ANT_SCRIPT} ]] && [[ -f ${ANT_SCRIPT} ]]; then ant -f ${ANT_SCRIPT} ${ANT_PARAMS}; fi +ANT_TARGET="buildResults.single"; if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then ANT_TARGET="buildResults.aggregate"; fi +if [[ ${ANT_SCRIPT} ]] && [[ -f ${ANT_SCRIPT} ]]; then ant -f ${ANT_SCRIPT} ${ANT_TARGET} ${ANT_PARAMS}; fi # copy buildResults.css, buildResults.html to ${STAGINGDIR}/logs if [[ ${RESULTS_DIR} ]] && [[ -d ${RESULTS_DIR} ]]; then @@ -261,9 +265,9 @@ # if an aggregate build, put output elsewhere on disk if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > /tmp/latestBuild.html - if [[ $1 == "trunk" ]]; then - date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/trunk/${BUILD_ID}-H${BUILD_NUMBER}/ - date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/trunk/ + if [[ ${PUBLISHPATHSUFFIX} ]]; then + date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/ + date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/ else date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/ date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/ @@ -286,8 +290,8 @@ # extra publish step for aggregate update sites ONLY if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then - if [[ $1 == "trunk" ]]; then - date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/trunk/ + if [[ ${PUBLISHPATHSUFFIX} ]]; then + date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${PUBLISHPATHSUFFIX}/ else date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${JOBNAMEREDUX}/ fi

14 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r32113 - in trunk/as: tests and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-06-15 02:44:07 -0400 (Wed, 15 Jun 2011) New Revision: 32113 Modified: trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml trunk/as/tests/pom.xml Log: add org.jboss.ide.eclipse.as.management.as7.tests back into tests/pom.xml and test.feature Modified: trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml =================================================================== --- trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml 2011-06-15 06:15:04 UTC (rev 32112) +++ trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml 2011-06-15 06:44:07 UTC (rev 32113) @@ -52,11 +52,11 @@ version="0.0.0" unpack="false"/> -  + unpack="false"/> </feature> Modified: trunk/as/tests/pom.xml =================================================================== --- trunk/as/tests/pom.xml 2011-06-15 06:15:04 UTC (rev 32112) +++ trunk/as/tests/pom.xml 2011-06-15 06:44:07 UTC (rev 32113) @@ -15,7 +15,7 @@ <module>org.jboss.ide.eclipse.as.archives.integration.test</module> <module>org.jboss.ide.eclipse.as.test</module> <module>org.jboss.ide.eclipse.as.ui.test</module> -  + <module>org.jboss.ide.eclipse.as.management.as7.tests</module> </modules> </project>

14 years, 10 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits June 2011