JBoss Tools SVN: r41335 - trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-05-24 03:32:26 -0400 (Thu, 24 May 2012)
New Revision: 41335
Added:
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/DeletingArchiveTest.java
Log:
DeletingArchiveTest implemented
Added: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/DeletingArchiveTest.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/DeletingArchiveTest.java (rev 0)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/DeletingArchiveTest.java 2012-05-24 07:32:26 UTC (rev 41335)
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.archives.ui.bot.test;
+
+import org.jboss.tools.archives.ui.bot.test.explorer.ProjectArchivesExplorer;
+import org.jboss.tools.archives.ui.bot.test.view.ProjectArchivesView;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ *
+ * @author jjankovi
+ *
+ */
+public class DeletingArchiveTest extends ArchivesTestBase {
+
+ private static String project = "pr3";
+ private String pathToArchive1 = project + "a.jar [/" + project + "]";
+ private String pathToArchive2 = project + "b.jar [/" + project + "]";
+
+ @BeforeClass
+ public static void setup() {
+ importProjectWithoutRuntime(project);
+ }
+
+ @Test
+ public void testDeletingArchivetWithView() {
+ ProjectArchivesView view = viewForProject(project);
+ view.deleteArchive(project, pathToArchive1);
+ assertFalse(view.itemExists(project, pathToArchive1));
+ }
+
+ @Test
+ public void testDeletingArchiveWithExplorer() {
+ ProjectArchivesExplorer explorer = explorerForProject(project);
+ explorer.deleteArchive(pathToArchive2);
+ assertFalse(explorer.itemExists(pathToArchive1));
+ }
+
+}
13 years, 10 months
JBoss Tools SVN: r41334 - trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-05-24 03:31:51 -0400 (Thu, 24 May 2012)
New Revision: 41334
Modified:
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesTestBase.java
Log:
methods for creating jar archive moved to archive test base
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesTestBase.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesTestBase.java 2012-05-24 07:30:21 UTC (rev 41333)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesTestBase.java 2012-05-24 07:31:51 UTC (rev 41334)
@@ -10,11 +10,11 @@
******************************************************************************/
package org.jboss.tools.archives.ui.bot.test;
+import org.jboss.tools.archives.ui.bot.test.explorer.ProjectArchivesExplorer;
+import org.jboss.tools.archives.ui.bot.test.view.ProjectArchivesView;
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.helper.ImportHelper;
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
@@ -24,13 +24,24 @@
* @author jjankovi
*
*/
-@Require(clearProjects = true, perspective = "Java",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java")
+// server = @Server(state = ServerState.NotRunning,
+// version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ ArchivesAllBotTests.class })
public class ArchivesTestBase extends SWTTestExt {
+ protected ProjectArchivesView viewForProject(String projectName) {
+ ProjectArchivesView view = new ProjectArchivesView();
+ view.show();
+ projectExplorer.selectProject(projectName);
+ return view;
+ }
+
+ protected ProjectArchivesExplorer explorerForProject(String projectName) {
+ return new ProjectArchivesExplorer(projectName);
+ }
+
protected static void importProject(String projectName) {
String location = "/resources/prj/" + projectName;
13 years, 10 months
JBoss Tools SVN: r41333 - in trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj: pr3 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-05-24 03:30:21 -0400 (Thu, 24 May 2012)
New Revision: 41333
Added:
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/.classpath
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/.packages
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/.project
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/bin/
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/pr3a.jar
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/pr3b.jar
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/src/
Log:
new resource project for archive bot tests
Added: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/.classpath
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/.classpath (rev 0)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/.classpath 2012-05-24 07:30:21 UTC (rev 41333)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/.packages
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/.packages (rev 0)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/.packages 2012-05-24 07:30:21 UTC (rev 41333)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<packages version="1.3">
+ <package name="pr3a.jar" type="jar" todir="/pr3" exploded="false" inWorkspace="true">
+ <properties>
+ <property name="org.jboss.ide.eclipse.as.core.packages.ModuleIDPropertyKey" value="1337838280901"></property>
+ </properties>
+ </package>
+ <package name="pr3b.jar" type="jar" todir="/pr3" exploded="false" inWorkspace="true">
+ <properties>
+ <property name="org.jboss.ide.eclipse.as.core.packages.ModuleIDPropertyKey" value="1337838285723"></property>
+ </properties>
+ </package>
+ <properties></properties>
+</packages>
\ No newline at end of file
Added: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/.project
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/.project (rev 0)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/.project 2012-05-24 07:30:21 UTC (rev 41333)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>pr3</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.ide.eclipse.archives.core.archivesBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.jboss.ide.eclipse.archives.core.archivesNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/pr3a.jar
===================================================================
(Binary files differ)
Property changes on: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/pr3a.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/pr3b.jar
===================================================================
(Binary files differ)
Property changes on: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/resources/prj/pr3/pr3b.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
13 years, 10 months
JBoss Tools SVN: r41332 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-05-24 03:28:08 -0400 (Thu, 24 May 2012)
New Revision: 41332
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
Log:
JBIDE-11847
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-05-24 07:20:24 UTC (rev 41331)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-05-24 07:28:08 UTC (rev 41332)
@@ -266,7 +266,7 @@
deployLocationLabel.setText("Deploy Project: " );
if( showImportLink ) {
- importLink = new Link(composite, SWT.DEFAULT);
+ importLink = new Link(composite, SWT.None);
importLink.setText("<a>Import this application</a>"); //$NON-NLS-1$
// if we show verify, start import link disabled (wait for verify pressed to enable)
// Otherwise, not showing verify means we're inside new wizard fragment with no suitable projects
13 years, 10 months
JBoss Tools SVN: r41331 - trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-05-24 03:20:24 -0400 (Thu, 24 May 2012)
New Revision: 41331
Modified:
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java
Log:
Run all tests.
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java 2012-05-24 07:12:41 UTC (rev 41330)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java 2012-05-24 07:20:24 UTC (rev 41331)
@@ -2,6 +2,34 @@
import org.jboss.tools.runtime.as.ui.bot.test.detector.RuntimeDuplications;
import org.jboss.tools.runtime.as.ui.bot.test.detector.ServerWithSeam;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.seam.seam22.CheckSeam22;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.seam.seam22.DetectSeam22;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.seam.seam23.CheckSeam23;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.seam.seam23.DetectSeam23;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap4.CheckEAP4Seam;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap4.DetectEAP4;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap4.OperateEAP4;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap5.CheckEAP5Seam;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap5.DetectEAP5;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap5.OperateEAP5;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap6.DetectEAP6;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap6.OperateEAP6;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp4.CheckEPP4Seam;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp4.DetectEPP4;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp4.OperateEPP4;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp5.CheckEPP5Seam;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp5.DetectEPP5;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp5.OperateEPP5;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.ewp5.CheckEWP5Seam;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.ewp5.DetectEWP5;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.ewp5.OperateEWP5;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.jboss7.DetectJBoss7;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.jboss7.OperateJBoss7;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.soap5.CheckSOAP5Seam;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.soap5.DetectSOAP5;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.soap5.OperateSOAP5;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.soap5.standalone.DetectSOAPStandalone5;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.soap5.standalone.OperateSOAPStandalone5;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -9,35 +37,35 @@
@RunWith(RequirementAwareSuite.class)
@Suite.SuiteClasses({
RuntimeDuplications.class,
- ServerWithSeam.class
-// DetectJBoss7.class,
-// OperateJBoss7.class,
-// DetectEAP6.class,
-// OperateEAP6.class,
-// DetectEAP5.class,
-// CheckEAP5Seam.class,
-// OperateEAP5.class,
-// DetectEAP4.class,
-// CheckEAP4Seam.class,
-// OperateEAP4.class,
-// DetectEPP4.class,
-// CheckEPP4Seam.class,
-// OperateEPP4.class,
-// DetectEPP5.class,
-// CheckEPP5Seam.class,
-// OperateEPP5.class,
-// DetectEWP5.class,
-// CheckEWP5Seam.class,
-// OperateEWP5.class,
-// DetectSOAP5.class,
-// CheckSOAP5Seam.class,
-// OperateSOAP5.class,
-// DetectSOAPStandalone5.class,
-// OperateSOAPStandalone5.class,
-// DetectSeam22.class,
-// CheckSeam22.class,
-// DetectSeam23.class,
-// CheckSeam23.class
+ ServerWithSeam.class,
+ DetectJBoss7.class,
+ OperateJBoss7.class,
+ DetectEAP6.class,
+ OperateEAP6.class,
+ DetectEAP5.class,
+ CheckEAP5Seam.class,
+ OperateEAP5.class,
+ DetectEAP4.class,
+ CheckEAP4Seam.class,
+ OperateEAP4.class,
+ DetectEPP4.class,
+ CheckEPP4Seam.class,
+ OperateEPP4.class,
+ DetectEPP5.class,
+ CheckEPP5Seam.class,
+ OperateEPP5.class,
+ DetectEWP5.class,
+ CheckEWP5Seam.class,
+ OperateEWP5.class,
+ DetectSOAP5.class,
+ CheckSOAP5Seam.class,
+ OperateSOAP5.class,
+ DetectSOAPStandalone5.class,
+ OperateSOAPStandalone5.class,
+ DetectSeam22.class,
+ CheckSeam22.class,
+ DetectSeam23.class,
+ CheckSeam23.class
})
public class AllTestsSuite {
13 years, 10 months
JBoss Tools SVN: r41330 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-05-24 03:12:41 -0400 (Thu, 24 May 2012)
New Revision: 41330
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/JBASConsoleWriter.java
Log:
JBIDE-11977
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/JBASConsoleWriter.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/JBASConsoleWriter.java 2012-05-24 06:55:22 UTC (rev 41329)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/JBASConsoleWriter.java 2012-05-24 07:12:41 UTC (rev 41330)
@@ -25,7 +25,7 @@
out.println(lines[i]);
}
- private MessageConsole findConsole(String name) {
+ private synchronized MessageConsole findConsole(String name) {
ConsolePlugin plugin = ConsolePlugin.getDefault();
IConsoleManager conMan = plugin.getConsoleManager();
IConsole[] existing = conMan.getConsoles();
13 years, 10 months
JBoss Tools SVN: r41329 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7 and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-05-24 02:55:22 -0400 (Thu, 24 May 2012)
New Revision: 41329
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS7ExtendedProperties.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossExtendedProperties.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7LaunchConfigProperties.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartConfigurator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeConstants.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchCommandPreferences.java
trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
Log:
JBIDE-11921
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS7ExtendedProperties.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS7ExtendedProperties.java 2012-05-24 05:17:48 UTC (rev 41328)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS7ExtendedProperties.java 2012-05-24 06:55:22 UTC (rev 41329)
@@ -37,6 +37,9 @@
return IJBossRuntimeResourceConstants.AS7_MODULES + "/org"; //$NON-NLS-1$
}
+ public boolean runtimeSupportsExposingManagement() {
+ return true;
+ }
public int getJMXProviderType() {
return JMX_DEFAULT_PROVIDER;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossExtendedProperties.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossExtendedProperties.java 2012-05-24 05:17:48 UTC (rev 41328)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossExtendedProperties.java 2012-05-24 06:55:22 UTC (rev 41329)
@@ -57,7 +57,11 @@
public boolean runtimeSupportsBindingToAllInterfaces() {
return true;
}
-
+
+ public boolean runtimeSupportsExposingManagement() {
+ return false;
+ }
+
protected ServerBeanLoader getServerBeanLoader() {
return runtime == null ? null : new ServerBeanLoader(runtime.getLocation().toFile());
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7LaunchConfigProperties.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7LaunchConfigProperties.java 2012-05-24 05:17:48 UTC (rev 41328)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7LaunchConfigProperties.java 2012-05-24 06:55:22 UTC (rev 41329)
@@ -11,11 +11,7 @@
package org.jboss.ide.eclipse.as.core.server.internal.v7;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType;
import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader;
@@ -105,4 +101,13 @@
}
}
+ public void setExposedManagement(String host, ILaunchConfigurationWorkingCopy launchConfig) throws CoreException {
+ String vmArguments = getVMArguments(launchConfig);
+ String arguments = ArgsUtil.setArg(vmArguments,
+ null,
+ IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.JB7_EXPOSE_MANAGEMENT,
+ host);
+ setVmArguments(arguments, launchConfig);
+ }
+
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartConfigurator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartConfigurator.java 2012-05-24 05:17:48 UTC (rev 41328)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartConfigurator.java 2012-05-24 06:55:22 UTC (rev 41329)
@@ -56,6 +56,7 @@
getProperties().setJreContainer(getJreContainerPath(jbossRuntime), launchConfig);
getProperties().setEndorsedDir(getEndorsedDir(jbossRuntime), launchConfig);
getProperties().setJavaLibPath(getJavaLibraryPath(jbossRuntime), launchConfig);
+ getProperties().setExposedManagement(getExposedManagement(jbossServer), launchConfig);
getProperties().setWorkingDirectory(getWorkingDirectory(jbossServer, jbossRuntime), launchConfig);
getProperties().setClasspathProvider(getClasspathProvider(), launchConfig);
getProperties().setClasspath(getClasspath(jbossServer, jbossRuntime, getProperties().getClasspath(launchConfig)), launchConfig);
@@ -106,6 +107,12 @@
return server.getHost();
}
+ protected String getExposedManagement(JBossServer server) {
+ if( LaunchCommandPreferences.exposesManagement(server.getServer()))
+ return server.getHost();
+ return null;
+ }
+
@Override
protected String getDefaultProgramArguments(JBossServer server, IJBossServerRuntime runtime) {
return runtime.getDefaultRunArgs();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeConstants.java 2012-05-24 05:17:48 UTC (rev 41328)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeConstants.java 2012-05-24 06:55:22 UTC (rev 41329)
@@ -58,7 +58,9 @@
public static final String JB7_STANDALONE_ARG = "org.jboss.as.standalone"; //$NON-NLS-1$
public static final String JB7_BOOT_LOG_ARG = "org.jboss.boot.log.file"; //$NON-NLS-1$
public static final String JB7_LOGGING_CONFIG_FILE = "logging.configuration"; //$NON-NLS-1$
+ public static final String JB7_EXPOSE_MANAGEMENT = "jboss.bind.address.management"; //$NON-NLS-1$
+
/* JBoss classes and methods for reflection */
public static final String TWIDDLE_MAIN_TYPE = "org.jboss.console.twiddle.Twiddle"; //$NON-NLS-1$
public static final String SHUTDOWN_MAIN_TYPE = "org.jboss.Shutdown"; //$NON-NLS-1$
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2012-05-24 05:17:48 UTC (rev 41328)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2012-05-24 06:55:22 UTC (rev 41329)
@@ -128,7 +128,9 @@
public static final String IGNORE_LAUNCH_COMMANDS = "org.jboss.ide.eclipse.as.core.server.IGNORE_LAUNCH_COMMANDS"; //$NON-NLS-1$
public static final String LISTEN_ALL_HOSTS = "org.jboss.ide.eclipse.as.core.server.LISTEN_ON_ALL_HOSTS"; //$NON-NLS-1$
-
+
+ public static final String EXPOSE_MANAGEMENT_SERVICE = "org.jboss.ide.eclipse.as.core.server.EXPOSE_MANAGEMENT_SERVICE"; //$NON-NLS-1$
+
public static final String LOCAL_DEPLOYMENT_NAME = "name"; //$NON-NLS-1$
public static final String LOCAL_DEPLOYMENT_LOC = "location"; //$NON-NLS-1$
public static final String LOCAL_DEPLOYMENT_TEMP_LOC = "tempLocation"; //$NON-NLS-1$
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchCommandPreferences.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchCommandPreferences.java 2012-05-24 05:17:48 UTC (rev 41328)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchCommandPreferences.java 2012-05-24 06:55:22 UTC (rev 41329)
@@ -34,6 +34,14 @@
return checkBooleanAttribute(server, IJBossToolingConstants.LISTEN_ALL_HOSTS, defaultValue );
}
+ public static boolean exposesManagement(IServerAttributes server) {
+ return exposesManagement(server, false);
+ }
+
+ public static boolean exposesManagement(IServerAttributes server, boolean defaultValue) {
+ return checkBooleanAttribute(server, IJBossToolingConstants.EXPOSE_MANAGEMENT_SERVICE, defaultValue );
+ }
+
private static boolean checkBooleanAttribute(IServerAttributes server, String key, boolean defaultValue) {
if (server == null) {
return false;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java 2012-05-24 05:17:48 UTC (rev 41328)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java 2012-05-24 06:55:22 UTC (rev 41329)
@@ -66,7 +66,9 @@
try {
connector = JMXConnectorFactory.connect(new JMXServiceURL(url), environment);
MBeanServerConnection connection = connector.getMBeanServerConnection();
- this.connectionToConnector.put(connection, connector);
+ synchronized(this) {
+ this.connectionToConnector.put(connection, connector);
+ }
return connection;
} catch(IOException ioe) {
return null;
@@ -79,12 +81,40 @@
protected void cleanupConnection(IServer server, MBeanServerConnection connection) {
super.cleanupConnection(server, connection);
- if( connectionToConnector.get(connection) != null ) {
- try {
- connectionToConnector.get(connection).close();
+ JMXConnector connector = null;
+ synchronized(this) {
+ connector = connectionToConnector.get(connection);
+ if( connector != null ) {
connectionToConnector.remove(connection);
- } catch(Exception e) { /* Ignore */ }
+ }
}
+
+ // Same logic here as in AS71Manager, because the close can block for 10+ minutes
+ if( connector != null ) {
+ closeClientJoin(connector);
+ }
}
+ // Launch a new thread with max duration 5s to handle the actual close
+ private void closeClientJoin(final JMXConnector client) {
+ Runnable r = new Runnable() {
+ public void run() {
+ try {
+ client.close();
+ } catch (Exception e) {
+ // trace
+ }
+ }
+ };
+
+ Thread t = new Thread(r);
+ try {
+ t.start();
+ t.join(3000);
+ } catch (InterruptedException e) {
+ } finally {
+ t.interrupt();
+ }
+ }
+
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java 2012-05-24 05:17:48 UTC (rev 41328)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java 2012-05-24 06:55:22 UTC (rev 41329)
@@ -20,6 +20,7 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.ILaunchConfigConfigurator;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server;
import org.jboss.ide.eclipse.as.core.server.internal.v7.LocalJBoss7ServerRuntime;
import org.jboss.ide.eclipse.as.core.util.ArgsUtil;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
@@ -64,7 +65,18 @@
protected String getShutdownCommand(JBossServer jbossServer, IJBossServerRuntime jbossRuntime) throws CoreException {
String rseHome = RSEUtils.getRSEHomeDir(jbossServer.getServer());
IPath p = new Path(rseHome).append(IJBossRuntimeResourceConstants.BIN);
- return p.toString() + "/" + getManagementScript(jbossServer) + " --connect command=:shutdown";
+ String ret = p.toString() + "/" + getManagementScript(jbossServer);
+
+ boolean exposeManagement = LaunchCommandPreferences.exposesManagement(jbossServer.getServer());
+ if( exposeManagement ) {
+ String host = jbossServer.getServer().getHost();
+ int defPort = IJBossToolingConstants.AS7_MANAGEMENT_PORT_DEFAULT_PORT;
+ int port = (jbossServer instanceof JBoss7Server) ?
+ ((JBoss7Server)jbossServer).getManagementPort() : defPort;
+ ret += " --controller=" + host + ":" + port;
+ }
+ ret += " --connect command=:shutdown";
+ return ret;
}
protected String getManagementScript(JBossServer server) {
@@ -74,21 +86,43 @@
}
return IJBossRuntimeResourceConstants.AS_70_MANAGEMENT_SCRIPT;
}
-
- protected String getLaunchCommand(JBossServer jbossServer, IJBossServerRuntime jbossRuntime) throws CoreException {
- String programArguments = getDefaultProgramArguments(jbossServer, jbossRuntime);
+
+ protected String getArgsOverrideHost(IServer server, String preArgs) {
+ // Overrides
if( LaunchCommandPreferences.listensOnAllHosts(jbossServer.getServer())) {
- programArguments = ArgsUtil.setArg(programArguments,
+ return ArgsUtil.setArg(preArgs,
IJBossRuntimeConstants.STARTUP_ARG_HOST_SHORT,
null, "0.0.0.0");
}
+ return preArgs;
+ }
+
+ protected String getArgsOverrideConfigFile(IServer server, String preArgs) {
String rseConfigFile = ((Base)jbossServer.getServer()).getAttribute(
RSEUtils.RSE_SERVER_CONFIG, LocalJBoss7ServerRuntime.CONFIG_FILE_DEFAULT);
- programArguments = ArgsUtil.setArg(programArguments, null,
+ String programArguments = ArgsUtil.setArg(preArgs, null,
IJBossRuntimeConstants.JB7_SERVER_CONFIG_ARG, rseConfigFile
);
+ return programArguments;
+ }
+
+ protected String getArgsOverrideExposedManagement(IServer server, String preArgs) {
+ boolean overrides = LaunchCommandPreferences.exposesManagement(server);
+ String newVal = overrides ? server.getHost() : null;
+ String vmArguments = ArgsUtil.setArg(preArgs, null,
+ IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.JB7_EXPOSE_MANAGEMENT, newVal );
+ return vmArguments;
+ }
+
+
+ protected String getLaunchCommand(JBossServer jbossServer, IJBossServerRuntime jbossRuntime) throws CoreException {
+ String programArguments = getDefaultProgramArguments(jbossServer, jbossRuntime);
+ programArguments = getArgsOverrideHost(jbossServer.getServer(), programArguments);
+ programArguments = getArgsOverrideConfigFile(jbossServer.getServer(), programArguments);
String vmArguments = getDefaultVMArguments(jbossServer, jbossRuntime);
+ vmArguments = getArgsOverrideExposedManagement(jbossServer.getServer(), vmArguments);
+
String jar = getJar(jbossServer, jbossRuntime);
String command = "java "
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2012-05-24 05:17:48 UTC (rev 41328)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2012-05-24 06:55:22 UTC (rev 41329)
@@ -190,6 +190,8 @@
public static String EditorDoNotLaunchCommand;
public static String EditorListenOnAllHosts;
public static String EditorListenOnAllHostsCommand;
+ public static String EditorExposeManagement;
+ public static String EditorExposeManagementCommand;
public static String EditorChangeServerMode;
public static String EditorZipDeployments;
public static String EditorSetRadioClicked;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2012-05-24 05:17:48 UTC (rev 41328)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2012-05-24 06:55:22 UTC (rev 41329)
@@ -169,6 +169,8 @@
EditorDoNotLaunchCommand=Toggle Startup and Shutdown scripts
EditorListenOnAllHosts=Listen on all interfaces to allow remote web connections
EditorListenOnAllHostsCommand=Toggle allowing launched server to listen on all interfaces
+EditorExposeManagement=Expose your management port as the server's hostname
+EditorExposeManagementCommand=Toggle allowing launched server to expose their management ports
EditorChangeServerMode=Change server mode
EditorStartupPollerLabel=Startup Poller
EditorShutdownPollerLabel=Shutdown Poller
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2012-05-24 05:17:48 UTC (rev 41328)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2012-05-24 06:55:22 UTC (rev 41329)
@@ -54,6 +54,7 @@
private IServerModeUICallback callback;
private Button executeShellScripts; // may be null;
private Button listenOnAllHosts; // may be null
+ private Button exposeManagement; // may be null
private DeployUIAdditions currentUIAddition;
@@ -98,6 +99,22 @@
);
}
+ if( showExposeManagementCheckbox()) {
+ exposeManagement = new Button(this, SWT.CHECK);
+ exposeManagement.setText(Messages.EditorExposeManagement);
+ FormData fd = UIUtil.createFormData2(top == null ? 0 : top, 5, null, 0, 0, 5, null, 0);
+ exposeManagement.setLayoutData(fd);
+ top = exposeManagement;
+ exposeManagement.setSelection(LaunchCommandPreferences.exposesManagement(callback.getServer()));
+ exposeManagement.addSelectionListener(new SelectionListener(){
+ public void widgetSelected(SelectionEvent e) {
+ exposeManagementToggled();
+ }
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }}
+ );
+ }
+
deployTypeCombo = new Combo(this, SWT.READ_ONLY);
FormData fd = UIUtil.createFormData2(top, 5, null, 0, 0, 5, 50, -5);
deployTypeCombo.setLayoutData(fd);
@@ -167,9 +184,19 @@
return true;
}
protected boolean showListenOnAllHostsCheckbox() {
+ JBossExtendedProperties props = getExtendedProperties();
+ return props == null ? false : props.runtimeSupportsBindingToAllInterfaces();
+ }
+
+ protected boolean showExposeManagementCheckbox() {
+ JBossExtendedProperties props = getExtendedProperties();
+ return props == null ? false : props.runtimeSupportsExposingManagement();
+ }
+
+ protected JBossExtendedProperties getExtendedProperties() {
IRuntime rt = callback.getRuntime();
if( rt == null )
- return false;
+ return null;
JBossExtendedProperties props2 = (JBossExtendedProperties)rt
.loadAdapter(JBossExtendedProperties.class,
@@ -179,9 +206,9 @@
JBossExtendedProperties props = (JBossExtendedProperties)wc
.loadAdapter(JBossExtendedProperties.class,
new NullProgressMonitor());
- return props == null ? false : props.runtimeSupportsBindingToAllInterfaces();
+ return props;
}
-
+
protected void executeShellToggled() {
callback.execute(new ChangeServerPropertyCommand(
callback.getServer(), IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS,
@@ -194,6 +221,12 @@
new Boolean(listenOnAllHosts.getSelection()).toString(), Messages.EditorListenOnAllHostsCommand));
}
+ protected void exposeManagementToggled() {
+ callback.execute(new ChangeServerPropertyCommand(
+ callback.getServer(), IJBossToolingConstants.EXPOSE_MANAGEMENT_SERVICE,
+ new Boolean(exposeManagement.getSelection()).toString(), Messages.EditorExposeManagementCommand));
+ }
+
private class DeployUIAdditions {
private String behaviourName;
private String behaviourId;
13 years, 10 months
JBoss Tools SVN: r41328 - trunk/jmx/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-05-24 01:17:48 -0400 (Thu, 24 May 2012)
New Revision: 41328
Modified:
trunk/jmx/docs/reference/en-US/Book_Info.xml
trunk/jmx/docs/reference/en-US/JMX_Tools_Reference_Guide.ent
trunk/jmx/docs/reference/en-US/JMX_Tools_Reference_Guide.xml
trunk/jmx/docs/reference/en-US/introduction.xml
trunk/jmx/docs/reference/en-US/tasks.xml
Log:
updated with QE feedback
Modified: trunk/jmx/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/jmx/docs/reference/en-US/Book_Info.xml 2012-05-23 23:53:30 UTC (rev 41327)
+++ trunk/jmx/docs/reference/en-US/Book_Info.xml 2012-05-24 05:17:48 UTC (rev 41328)
@@ -5,9 +5,9 @@
<title>JMX Tools Reference Guide</title>
<subtitle>Provides information relating to the JMX Tools module.</subtitle>
<productname>JBoss Developer Studio</productname>
- <productnumber>4.1</productnumber>
- <edition>4.1.0</edition>
- <pubsnumber>1</pubsnumber>
+ <productnumber>5.0.Beta</productnumber>
+ <edition>5.0.0</edition>
+ <pubsnumber>2</pubsnumber>
<abstract>
<para>The JMX Tools Reference Guide explains how to use the JMX Tools module to setup multiple JMX connections and explore the JMX tree and execute operations.</para>
</abstract>
Modified: trunk/jmx/docs/reference/en-US/JMX_Tools_Reference_Guide.ent
===================================================================
--- trunk/jmx/docs/reference/en-US/JMX_Tools_Reference_Guide.ent 2012-05-23 23:53:30 UTC (rev 41327)
+++ trunk/jmx/docs/reference/en-US/JMX_Tools_Reference_Guide.ent 2012-05-24 05:17:48 UTC (rev 41328)
@@ -4,4 +4,4 @@
<!ENTITY HOLDER "Red Hat">
<!ENTITY BZPRODUCT "JBoss Developer Studio">
<!ENTITY BZCOMPONENT "JMX Tools Reference Guide">
-<!ENTITY BZURL "<ulink url='https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss%20Develope...'>http://bugzilla.redhat.com/</ulink>">
+<!ENTITY BZURL "<ulink url='https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss%20Develope...'>http://bugzilla.redhat.com/</ulink>">
Modified: trunk/jmx/docs/reference/en-US/JMX_Tools_Reference_Guide.xml
===================================================================
--- trunk/jmx/docs/reference/en-US/JMX_Tools_Reference_Guide.xml 2012-05-23 23:53:30 UTC (rev 41327)
+++ trunk/jmx/docs/reference/en-US/JMX_Tools_Reference_Guide.xml 2012-05-24 05:17:48 UTC (rev 41328)
@@ -7,7 +7,7 @@
<xi:include href="introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<xi:include href="tasks.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<xi:include href="references.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-<xi:include href="summary.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+<!--<xi:include href="summary.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>-->
<!--
<xi:include href="connection.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<xi:include href="how_to.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
Modified: trunk/jmx/docs/reference/en-US/introduction.xml
===================================================================
--- trunk/jmx/docs/reference/en-US/introduction.xml 2012-05-23 23:53:30 UTC (rev 41327)
+++ trunk/jmx/docs/reference/en-US/introduction.xml 2012-05-24 05:17:48 UTC (rev 41328)
@@ -31,9 +31,9 @@
<para>
The JMX technology defines standard connectors (known as JMX connectors) that enable you to access JMX agents from remote management applications. JMX connectors using different protocols provide the same management interface. Consequently, a management application can manage resources transparently, regardless of the communication protocol used. JMX agents can also be used by systems or applications that are not compliant with the JMX specification, as long as those systems or applications support JMX agents.
</para>
- <para>
+ <!-- <para>
<ulink url="http://java.sun.com/docs/books/tutorial/jmx/overview/index.html">Read more about JMX</ulink>.
- </para>
+ </para> -->
</section>
<section>
@@ -106,7 +106,7 @@
</table>
</section>
- <section>
+<!-- <section>
<title>Requirements and Installation</title>
<section>
<title> Requirements</title>
@@ -136,5 +136,5 @@
You can find the <productname>JBoss Tools</productname> plugins over at the <ulink url="http://labs.jboss.com/tools/download.html">download pages</ulink>. The only package you will need to get is the JBoss JMX Tooling, however the <productname>AS Tools</productname> would give you a wider experience and more options when using JMX with JBoss Servers. You can find further download and installation instructions on the JBoss Wiki in the <ulink url="http://www.jboss.org/tools/download/installation">InstallingJBossTools</ulink> section.
</para>
</section>
- </section>
+ </section> -->
</chapter>
\ No newline at end of file
Modified: trunk/jmx/docs/reference/en-US/tasks.xml
===================================================================
--- trunk/jmx/docs/reference/en-US/tasks.xml 2012-05-23 23:53:30 UTC (rev 41327)
+++ trunk/jmx/docs/reference/en-US/tasks.xml 2012-05-24 05:17:48 UTC (rev 41328)
@@ -158,10 +158,10 @@
Using SSL for authentication is not supported: you need to make sure that the System property <guilabel>com.sun.management.jmxremote.ssl</guilabel> is set to false.
</para>
<para>
- More information to manage Tomcat can be found in the <ulink url="http://tomcat.apache.org/tomcat-6.0-doc/">Tomcat management documentation</ulink>.
+ More information to manage Tomcat can be found in the <ulink url="http://tomcat.apache.org/tomcat-7.0-doc/">Tomcat management documentation</ulink>.
</para>
<para>
- Instructions to remotely manage Tomcat are available in <ulink url="http://tomcat.apache.org/tomcat-6.0-doc/monitoring.html">Tomcat's monitoring documentation</ulink>.
+ Instructions to remotely manage Tomcat are available in <ulink url="http://tomcat.apache.org/tomcat-7.0-doc/monitoring.html">Tomcat's monitoring documentation</ulink>.
</para>
@@ -223,10 +223,10 @@
<section>
- <title>Managing JBoss AS</title>
+ <title>Managing a JBoss application server</title>
<para>
- Managing JBoss instances is not supported with the <guilabel>JMX Tools</guilabel> alone. You must also download and install the <guilabel>AS Tools</guilabel> portion of the <guilabel>JBoss Tools</guilabel> distribution. Even after installing the proper tooling, you cannot create a JBoss JMX connection yourself or through the Connection Wizard. The first step is to create a JBoss Server. The full instructions for this can be found in the AS Tools section, however, the short summary is:
+ Managing JBoss instances is not supported with the <guilabel>JMX Tools</guilabel> alone. <!-- You must also download and install the <guilabel>AS Tools</guilabel> portion of the <guilabel>JBoss Tools</guilabel> distribution Even after installing the proper tooling, you cannot create a JBoss JMX connection yourself or through the Connection Wizard. --> The first step is to create a JBoss Server. The full instructions for this can be found in the application server Tools section; however, the short summary is:
</para>
<orderedlist>
<listitem>
@@ -263,10 +263,10 @@
</section>
<section>
- <title>Managing JBoss AS Remotely</title>
+ <title>Managing a JBoss application server Remotely</title>
<para>
- The JBoss JMX Tools allow you to easily access and manage a JBoss AS server remotely. In order to connect to the instance of JBoss AS remotely you need to run the server or make sure the server is launched.
+ The JBoss JMX Tools allow you to easily access and manage a JBoss AS server remotely. In order to connect to an instance of a JBoss server remotely, you need to run the server or make sure the server is launched.
</para>
<orderedlist>
<listitem>
@@ -296,7 +296,7 @@
<para>This section will outline how to contribute your own Server type with some default behavior.</para>
<section>
- <title>Why we should do that?</title>
+ <title>Why you extend the framework</title>
<para>
You might be asking yourself why you would need to extend this framework if JMX is a standard. Perhaps you want a connection to be automatically created after some specific action, or perhaps you want your connection wizard to do more than simply set a host and port. JBoss, for example, requires setting some credentials on the client machine, but uses JBoss classes to do it. This requires that the connection has access to the JBoss JARs.
@@ -332,7 +332,6 @@
<para>
<code>org.jboss.tools.jmx.ui.attribute.controls</code> - allows you to map class types to some Control to present them in the MBean Editor
</para>
- <para>We hope this guide helped you to get started with the JBoss JMX Tools. For additional information you are welcome on the <ulink url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201">JBoss forum</ulink>.</para>
</listitem>
</itemizedlist>
</section>
@@ -364,7 +363,7 @@
The simple method is to specify the host, port (and optionally user name and password) and click the <guibutton>OK</guibutton> button.
</para>
<para>
- On the <guilabel>Advanced</guilabel> tab you can set the sever name (it will be displayed in <guilabel>MBean Explorer</guilabel>), and a URL to the remote server. For example, to connect to JBoss AS you need to set the <guilabel>JMX URL</guilabel> to
+ On the <guilabel>Advanced</guilabel> tab you can set the server name (it will be displayed in <guilabel>MBean Explorer</guilabel>), and a URL to the remote server. For example, to connect to JBoss AS you need to set the <guilabel>JMX URL</guilabel> to
</para>
<programlisting role="XML"><![CDATA[service:jmx:rmi://localhost/jndi/rmi://localhost:1090/jmxconnector]]></programlisting>
<para>If it is required you can enter user name and password for the server connection. </para>
13 years, 10 months
JBoss Tools SVN: r41327 - in trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core: META-INF and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-05-23 19:53:30 -0400 (Wed, 23 May 2012)
New Revision: 41327
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/validation/DeltaspikeSuppressWarningsMap.java
trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/ui/
trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/ui/preferences/
trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/ui/preferences/DeltaspikeConfigBlockDescriptionProvider.java
trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/ui/preferences/DeltaspikePreferencesMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/ui/preferences/DeltaspikePreferencesMessages.properties
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/META-INF/MANIFEST.MF
trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/plugin.xml
trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeSecurityDefinitionContext.java
trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeSecurityExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeSeverityPreferenceInitializer.java
trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeSeverityPreferences.java
Log:
JBIDE-11552
https://issues.jboss.org/browse/JBIDE-11552
Deltaspike preferences configuration block is added to validation preferences page , and populated with preferences for security extension validation.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/META-INF/MANIFEST.MF 2012-05-23 23:49:23 UTC (rev 41326)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/META-INF/MANIFEST.MF 2012-05-23 23:53:30 UTC (rev 41327)
@@ -12,6 +12,8 @@
org.jboss.tools.common.validation,
org.jboss.tools.jst.web.kb,
org.jboss.tools.cdi.core,
+ org.jboss.tools.common.ui,
+ org.jboss.tools.cdi.ui,
org.jboss.tools.cdi.seam.solder.core,
org.eclipse.jdt.core;bundle-version="3.7.0"
Bundle-ActivationPolicy: lazy
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/plugin.xml 2012-05-23 23:49:23 UTC (rev 41326)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/plugin.xml 2012-05-23 23:53:30 UTC (rev 41327)
@@ -30,4 +30,21 @@
<initializer class="org.jboss.tools.cdi.deltaspike.core.DeltaspikeSeverityPreferenceInitializer"/>
</extension>
+ <extension
+ id="DeltaspikeWarnings"
+ point="org.jboss.tools.common.validation.warnings">
+ <map
+ class="org.jboss.tools.cdi.deltaspike.core.validation.DeltaspikeSuppressWarningsMap"
+ warningGroupID="deltaspike"
+ preferenceGroupID="org.jboss.tools.cdi.deltaspike.core.validator.problem">
+ </map>
+ </extension>
+
+ <extension
+ point="org.jboss.tools.cdi.ui.configBlockDescriptionProvider">
+ <provider
+ class="org.jboss.tools.cdi.deltaspike.ui.preferences.DeltaspikeConfigBlockDescriptionProvider">
+ </provider>
+</extension>
+
</plugin>
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeSecurityDefinitionContext.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeSecurityDefinitionContext.java 2012-05-23 23:49:23 UTC (rev 41326)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeSecurityDefinitionContext.java 2012-05-23 23:53:30 UTC (rev 41327)
@@ -61,6 +61,8 @@
public void computeAnnotationKind(AnnotationDefinition annotation) {
if(SECURES_ANNOTATION_TYPE_NAME.equals(annotation.getType().getFullyQualifiedName())) {
annotation.setExtendedKind(SECURES_ANNOTATION_KIND);
+ } else if(SECURED_ANNOTATION_TYPE_NAME.equals(annotation.getType().getFullyQualifiedName())) {
+ annotation.setExtendedKind(SECURES_ANNOTATION_KIND);
} else if(annotation.isAnnotationPresent(SECURITY_BINDING_ANNOTATION_TYPE_NAME)) {
annotation.setExtendedKind(SECURITY_BINDING_ANNOTATION_KIND);
String qn = annotation.getType().getFullyQualifiedName();
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeSecurityExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeSecurityExtension.java 2012-05-23 23:49:23 UTC (rev 41326)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeSecurityExtension.java 2012-05-23 23:53:30 UTC (rev 41327)
@@ -84,8 +84,9 @@
MethodDefinition method = (MethodDefinition)memberDefinition;
method.setCDIAnnotated(true);
DeltaspikeAuthorityMethod authorizer = new DeltaspikeAuthorityMethod(method);
- ((DeltaspikeSecurityDefinitionContext)this.context.getWorkingCopy()).allAuthorizerMethods.getAuthorizerMembers().add(authorizer);
- List<IAnnotationDeclaration> ds = findAnnotationAnnotatedWithSecurityBindingType(memberDefinition);
+ DeltaspikeSecurityDefinitionContext contextCopy = ((DeltaspikeSecurityDefinitionContext)this.context.getWorkingCopy());
+ contextCopy.allAuthorizerMethods.getAuthorizerMembers().add(authorizer);
+ List<IAnnotationDeclaration> ds = findAnnotationAnnotatedWithSecurityBindingType(memberDefinition, contextCopy.getRootContext());
for (IAnnotationDeclaration d: ds) {
DeltaspikeSecurityBindingConfiguration c = ((DeltaspikeSecurityDefinitionContext)this.context.getWorkingCopy()).getConfiguration(d.getTypeName());
authorizer.addBinding(d, c);
@@ -104,7 +105,7 @@
}
private void addSecurityMember(AbstractMemberDefinition def, IRootDefinitionContext context) {
- List<IAnnotationDeclaration> ds = findAnnotationAnnotatedWithSecurityBindingType(def);
+ List<IAnnotationDeclaration> ds = findAnnotationAnnotatedWithSecurityBindingType(def, context);
for (IAnnotationDeclaration d: ds) {
addBoundMember(def, d, context);
}
@@ -138,12 +139,13 @@
static List<IAnnotationDeclaration> EMPTY = Collections.<IAnnotationDeclaration>emptyList();
- private List<IAnnotationDeclaration> findAnnotationAnnotatedWithSecurityBindingType(AbstractMemberDefinition m) {
+ private List<IAnnotationDeclaration> findAnnotationAnnotatedWithSecurityBindingType(AbstractMemberDefinition m, IRootDefinitionContext context) {
List<IAnnotationDeclaration> result = null;
List<IAnnotationDeclaration> ds = m.getAnnotations();
for (IAnnotationDeclaration d: ds) {
if(d.getTypeName() != null) {
- AnnotationDefinition a = context.getRootContext().getAnnotation(d.getTypeName());
+// context.getAnnotationKind(d.getType());
+ AnnotationDefinition a = context.getAnnotation(d.getTypeName());
if(a != null && a.isAnnotationPresent(SECURITY_BINDING_ANNOTATION_TYPE_NAME)) {
if(result == null) {
result = new ArrayList<IAnnotationDeclaration>();
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeSeverityPreferenceInitializer.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeSeverityPreferenceInitializer.java 2012-05-23 23:49:23 UTC (rev 41326)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeSeverityPreferenceInitializer.java 2012-05-23 23:53:30 UTC (rev 41327)
@@ -13,7 +13,7 @@
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.core.runtime.preferences.DefaultScope;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.jboss.tools.cdi.core.preferences.CDIPreferences;
import org.jboss.tools.common.preferences.SeverityPreferences;
/**
@@ -26,9 +26,10 @@
*/
@Override
public void initializeDefaultPreferences() {
- IEclipsePreferences defaultPreferences = ((IScopeContext) new DefaultScope()).getNode(DeltaspikeCorePlugin.PLUGIN_ID);
+ IEclipsePreferences defaultPreferences = DefaultScope.INSTANCE.getNode(DeltaspikeCorePlugin.PLUGIN_ID);
for (String name : DeltaspikeSeverityPreferences.SEVERITY_OPTION_NAMES) {
defaultPreferences.put(name, SeverityPreferences.WARNING);
}
+ defaultPreferences.put(DeltaspikeSeverityPreferences.INVALID_AUTHORIZER, CDIPreferences.ERROR);
}
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeSeverityPreferences.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeSeverityPreferences.java 2012-05-23 23:49:23 UTC (rev 41326)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeSeverityPreferences.java 2012-05-23 23:53:30 UTC (rev 41327)
@@ -13,6 +13,7 @@
import java.util.HashSet;
import java.util.Set;
+import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.preferences.CDIPreferences;
import org.jboss.tools.common.validation.ValidationSeverityPreferences;
Added: trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/validation/DeltaspikeSuppressWarningsMap.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/validation/DeltaspikeSuppressWarningsMap.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/validation/DeltaspikeSuppressWarningsMap.java 2012-05-23 23:53:30 UTC (rev 41327)
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.deltaspike.core.validation;
+
+import org.jboss.tools.cdi.deltaspike.core.DeltaspikeSeverityPreferences;
+import org.jboss.tools.common.validation.IWarningNameMap;
+
+/**
+ * @author Viacheslav Kabanovich
+ */
+public class DeltaspikeSuppressWarningsMap implements IWarningNameMap {
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.common.validation.IWarningNameMap#getWarningNames(java.lang.String)
+ */
+ @Override
+ public String[] getWarningNames(String preferenceID) {
+ return DeltaspikeSeverityPreferences.getInstance().getWarningNames(preferenceID);
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/validation/DeltaspikeSuppressWarningsMap.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/ui/preferences/DeltaspikeConfigBlockDescriptionProvider.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/ui/preferences/DeltaspikeConfigBlockDescriptionProvider.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/ui/preferences/DeltaspikeConfigBlockDescriptionProvider.java 2012-05-23 23:53:30 UTC (rev 41327)
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.deltaspike.ui.preferences;
+
+import org.jboss.tools.cdi.deltaspike.core.DeltaspikeCorePlugin;
+import org.jboss.tools.cdi.deltaspike.core.DeltaspikeSeverityPreferences;
+import org.jboss.tools.cdi.ui.preferences.IConfigurationBlockDescriptionProvider;
+import org.jboss.tools.common.ui.preferences.SeverityConfigurationBlock.SectionDescription;
+
+/**
+ * @author Viacheslav Kabanovich
+ */
+public class DeltaspikeConfigBlockDescriptionProvider implements IConfigurationBlockDescriptionProvider {
+
+ private static SectionDescription SECTION_DELTASPIKE = new SectionDescription(
+ DeltaspikePreferencesMessages.CDIValidatorConfigurationBlock_section_deltaspike,
+ new String[][]{
+ {DeltaspikeSeverityPreferences.AMBIGUOUS_AUTHORIZER, DeltaspikePreferencesMessages.CDIValidatorConfigurationBlock_pb_ambiguousAuthorizer_label},
+ {DeltaspikeSeverityPreferences.UNRESOLVED_AUTHORIZER, DeltaspikePreferencesMessages.CDIValidatorConfigurationBlock_pb_unresolvedAuthorizer_label},
+ {DeltaspikeSeverityPreferences.INVALID_AUTHORIZER, DeltaspikePreferencesMessages.CDIValidatorConfigurationBlock_pb_invalidAuthorizer_label},
+ },
+ DeltaspikeCorePlugin.PLUGIN_ID
+ );
+
+ private static SectionDescription[] ALL_SECTIONS = {
+ SECTION_DELTASPIKE
+ };
+
+ @Override
+ public SectionDescription[] getSections() {
+ return ALL_SECTIONS;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/ui/preferences/DeltaspikeConfigBlockDescriptionProvider.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/ui/preferences/DeltaspikePreferencesMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/ui/preferences/DeltaspikePreferencesMessages.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/ui/preferences/DeltaspikePreferencesMessages.java 2012-05-23 23:53:30 UTC (rev 41327)
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.deltaspike.ui.preferences;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * @author Viacheslav Kabanovich
+ */
+public class DeltaspikePreferencesMessages extends NLS {
+ private static final String BUNDLE_NAME = DeltaspikePreferencesMessages.class.getName();
+
+ //Section Deltaspike
+ public static String CDIValidatorConfigurationBlock_section_deltaspike;
+ public static String CDIValidatorConfigurationBlock_pb_ambiguousAuthorizer_label;
+ public static String CDIValidatorConfigurationBlock_pb_unresolvedAuthorizer_label;
+ public static String CDIValidatorConfigurationBlock_pb_invalidAuthorizer_label;
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, DeltaspikePreferencesMessages.class);
+ }
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/ui/preferences/DeltaspikePreferencesMessages.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/ui/preferences/DeltaspikePreferencesMessages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/ui/preferences/DeltaspikePreferencesMessages.properties (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/ui/preferences/DeltaspikePreferencesMessages.properties 2012-05-23 23:53:30 UTC (rev 41327)
@@ -0,0 +1,6 @@
+##Section Deltaspike
+
+CDIValidatorConfigurationBlock_section_deltaspike=Deltaspike
+CDIValidatorConfigurationBlock_pb_ambiguousAuthorizer_label=Umbiguous authorizer for a secured method:
+CDIValidatorConfigurationBlock_pb_unresolvedAuthorizer_label=Unresolved authorizer for a secured method:
+CDIValidatorConfigurationBlock_pb_invalidAuthorizer_label=Invalid authorizer:
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/ui/preferences/DeltaspikePreferencesMessages.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 10 months
JBoss Tools SVN: r41326 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-05-23 19:49:23 -0400 (Wed, 23 May 2012)
New Revision: 41326
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityConfigurationBlock.java
Log:
JBIDE-11552
https://issues.jboss.org/browse/JBIDE-11552
Check for qualifier is redundant when all preferences used on the page are defined in the same plugin, and it is erroneous when page composed of preferences defined in several plugins.
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityConfigurationBlock.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityConfigurationBlock.java 2012-05-23 23:36:56 UTC (rev 41325)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityConfigurationBlock.java 2012-05-23 23:49:23 UTC (rev 41326)
@@ -332,10 +332,10 @@
}
public void doFilter(String prefId){
- String qualifier = getQualifier();
+// String qualifier = getQualifier();
Key key = null;
for(Key k : fAllKeys){
- if(k.getQualifier().equals(qualifier) && k.getName().equals(prefId))
+ if(/*k.getQualifier().equals(qualifier) &&*/ k.getName().equals(prefId))
key = k;
}
if(key != null){
13 years, 10 months