JBoss Tools SVN: r34035 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test: editor and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-08-18 04:57:41 -0400 (Thu, 18 Aug 2011)
New Revision: 34035
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/hyperlinks/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/hyperlinks/CDIHyperlinksTest.java
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/fix/
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java
Log:
Hyperlinks test added and quickfix new test addition
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-08-18 07:57:07 UTC (rev 34034)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-08-18 08:57:41 UTC (rev 34035)
@@ -11,7 +11,8 @@
package org.jboss.tools.cdi.bot.test;
import org.jboss.tools.cdi.bot.test.editor.BeansEditorTest;
-import org.jboss.tools.cdi.bot.test.fix.CDIQuickFixTest;
+import org.jboss.tools.cdi.bot.test.hyperlinks.CDIHyperlinksTest;
+import org.jboss.tools.cdi.bot.test.quickfix.CDIQuickFixTest;
import org.jboss.tools.cdi.bot.test.wizard.CdiATWizardTest;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
@@ -33,16 +34,17 @@
* JAVA=1.6,/space/java/sdk/jdk1.6.0_22
*
*
- * Suite duration: aprox. 3min
+ * Suite duration: aprox. 4min
*
* @author Lukas Jungmann
* @author Jaroslav Jankovic
*/
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({
- CdiATWizardTest.class,
+ //CdiATWizardTest.class,
+ //BeansEditorTest.class,
CDIQuickFixTest.class,
- BeansEditorTest.class
+ CDIHyperlinksTest.class
})
public class CDIAllBotTests {
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java 2011-08-18 07:57:07 UTC (rev 34034)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java 2011-08-18 08:57:41 UTC (rev 34035)
@@ -36,6 +36,7 @@
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.jboss.tools.ui.bot.ext.view.ProjectExplorer;
+import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -71,6 +72,11 @@
new ProjectExplorer().openFile(project, descPath.split("/"));
}
+ @After
+ public void waitForJobs() {
+ util.waitForNonIgnoredJobs();
+ }
+
@Test
public void testInterceptors() {
addItem(Item.INTERCEPTOR, "cdi.I1");
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/hyperlinks/CDIHyperlinksTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/hyperlinks/CDIHyperlinksTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/hyperlinks/CDIHyperlinksTest.java 2011-08-18 08:57:41 UTC (rev 34035)
@@ -0,0 +1,67 @@
+package org.jboss.tools.cdi.bot.test.hyperlinks;
+
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
+import org.jboss.tools.cdi.bot.test.uiutils.actions.CDIUtil;
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.types.ViewType;
+import org.jboss.tools.ui.bot.ext.view.ProblemsView;
+import org.junit.After;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+/*
+ * Test operates on hyperlinks-openons
+ *
+ * @author Jaroslav Jankovic
+ */
+
+@Require(perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">="))
+(a)RunWith(RequirementAwareSuite.class)
+@SuiteClasses({ CDIAllBotTests.class })
+public class CDIHyperlinksTest extends SWTTestExt {
+
+ //private static final Logger LOGGER = Logger.getLogger(CDIQuickFixTest.class.getName());
+ private static final String PROJECT_NAME = "CDIProject";
+ private static final String PACKAGE_NAME = "org.cdi.test";
+
+
+ @BeforeClass
+ public static void setup() {
+ eclipse.showView(ViewType.PROJECT_EXPLORER);
+ CDIUtil.createAndCheckCDIProject(bot, util, projectExplorer, PROJECT_NAME);
+ }
+
+ @After
+ public void waitForJobs() {
+ util.waitForNonIgnoredJobs();
+ }
+
+ @Test
+ public void testInjectHyperlink() {
+ CDIUtil.bean(PACKAGE_NAME, "Animal", true, false, false, false, null,
+ null, null, null).finish();
+ util.waitForNonIgnoredJobs();
+
+ CDIUtil.bean(PACKAGE_NAME, "BrokenFarm", true, false, false, false, null,
+ null, null, null).finish();
+ util.waitForNonIgnoredJobs();
+ SWTBotEditor ed = bot.activeEditor();
+ CDIUtil.copyResourceToClass(ed, CDIHyperlinksTest.class
+ .getResourceAsStream("/resources/cdi/BrokenFarm.java.cdi"), false);
+ SWTBotTreeItem warningNode = ProblemsView.getWarningsNode(bot);
+ assertNull("Warnings node should be empty.", warningNode);
+ /*
+ * TODO - hyperlink on @Inject should redirect to correct class
+ */
+
+ }
+
+}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java 2011-08-18 07:57:07 UTC (rev 34034)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java 2011-08-18 08:57:41 UTC (rev 34035)
@@ -12,14 +12,32 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.cdi.bot.test.uiutils.wizards.CDIWizard;
import org.jboss.tools.cdi.bot.test.uiutils.wizards.CDIWizardType;
+import org.jboss.tools.cdi.bot.test.uiutils.wizards.DynamicWebProjectWizard;
import org.jboss.tools.ui.bot.ext.SWTBotExt;
import org.jboss.tools.ui.bot.ext.SWTUtilExt;
import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
+import org.jboss.tools.ui.bot.ext.view.ProjectExplorer;
public class CDIUtil {
+
+ public static void createAndCheckCDIProject(SWTBotExt bot, SWTUtilExt util, ProjectExplorer projectExplorer, String projectName) {
+ createCDIProject(util, projectName);
+ projectExplorer.selectProject(projectName);
+ SWTBotTree tree = projectExplorer.bot().tree();
+ SWTBotTreeItem item = tree.getTreeItem(projectName);
+ item.expand();
+ CDIUtil.addCDISupport(tree, item, bot, util);
+ }
+ public static void createCDIProject(SWTUtilExt util, String projectName) {
+ new NewFileWizardAction().run()
+ .selectTemplate("Web", "Dynamic Web Project").next();
+ new DynamicWebProjectWizard().setProjectName(projectName).finish();
+ util.waitForNonIgnoredJobs();
+ }
+
public static void addCDISupport(final SWTBotTree tree, SWTBotTreeItem item, SWTBotExt bot, SWTUtilExt util) {
nodeContextMenu(tree, item,
"Configure","Add CDI (Context and Dependency Injection) support...").click();
@@ -28,8 +46,12 @@
util.waitForNonIgnoredJobs();
}
- public static void resolveQuickFix(final SWTBotTree tree, SWTBotTreeItem item, SWTBotExt bot, SWTUtilExt util) {
+ public static void openQuickFix(SWTBotTreeItem item, SWTBotExt bot, SWTUtilExt util) {
nodeContextMenu(bot.tree(), item, "Quick Fix").click();
+ }
+
+ public static void resolveQuickFix(SWTBotTreeItem item, SWTBotExt bot, SWTUtilExt util) {
+ openQuickFix(item, bot, util);
bot.activeShell().bot().button("Finish").click();
bot.sleep(Timing.time2S());
util.waitForNonIgnoredJobs();
14 years, 8 months
JBoss Tools SVN: r34034 - trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-18 03:57:07 -0400 (Thu, 18 Aug 2011)
New Revision: 34034
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTFlatProjectModuleFactory.java
Log:
https://issues.jboss.org/browse/JBIDE-9016 - Handling of code review
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTFlatProjectModuleFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTFlatProjectModuleFactory.java 2011-08-18 04:08:06 UTC (rev 34033)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTFlatProjectModuleFactory.java 2011-08-18 07:57:07 UTC (rev 34034)
@@ -97,25 +97,15 @@
}
protected IModule[] createModuleDelegates(IVirtualComponent component) {
- if(component == null)
- return null;
-
- List<IModule> projectModules = new ArrayList<IModule>();
- try {
- if (canHandleProject(component.getProject())) {
- String type = getModuleType(component.getProject());
- String version = getModuleVersion(component.getProject());
- IModule module = createModule(component.getName(), component.getName(), type, version, component.getProject());
- FlatComponentDeployable moduleDelegate = createModuleDelegate(component.getProject(), component);
- moduleDelegates.put(module, moduleDelegate);
- projectModules.add(module);
- } else {
- return new IModule[]{};
- }
- } catch (Exception e) {
- J2EEPlugin.logError(e);
+ if(component != null && canHandleProject(component.getProject())) {
+ String type = getModuleType(component.getProject());
+ String version = getModuleVersion(component.getProject());
+ IModule module = createModule(component.getName(), component.getName(), type, version, component.getProject());
+ FlatComponentDeployable moduleDelegate = createModuleDelegate(component.getProject(), component);
+ moduleDelegates.put(module, moduleDelegate);
+ return new IModule[]{module};
}
- return projectModules.toArray(new IModule[projectModules.size()]);
+ return null;
}
14 years, 8 months
JBoss Tools SVN: r34033 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-18 00:08:06 -0400 (Thu, 18 Aug 2011)
New Revision: 34033
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/ui/StrippedServerWizardFragment.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/ServerSourcePathComputerDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/JBossSARModuleFactory.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-9016 - Handling of code review
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2011-08-18 01:52:19 UTC (rev 34032)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2011-08-18 04:08:06 UTC (rev 34033)
@@ -81,7 +81,7 @@
public static String CouldNotFindServer;
public static String ServerRuntimeNotFound;
public static String ServerRuntimeConfigNotFound;
- public static String ServerHasNoRuntime;
+ public static String ServerHasNoRuntimeVM;
public static String ServerNotFound;
public static String CannotLoadServerPoller;
public static String AddingJMXDeploymentFailed;
@@ -95,6 +95,8 @@
public static String ErrorDisposingLocalJBoss7BehaviorDelegate;
public static String JBoss7ServerState_noEnumForString;
+ public static String ServerStatePollerUnexpectedError;
+ public static String ServerArgsParseError;
static {
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-08-18 01:52:19 UTC (rev 34032)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-08-18 04:08:06 UTC (rev 34033)
@@ -61,7 +61,7 @@
CouldNotFindServer=Could not find jboss server with id {0}
ServerRuntimeNotFound=Runtime for server {0} cannot be found.
ServerRuntimeConfigNotFound=Configuration for runtime {0} is not set.
-ServerHasNoRuntime=Server {0} does not have a valid runtime environment
+ServerHasNoRuntimeVM=Server {0} does not have a valid Virtual Machine.
ServerNotFound=Server {0} not found.
CannotLoadServerPoller=Error instantiating Server Poller {0}
CannotSaveServersStartArgs=Could not save server start arguments for server {0}.
@@ -73,3 +73,5 @@
ExtensionManager_could_not_load_publishers=Could not load publishers
ErrorDisposingLocalJBoss7BehaviorDelegate=Could not dispose LocalJBoss7BehaviorDelegate
JBoss7ServerState_noEnumForString="No JBoss7ServerState enum for string {0}"
+ServerStatePollerUnexpectedError=The server state poller had an unexpected error.
+ServerArgsParseError=Error parsing server arguments: {0}
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2011-08-18 01:52:19 UTC (rev 34032)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2011-08-18 04:08:06 UTC (rev 34033)
@@ -1,7 +1,9 @@
package org.jboss.ide.eclipse.as.core.extensions.polling;
import java.io.FileNotFoundException;
+import java.io.IOException;
import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
import java.util.ArrayList;
@@ -80,8 +82,14 @@
return true;
} catch( FileNotFoundException fnfe ) {
return true;
- } catch( Exception e) {
- }
+ } catch (MalformedURLException e) {
+ // Should NEVER happen since hte URL's are hand-crafted, but whatever
+ Status s = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, e.getMessage(), e);
+ JBossServerCorePlugin.getDefault().log(s);
+ } catch (IOException e) {
+ // Does not need to be logged
+ return false;
+ }
return false;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java 2011-08-18 01:52:19 UTC (rev 34032)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java 2011-08-18 04:08:06 UTC (rev 34033)
@@ -21,6 +21,7 @@
import org.eclipse.wst.server.core.model.IModuleResource;
import org.eclipse.wst.server.core.util.ModuleFile;
import org.eclipse.wst.server.core.util.ModuleFolder;
+import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
public class ResourceModuleResourceUtil {
public static IModuleResource createResource(IResource resource) {
@@ -48,12 +49,22 @@
return folder;
}
+
+ /**
+ * Get a list of module resources in this container.
+ * If the container is closed or does not exist, return an empty array.
+ *
+ * @param parent The container to be searched
+ * @param forcedParentPath The parent's module-relative path
+ * @return A list of module resources
+ */
public static IModuleResource[] createChildrenResources(IContainer parent, IPath forcedParentPath) {
ArrayList<IModuleResource> modChildren = new ArrayList<IModuleResource>();
IResource[] children = new IResource[]{};
try {
children = parent.members();
} catch(CoreException ce) {
+ JBossServerCorePlugin.log(ce.getStatus());
}
for( int i = 0; i < children.length; i++ ) {
modChildren.add(createResource(children[i], forcedParentPath));
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-08-18 01:52:19 UTC (rev 34032)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-08-18 04:08:06 UTC (rev 34033)
@@ -36,6 +36,7 @@
import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.LocalStopLaunchConfigurator;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
@@ -316,14 +317,13 @@
public IStatus canChangeState(String launchMode) {
try {
- if( getServer() != null
- && getServer().getRuntime() != null
- && RuntimeUtils.checkedGetJBossServerRuntime(getServer()).getVM() != null )
+ IJBossServerRuntime rt = RuntimeUtils.checkedGetJBossServerRuntime(getServer());
+ if( rt != null && rt.getVM() != null )
return Status.OK_STATUS;
} catch(CoreException e) {
return e.getStatus();
}
return new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
- MessageFormat.format(Messages.ServerHasNoRuntime, getServer().getName()));
+ MessageFormat.format(Messages.ServerHasNoRuntimeVM, getServer().getName()));
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-08-18 01:52:19 UTC (rev 34032)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-08-18 04:08:06 UTC (rev 34033)
@@ -148,8 +148,10 @@
}
stateStartedOrStopped = checkServerState();
}
- } catch(PollingException e) {
+ } catch(Exception e) {
abort = true;
+ Status s = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, Messages.ServerStatePollerUnexpectedError, e);
+ ServerLogger.getDefault().log(server, s);
}
// we stopped. Did we abort?
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java 2011-08-18 01:52:19 UTC (rev 34032)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java 2011-08-18 04:08:06 UTC (rev 34033)
@@ -97,11 +97,11 @@
return Status.OK_STATUS;
}
- private static IModuleFile createBlankModule() {
+ private static IModuleFile createBlankModule() throws CoreException {
return new ModuleFile(getOrCreateBlankFile(), "", new Path("/")); //$NON-NLS-1$ //$NON-NLS-2$
}
- private static File getOrCreateBlankFile() {
+ private static File getOrCreateBlankFile() throws CoreException {
IPath p = JBossServerCorePlugin.getDefault().getStateLocation().append("BLANK_FILE"); //$NON-NLS-1$
if (!p.toFile().exists()) {
try {
@@ -110,7 +110,7 @@
out.close();
}
} catch (IOException ioe) {
- // TODO: implement error handling
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, ioe.getMessage(), ioe));
}
}
return p.toFile();
@@ -172,8 +172,10 @@
IProgressMonitor monitor) throws CoreException {
try {
return removeFile(DEPLOYED, server, depPath, method, monitor);
- } catch (Exception e) {
- return Status.OK_STATUS;
+ } catch (CoreException e) {
+ // Not a critical error that should abort the publish.
+ // Simply return the status object
+ return e.getStatus();
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/ServerSourcePathComputerDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/ServerSourcePathComputerDelegate.java 2011-08-18 01:52:19 UTC (rev 34032)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/ServerSourcePathComputerDelegate.java 2011-08-18 04:08:06 UTC (rev 34033)
@@ -27,6 +27,7 @@
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerUtil;
+import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
/**
* SourcePathComputer for the GenericLaunchConfiguration.
*
@@ -94,8 +95,8 @@
javaProjectList.add(javaProject);
}
}
- } catch (Exception e) {
- // ignore
+ } catch (CoreException e) {
+ JBossServerCorePlugin.log(e.getStatus());
}
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java 2011-08-18 01:52:19 UTC (rev 34032)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java 2011-08-18 04:08:06 UTC (rev 34033)
@@ -14,6 +14,12 @@
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
+import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.Messages;
+
public class ArgsUtil {
public static final Integer NO_VALUE = new Integer(-1);
@@ -99,6 +105,9 @@
}
return retVal;
} catch( Exception e ) {
+ Status status = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ NLS.bind(Messages.ServerArgsParseError, s), e);
+ JBossServerCorePlugin.log(status);
return new String[] { };
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-08-18 01:52:19 UTC (rev 34032)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-08-18 04:08:06 UTC (rev 34033)
@@ -425,7 +425,7 @@
</decorator>
</extension>
- <!-- JMX Stuff -->
+ <!-- JMX Stuff
<extension
point="org.jboss.tools.jmx.ui.providerUI">
<providerUI
@@ -433,7 +433,7 @@
id="org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider"
name="JBoss Server">
</providerUI>
- </extension>
+ </extension>-->
<extension
point="org.eclipse.debug.ui.launchConfigurationTypeImages">
<launchConfigurationTypeImage
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/JBossSARModuleFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/JBossSARModuleFactory.java 2011-08-18 01:52:19 UTC (rev 34032)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/JBossSARModuleFactory.java 2011-08-18 04:08:06 UTC (rev 34033)
@@ -51,6 +51,13 @@
return true;
}
} catch (CoreException e) {
+ /*
+ * Ignore. No matter what problem occurs here,
+ * if the project is closed, inaccessible, is not
+ * a faceted project, etc, it is not an error. The
+ * project simply cannot be handled by this factory.
+ */
+
}
return false;
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/ui/StrippedServerWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/ui/StrippedServerWizardFragment.java 2011-08-18 01:52:19 UTC (rev 34032)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/ui/StrippedServerWizardFragment.java 2011-08-18 04:08:06 UTC (rev 34033)
@@ -1,293 +0,0 @@
-/**
- * JBoss by Red Hat
- * Copyright 2006-2009, Red Hat Middleware, LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ide.eclipse.as.ui.mbeans.project.ui;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.TaskModel;
-import org.eclipse.wst.server.ui.wizard.IWizardHandle;
-import org.eclipse.wst.server.ui.wizard.WizardFragment;
-import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
-import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer;
-import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
-import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
-import org.jboss.ide.eclipse.as.ui.Messages;
-
-/**
- *
- * @author Rob Stryker <rob.stryker(a)redhat.com>
- *
- */
-public class StrippedServerWizardFragment extends WizardFragment {
-
- private IWizardHandle handle;
-
- private Label deployLabel, tmpDeployLabel, nameLabel;
- private Text deployText, tmpDeployText, nameText;
- private Button browse, tmpBrowse;
- private String name, deployLoc, tmpDeployLoc;
-
- public StrippedServerWizardFragment() {
- }
-
- public Composite createComposite(Composite parent, IWizardHandle handle) {
- this.handle = handle;
- Composite main = new Composite(parent, SWT.NONE);
- main.setLayout(new FormLayout());
-
- nameLabel = new Label(main, SWT.NONE);
- nameText = new Text(main, SWT.BORDER);
- nameLabel.setText(Messages.serverName);
-
- deployLabel = new Label(main, SWT.NONE);
- deployText = new Text(main, SWT.BORDER);
- browse = new Button(main, SWT.PUSH);
- deployLabel.setText(Messages.swf_DeployDirectory);
- browse.setText(Messages.browse);
-
- tmpDeployLabel = new Label(main, SWT.NONE);
- tmpDeployText = new Text(main, SWT.BORDER);
- tmpBrowse = new Button(main, SWT.PUSH);
- tmpDeployLabel.setText(Messages.swf_TempDeployDirectory);
- tmpBrowse.setText(Messages.browse);
-
- FormData namelData = new FormData();
- namelData.top = new FormAttachment(0, 5);
- namelData.left = new FormAttachment(0, 5);
- nameLabel.setLayoutData(namelData);
-
- FormData nametData = new FormData();
- nametData.top = new FormAttachment(0, 5);
- nametData.left = new FormAttachment(deployLabel, 5);
- nametData.right = new FormAttachment(100, -5);
- nameText.setLayoutData(nametData);
-
- FormData lData = new FormData();
- lData.top = new FormAttachment(nameText, 5);
- lData.left = new FormAttachment(0, 5);
- deployLabel.setLayoutData(lData);
-
- FormData tData = new FormData();
- tData.top = new FormAttachment(nameText, 5);
- tData.left = new FormAttachment(deployLabel, 5);
- tData.right = new FormAttachment(browse, -5);
- deployText.setLayoutData(tData);
-
- FormData bData = new FormData();
- bData.right = new FormAttachment(100, -5);
- bData.top = new FormAttachment(nameText, 5);
- browse.setLayoutData(bData);
-
- lData = new FormData();
- lData.top = new FormAttachment(deployText, 5);
- lData.left = new FormAttachment(0, 5);
- tmpDeployLabel.setLayoutData(lData);
-
- tData = new FormData();
- tData.top = new FormAttachment(deployText, 5);
- tData.left = new FormAttachment(tmpDeployLabel, 5);
- tData.right = new FormAttachment(tmpBrowse, -5);
- tmpDeployText.setLayoutData(tData);
-
- bData = new FormData();
- bData.right = new FormAttachment(100, -5);
- bData.top = new FormAttachment(deployText, 5);
- tmpBrowse.setLayoutData(bData);
-
-
- ModifyListener ml = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- textChanged();
- }
- };
-
- browse.addSelectionListener(new MySelectionListener(deployText));
- tmpBrowse.addSelectionListener(new MySelectionListener(tmpDeployText));
-
- tmpDeployText.addModifyListener(ml);
- deployText.addModifyListener(ml);
- nameText.addModifyListener(ml);
- nameText.setText(getDefaultNameText());
- handle.setImageDescriptor(JBossServerUISharedImages
- .getImageDescriptor(JBossServerUISharedImages.WIZBAN_JBOSS_LOGO));
- return main;
- }
-
- private class MySelectionListener implements SelectionListener {
- private Text text;
- public MySelectionListener(Text text) {
- this.text = text;
- }
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- DirectoryDialog d = new DirectoryDialog(new Shell());
- d.setFilterPath(text.getText());
- String x = d.open();
- if (x != null)
- text.setText(x);
- }
- }
-
- protected void textChanged() {
- IStatus status = checkErrors();
- if (status.isOK()) {
- deployLoc = deployText.getText();
- tmpDeployLoc = tmpDeployText.getText();
- name = nameText.getText();
- handle.setMessage("", IStatus.OK); //$NON-NLS-1$
- handle.update();
- } else {
- handle.setMessage(status.getMessage(), IStatus.WARNING);
- }
- }
-
- protected IStatus checkErrors() {
- if (findServer(nameText.getText()) != null) {
- return new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK,
- Messages.StrippedServerWizardFragment_NameInUseStatusMessage, null);
- }
- File f = new File(deployText.getText());
- if (!f.exists() || !f.isDirectory()) {
- return new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK,
- Messages.StrippedServerWizardFragment_DeployFolderDoesNotExistStatusMessage, null);
- }
- f = new File(tmpDeployText.getText());
- if (!f.exists() || !f.isDirectory()) {
- return new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK,
- Messages.StrippedServerWizardFragment_TemporaryDeployFolderDoesNotExistStatusMessage, null);
- }
-
- // Check if a renameTo on these folders will fail
- File tmp1, dep1;
- tmp1 = dep1 = null;
- boolean success = false;
- try {
- tmp1 = File.createTempFile(JBossServerUIPlugin.PLUGIN_ID, ".txt", new File(tmpDeployText.getText())); //$NON-NLS-1$
- dep1 = new Path(deployText.getText()).append(JBossServerUIPlugin.PLUGIN_ID + ".txt").toFile(); //$NON-NLS-1$
- success = tmp1.renameTo(dep1);
- } catch(IOException ioe) {
- } finally {
- if( tmp1 != null && tmp1.exists())
- tmp1.delete();
- if( dep1 != null && dep1.exists())
- dep1.delete();
- if( !success )
- return new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, 0,
- "Unable to rename files from your temporary folder to your deploy folder. Please verify both are on the same filesystem.", null); //$NON-NLS-1$
- }
-
-
- return new Status(IStatus.OK, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK, "", null); //$NON-NLS-1$
- }
-
- public void enter() {
- handle.setTitle(Messages.sswf_Title);
- IServer s = (IServer) getTaskModel().getObject(TaskModel.TASK_SERVER);
- IServerWorkingCopy swc;
- if (s instanceof IServerWorkingCopy)
- swc = (IServerWorkingCopy) s;
- else
- swc = s.createWorkingCopy();
-
- deployText.setText(swc.getAttribute(DeployableServer.DEPLOY_DIRECTORY, "")); //$NON-NLS-1$
- }
-
- public void exit() {
- textChanged();
- IServer s = (IServer) getTaskModel().getObject(TaskModel.TASK_SERVER);
- IServerWorkingCopy swc;
- if (s instanceof IServerWorkingCopy)
- swc = (IServerWorkingCopy) s;
- else
- swc = s.createWorkingCopy();
-
- swc.setName(name);
- swc.setAttribute(DeployableServer.DEPLOY_DIRECTORY, deployLoc);
- String tempFolder = JBossServerCorePlugin.getServerStateLocation(s)
- .append(IJBossServerConstants.TEMP_DEPLOY).makeAbsolute().toString();
- swc.setAttribute(DeployableServer.TEMP_DEPLOY_DIRECTORY, tempFolder);
- getTaskModel().putObject(TaskModel.TASK_SERVER, swc);
- }
-
- public void performFinish(IProgressMonitor monitor) throws CoreException {
- IServerWorkingCopy serverWC = (IServerWorkingCopy) getTaskModel().getObject(TaskModel.TASK_SERVER);
-
- try {
- serverWC.setServerConfiguration(null);
- serverWC.setName(name);
- serverWC.setAttribute(DeployableServer.DEPLOY_DIRECTORY, deployLoc);
- serverWC.setAttribute(DeployableServer.TEMP_DEPLOY_DIRECTORY, tmpDeployLoc);
- getTaskModel().putObject(TaskModel.TASK_SERVER, serverWC);
- } catch (Exception ce) {
- }
- }
-
- public boolean isComplete() {
- return checkErrors().isOK();
- }
-
- public boolean hasComposite() {
- return true;
- }
-
- private String getDefaultNameText() {
- Object o = getTaskModel().getObject(TaskModel.TASK_SERVER);
- return ((IServerWorkingCopy) o).getName();
- }
-
- private IServer findServer(String name) {
- IServer[] servers = ServerCore.getServers();
- for (int i = 0; i < servers.length; i++) {
- IServer server = servers[i];
- if (name.equals(server.getName()))
- return server;
- }
- return null;
- }
-
-}
14 years, 8 months
JBoss Tools SVN: r34032 - trunk/seam/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-17 21:52:19 -0400 (Wed, 17 Aug 2011)
New Revision: 34032
Modified:
trunk/seam/docs/reference/en-US/Book_Info.xml
trunk/seam/docs/reference/en-US/seam_faq.xml
Log:
updated for TOOLSDOC-93
Modified: trunk/seam/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/seam/docs/reference/en-US/Book_Info.xml 2011-08-18 01:51:29 UTC (rev 34031)
+++ trunk/seam/docs/reference/en-US/Book_Info.xml 2011-08-18 01:52:19 UTC (rev 34032)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
- <pubsnumber>2</pubsnumber>
+ <pubsnumber>3</pubsnumber>
<abstract>
<para>The Seam Developer Tools Reference Guide explains how to use the Seam Developer Tools module to create Seam projects for deployment.</para>
</abstract>
Modified: trunk/seam/docs/reference/en-US/seam_faq.xml
===================================================================
--- trunk/seam/docs/reference/en-US/seam_faq.xml 2011-08-18 01:51:29 UTC (rev 34031)
+++ trunk/seam/docs/reference/en-US/seam_faq.xml 2011-08-18 01:52:19 UTC (rev 34032)
@@ -38,6 +38,15 @@
<para>
As these seam examples are non WTP projects, next you should enable Seam support for them. To do that, right click the project and go to <menuchoice><guimenuitem>Properties</guimenuitem><guimenuitem>Seam Settings.</guimenuitem></menuchoice>
</para>
+ <important>
+ <para>
+ Projects are not directly deployable unless they are in the correct state, such as an archive created through <guilabel>Project Archives</guilabel>. As an alternative, working examples are provided for Seam by navigating to <menuchoice>
+ <guimenuitem>Help</guimenuitem>
+ <guimenuitem>Project Examples</guimenuitem>
+ <guimenuitem>Seam</guimenuitem>
+ </menuchoice>
+ </para>
+ </important>
</section>
<section id="seam_question_3">
14 years, 8 months
JBoss Tools SVN: r34031 - branches/jbosstools-3.2.x/seam/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-17 21:51:29 -0400 (Wed, 17 Aug 2011)
New Revision: 34031
Modified:
branches/jbosstools-3.2.x/seam/docs/reference/en-US/Book_Info.xml
branches/jbosstools-3.2.x/seam/docs/reference/en-US/seam_faq.xml
Log:
updated for TOOLSDOC-93
Modified: branches/jbosstools-3.2.x/seam/docs/reference/en-US/Book_Info.xml
===================================================================
--- branches/jbosstools-3.2.x/seam/docs/reference/en-US/Book_Info.xml 2011-08-18 01:08:05 UTC (rev 34030)
+++ branches/jbosstools-3.2.x/seam/docs/reference/en-US/Book_Info.xml 2011-08-18 01:51:29 UTC (rev 34031)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
- <pubsnumber>2</pubsnumber>
+ <pubsnumber>3</pubsnumber>
<abstract>
<para>The Seam Developer Tools Reference Guide explains how to use the Seam Developer Tools module to create Seam projects for deployment.</para>
</abstract>
Modified: branches/jbosstools-3.2.x/seam/docs/reference/en-US/seam_faq.xml
===================================================================
--- branches/jbosstools-3.2.x/seam/docs/reference/en-US/seam_faq.xml 2011-08-18 01:08:05 UTC (rev 34030)
+++ branches/jbosstools-3.2.x/seam/docs/reference/en-US/seam_faq.xml 2011-08-18 01:51:29 UTC (rev 34031)
@@ -38,6 +38,15 @@
<para>
As these seam examples are non WTP projects, next you should enable Seam support for them. To do that, right click the project and go to <menuchoice><guimenuitem>Properties</guimenuitem><guimenuitem>Seam Settings.</guimenuitem></menuchoice>
</para>
+ <important>
+ <para>
+ Projects are not directly deployable unless they are in the correct state, such as an archive created through <guilabel>Project Archives</guilabel>. As an alternative, working examples are provided for Seam by navigating to <menuchoice>
+ <guimenuitem>Help</guimenuitem>
+ <guimenuitem>Project Examples</guimenuitem>
+ <guimenuitem>Seam</guimenuitem>
+ </menuchoice>
+ </para>
+ </important>
</section>
<section id="seam_question_3">
14 years, 8 months
JBoss Tools SVN: r34030 - in trunk/ws/docs: soap_reference/en-US and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-17 21:08:05 -0400 (Wed, 17 Aug 2011)
New Revision: 34030
Modified:
trunk/ws/docs/reference/en-US/Book_Info.xml
trunk/ws/docs/reference/en-US/topdown.xml
trunk/ws/docs/soap_reference/en-US/topdown.xml
Log:
updated for TOOLSDOC-141
Modified: trunk/ws/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/ws/docs/reference/en-US/Book_Info.xml 2011-08-18 01:07:50 UTC (rev 34029)
+++ trunk/ws/docs/reference/en-US/Book_Info.xml 2011-08-18 01:08:05 UTC (rev 34030)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
- <pubsnumber>9</pubsnumber>
+ <pubsnumber>10</pubsnumber>
<abstract>
<para>The JBoss Web Services User Guide explains how to use the JBoss Web Services module to implement web services in Java.</para>
</abstract>
Modified: trunk/ws/docs/reference/en-US/topdown.xml
===================================================================
--- trunk/ws/docs/reference/en-US/topdown.xml 2011-08-18 01:07:50 UTC (rev 34029)
+++ trunk/ws/docs/reference/en-US/topdown.xml 2011-08-18 01:08:05 UTC (rev 34030)
@@ -58,7 +58,7 @@
<listitem>
<para>
- Configuration: You may <xref linkend="addfacet"/> by clicking the <property>Modify...</property> button. The opened page is like <property>Figure 2.4</property>.
+ Configuration: You may <xref linkend="addfacet"/> by clicking the <property>Modify...</property> button. The opened page is like <property>Figure 3.4</property>.
</para>
</listitem>
@@ -79,7 +79,7 @@
</itemizedlist>
<para>
- If you added the JBoss Web Service facet to the project, now the <property>Finish</property> button is unavailable. You must click <property>Next</property> button to set more information about the JBoss Web Service facet. The page is like <property>Figure 2.5</property>. Then click on the <property>Finish</property> button.
+ If you added the JBoss Web Service facet to the project, now the <property>Finish</property> button is unavailable. You must click <property>Next</property> button to set more information about the JBoss Web Service facet. The page is like <property>Figure 3.5</property>. Then click on the <property>Finish</property> button.
</para>
<para>
@@ -152,12 +152,12 @@
</para>
<para>
- At first, please make sure that you have already created a dynamic Web project with JBoss Web Service facet installed.
+ Make sure that you have already created a dynamic Web project with JBoss Web Service facet installed and set the necessary preferences through the <guilabel>Preference</guilabel> menu.
</para>
<para>
- See how to make it in the <xref linkend="createproject"/> section and in the <xref
- linkend="addfacet"/> section.
+ See how to make it in the <xref linkend="createproject"/>, <xref
+ linkend="addfacet"/> and <xref linkend="preference" /> sections.
</para>
<!--
<note>
@@ -392,12 +392,8 @@
</section>
<section id="bottomupws">
- <title>Creating a Web service from a Java bean using JBossWS runtime</title>
+ <title>Creating a Web service from a Java bean using JBossWS runtime</title>
<para>
- The Web Service wizard assists you in creating a new Web service, configuring it for deployment, and then deploying it to the server.
- </para>
-
- <para>
To create a Web service from a bean using JBoss WS:
</para>
Modified: trunk/ws/docs/soap_reference/en-US/topdown.xml
===================================================================
--- trunk/ws/docs/soap_reference/en-US/topdown.xml 2011-08-18 01:07:50 UTC (rev 34029)
+++ trunk/ws/docs/soap_reference/en-US/topdown.xml 2011-08-18 01:08:05 UTC (rev 34030)
@@ -58,7 +58,7 @@
<listitem>
<para>
- Configuration: You may <xref linkend="addfacet"/> by clicking the <property>Modify...</property> button. The opened page is like <property>Figure 2.4</property>.
+ Configuration: You may <xref linkend="addfacet"/> by clicking the <property>Modify...</property> button. The opened page is like <property>Figure 3.4</property>.
</para>
</listitem>
@@ -79,7 +79,7 @@
</itemizedlist>
<para>
- If you added the JBoss Web Service facet to the project, now the <property>Finish</property> button is unavailable. You must click <property>Next</property> button to set more information about the JBoss Web Service facet. The page is like <property>Figure 2.5</property>. Then click on the <property>Finish</property> button.
+ If you added the JBoss Web Service facet to the project, now the <property>Finish</property> button is unavailable. You must click <property>Next</property> button to set more information about the JBoss Web Service facet. The page is like <property>Figure 3.5</property>. Then click on the <property>Finish</property> button.
</para>
<para>
@@ -151,14 +151,14 @@
In this chapter we provide you with the necessary steps to create a Web Service from a WSDL document using JBossWS runtime.
</para>
- <para>
- At first, please make sure that you have already created a dynamic Web project with JBoss Web Service facet installed.
- </para>
+ <para>
+ Make sure that you have already created a dynamic Web project with JBoss Web Service facet installed and set the necessary preferences through the <guilabel>Preference</guilabel> menu.
+ </para>
- <para>
- See how to make it in the <xref linkend="createproject"/> section and in the <xref
- linkend="addfacet"/> section.
- </para>
+ <para>
+ See how to make it in the <xref linkend="createproject"/>, <xref
+ linkend="addfacet"/> and <xref linkend="preference" /> sections.
+ </para>
<!--
<note>
<para>
@@ -392,12 +392,8 @@
</section>
<section id="bottomupws">
- <title>Creating a Web service from a Java bean using JBossWS runtime</title>
+ <title>Creating a Web service from a Java bean using JBossWS runtime</title>
<para>
- The Web Service wizard assists you in creating a new Web service, configuring it for deployment, and then deploying it to the server.
- </para>
-
- <para>
To create a Web service from a bean using JBoss WS:
</para>
14 years, 8 months
JBoss Tools SVN: r34029 - branches/jbosstools-3.2.x/ws/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-17 21:07:50 -0400 (Wed, 17 Aug 2011)
New Revision: 34029
Modified:
branches/jbosstools-3.2.x/ws/docs/reference/en-US/Book_Info.xml
branches/jbosstools-3.2.x/ws/docs/reference/en-US/topdown.xml
Log:
updated for TOOLSDOC-141
Modified: branches/jbosstools-3.2.x/ws/docs/reference/en-US/Book_Info.xml
===================================================================
--- branches/jbosstools-3.2.x/ws/docs/reference/en-US/Book_Info.xml 2011-08-18 00:26:10 UTC (rev 34028)
+++ branches/jbosstools-3.2.x/ws/docs/reference/en-US/Book_Info.xml 2011-08-18 01:07:50 UTC (rev 34029)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
- <pubsnumber>9</pubsnumber>
+ <pubsnumber>10</pubsnumber>
<abstract>
<para>The JBoss Web Services User Guide explains how to use the JBoss Web Services module to implement web services in Java.</para>
</abstract>
Modified: branches/jbosstools-3.2.x/ws/docs/reference/en-US/topdown.xml
===================================================================
--- branches/jbosstools-3.2.x/ws/docs/reference/en-US/topdown.xml 2011-08-18 00:26:10 UTC (rev 34028)
+++ branches/jbosstools-3.2.x/ws/docs/reference/en-US/topdown.xml 2011-08-18 01:07:50 UTC (rev 34029)
@@ -58,7 +58,7 @@
<listitem>
<para>
- Configuration: You may <xref linkend="addfacet"/> by clicking the <property>Modify...</property> button. The opened page is like <property>Figure 2.4</property>.
+ Configuration: You may <xref linkend="addfacet"/> by clicking the <property>Modify...</property> button. The opened page is like <property>Figure 3.4</property>.
</para>
</listitem>
@@ -79,7 +79,7 @@
</itemizedlist>
<para>
- If you added the JBoss Web Service facet to the project, now the <property>Finish</property> button is unavailable. You must click <property>Next</property> button to set more information about the JBoss Web Service facet. The page is like <property>Figure 2.5</property>. Then click on the <property>Finish</property> button.
+ If you added the JBoss Web Service facet to the project, now the <property>Finish</property> button is unavailable. You must click <property>Next</property> button to set more information about the JBoss Web Service facet. The page is like <property>Figure 3.5</property>. Then click on the <property>Finish</property> button.
</para>
<para>
@@ -152,12 +152,12 @@
</para>
<para>
- At first, please make sure that you have already created a dynamic Web project with JBoss Web Service facet installed.
+ Make sure that you have already created a dynamic Web project with JBoss Web Service facet installed and set the necessary preferences through the <guilabel>Preference</guilabel> menu.
</para>
<para>
- See how to make it in the <xref linkend="createproject"/> section and in the <xref
- linkend="addfacet"/> section.
+ See how to make it in the <xref linkend="createproject"/>, <xref
+ linkend="addfacet"/> and <xref linkend="preference" /> sections.
</para>
<!--
<note>
@@ -392,12 +392,8 @@
</section>
<section id="bottomupws">
- <title>Creating a Web service from a Java bean using JBossWS runtime</title>
+ <title>Creating a Web service from a Java bean using JBossWS runtime</title>
<para>
- The Web Service wizard assists you in creating a new Web service, configuring it for deployment, and then deploying it to the server.
- </para>
-
- <para>
To create a Web service from a bean using JBoss WS:
</para>
14 years, 8 months
JBoss Tools SVN: r34028 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-17 20:26:10 -0400 (Wed, 17 Aug 2011)
New Revision: 34028
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java
Log:
JBIDE-6517
https://issues.jboss.org/browse/JBIDE-6517
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java 2011-08-17 23:54:09 UTC (rev 34027)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java 2011-08-18 00:26:10 UTC (rev 34028)
@@ -12,6 +12,7 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.Flags;
import org.eclipse.jdt.core.IAnnotation;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IField;
@@ -129,7 +130,7 @@
if(f != null && f.exists()) {
value = f.getDeclaringType().getFullyQualifiedName() + "." + lastToken;
} else {
- String v = getFullName(is, lastToken);
+ String v = getFullName(type, is, lastToken);
if(v != null) {
value = v;
}
@@ -153,12 +154,23 @@
return value;
}
- private String getFullName(IImportDeclaration[] is, String name) {
+ private String getFullName(IType type, IImportDeclaration[] is, String name) throws CoreException {
for (IImportDeclaration d: is) {
String n = d.getElementName();
if(n.equals(name) || n.endsWith("." + name)) {
return n;
}
+ if(Flags.isStatic(d.getFlags()) && n.endsWith(".*")) {
+ String typename = n.substring(0, n.length() - 2);
+ IType t = EclipseJavaUtil.findType(type.getJavaProject(), typename);
+ if(t != null && t.exists()) {
+ IField f = EclipseJavaUtil.findField(t, name);
+ if(f != null) {
+ return f.getDeclaringType().getFullyQualifiedName() + "." + name;
+ }
+ }
+
+ }
}
return null;
}
14 years, 8 months
JBoss Tools SVN: r34027 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-17 19:54:09 -0400 (Wed, 17 Aug 2011)
New Revision: 34027
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorBindingWizardPage.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewStereotypeWizardPage.java
Log:
JBIDE-6517
https://issues.jboss.org/browse/JBIDE-6517
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorBindingWizardPage.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorBindingWizardPage.java 2011-08-17 23:50:54 UTC (rev 34026)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorBindingWizardPage.java 2011-08-17 23:54:09 UTC (rev 34027)
@@ -29,6 +29,7 @@
import org.jboss.tools.cdi.core.ICDIAnnotation;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IInterceptorBinding;
+import org.jboss.tools.cdi.internal.core.validation.AnnotationValidationDelegate;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
import org.jboss.tools.common.java.IAnnotationDeclaration;
@@ -158,7 +159,7 @@
targetStatus = new StatusInfo();
if(interceptorBindings != null && target != null) {
String value = (String)target.getValue();
- boolean hasMethodOrField = value != null && (value.indexOf("METHOD") >= 0 || value.indexOf("FIELD") >= 0);
+ boolean hasMethodOrField = value != null && (value.indexOf(AnnotationValidationDelegate.TARGET_METHOD) >= 0 || value.indexOf(AnnotationValidationDelegate.TARGET_FIELD) >= 0);
List list = (List)interceptorBindings.getValue();
for (Object o: list) {
if(o instanceof IInterceptorBinding) {
@@ -166,7 +167,7 @@
IAnnotationDeclaration target = a.getAnnotationDeclaration(CDIConstants.TARGET_ANNOTATION_TYPE_NAME);
if(target != null) {
Set<String> targets = CDIUtil.getTargetAnnotationValues(target);
- if(targets != null && targets.size() == 1 && targets.contains("TYPE") && hasMethodOrField) {
+ if(targets != null && targets.size() == 1 && targets.contains(AnnotationValidationDelegate.TARGET_TYPE) && hasMethodOrField) {
String message = NLS.bind(CDIUIMessages.MESSAGE_INTERCEPTOR_BINDING_IS_NOT_COMPATIBLE, a.getSourceType().getElementName());
// String message = a.getSourceType().getElementName() + " annotated with @Target({TYPE}) is not compatible with target";
targetStatus.setWarning(message);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewStereotypeWizardPage.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewStereotypeWizardPage.java 2011-08-17 23:50:54 UTC (rev 34026)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewStereotypeWizardPage.java 2011-08-17 23:54:09 UTC (rev 34027)
@@ -204,7 +204,7 @@
public void propertyChange(PropertyChangeEvent evt) {
Object o = evt.getNewValue();
if(o instanceof List && !((List)o).isEmpty()) {
- target.setValue("TYPE");
+ target.setValue(AnnotationValidationDelegate.TARGET_TYPE);
target.setEnabled(false);
} else {
target.setEnabled(true);
@@ -320,7 +320,7 @@
targetStatus = new StatusInfo();
if(stereotypes != null && target != null) {
String value = (String)target.getValue();
- boolean hasMethodOrField = value != null && (value.indexOf("METHOD") >= 0 || value.indexOf("FIELD") >= 0);
+ boolean hasMethodOrField = value != null && (value.indexOf(AnnotationValidationDelegate.TARGET_METHOD) >= 0 || value.indexOf(AnnotationValidationDelegate.TARGET_FIELD) >= 0);
List list = (List)stereotypes.getValue();
for (Object o: list) {
if(o instanceof IStereotype) {
@@ -328,12 +328,12 @@
IAnnotationDeclaration target = a.getAnnotationDeclaration(CDIConstants.TARGET_ANNOTATION_TYPE_NAME);
if(target != null) {
Set<String> targets = CDIUtil.getTargetAnnotationValues(target);
- if(targets != null && targets.size() == 1 && targets.contains("TYPE") && hasMethodOrField) {
+ if(targets != null && targets.size() == 1 && targets.contains(AnnotationValidationDelegate.TARGET_TYPE) && hasMethodOrField) {
String message = NLS.bind(CDIUIMessages.MESSAGE_STEREOTYPE_IS_NOT_COMPATIBLE, a.getSourceType().getElementName());
// String message = a.getSourceType().getElementName() + " annotated with @Target({TYPE}) is not compatible with target";
targetStatus.setWarning(message);
}
- if(targets != null && !targets.contains("TYPE")) {
+ if(targets != null && !targets.contains(AnnotationValidationDelegate.TARGET_TYPE)) {
String message = NLS.bind(CDIUIMessages.MESSAGE_STEREOTYPE_CANNOT_BE_APPLIED_TO_TYPE, a.getSourceType().getElementName());
targetStatus.setError(message);
return;
14 years, 8 months
JBoss Tools SVN: r34026 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-17 19:50:54 -0400 (Wed, 17 Aug 2011)
New Revision: 34026
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierWithMembersTest.java
Log:
JBIDE-6517
https://issues.jboss.org/browse/JBIDE-6517
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierWithMembersTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierWithMembersTest.java 2011-08-17 23:50:26 UTC (rev 34025)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierWithMembersTest.java 2011-08-17 23:50:54 UTC (rev 34026)
@@ -116,7 +116,7 @@
*
* @throws CoreException
*/
- public void _testQualifierCoincidingSimpleNameInInjectingBeanAndCoincidingSimpleNameInInjectedBeanResolved() throws CoreException {
+ public void testQualifierCoincidingSimpleNameInInjectingBeanAndCoincidingSimpleNameInInjectedBeanResolved() throws CoreException {
IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/coincidence/ObtainsInstanceBean.java", "cashPaymentProcessor");
Set<IBean> beans = cdiProject.getBeans(true, injection);
assertEquals("Wrong number of the beans", 1, beans.size());
14 years, 8 months