JBoss Tools SVN: r33675 - trunk/esb/docs/esb_ref_guide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2011-08-08 07:53:10 -0400 (Mon, 08 Aug 2011)
New Revision: 33675
Modified:
trunk/esb/docs/esb_ref_guide/en-US/tasks.xml
Log:
docs: fixed HelloWorld Email example detail
Modified: trunk/esb/docs/esb_ref_guide/en-US/tasks.xml
===================================================================
--- trunk/esb/docs/esb_ref_guide/en-US/tasks.xml 2011-08-08 11:49:21 UTC (rev 33674)
+++ trunk/esb/docs/esb_ref_guide/en-US/tasks.xml 2011-08-08 11:53:10 UTC (rev 33675)
@@ -194,7 +194,7 @@
</listitem>
<listitem>
<para>
- <emphasis role="bold">JBoss ESB HelloWorld Email Example</emphasis> - demonstrates the use of multiple action invocations from a single configuration. You can use a single Action class and make multiple method calls or use multiple Action classes. </para>
+ <emphasis role="bold">JBoss ESB HelloWorld Email Example</emphasis> - demonstrates how to configure a mail gateway using a JCA mail adapter and a Camel mail endpoint. Both gateways route the messages through a JMS queue and finally to your action class for processing. </para>
</listitem>
<listitem>
<para>
14 years, 8 months
JBoss Tools SVN: r33674 - trunk/esb/docs/esb_ref_guide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2011-08-08 07:49:21 -0400 (Mon, 08 Aug 2011)
New Revision: 33674
Modified:
trunk/esb/docs/esb_ref_guide/en-US/tasks.xml
Log:
added HelloWorld Email example to docs
Modified: trunk/esb/docs/esb_ref_guide/en-US/tasks.xml
===================================================================
--- trunk/esb/docs/esb_ref_guide/en-US/tasks.xml 2011-08-08 11:29:26 UTC (rev 33673)
+++ trunk/esb/docs/esb_ref_guide/en-US/tasks.xml 2011-08-08 11:49:21 UTC (rev 33674)
@@ -194,6 +194,10 @@
</listitem>
<listitem>
<para>
+ <emphasis role="bold">JBoss ESB HelloWorld Email Example</emphasis> - demonstrates the use of multiple action invocations from a single configuration. You can use a single Action class and make multiple method calls or use multiple Action classes. </para>
+ </listitem>
+ <listitem>
+ <para>
<emphasis role="bold">JBoss ESB HelloWorld File Action Example</emphasis> - demonstrates using the File gateway feature of the JBoss ESB. Files that are found in a particular directory with a particular extension are sent to a JMS queue with actions for processing.</para>
</listitem>
<listitem>
14 years, 8 months
JBoss Tools SVN: r33673 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal: details and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2011-08-08 07:29:26 -0400 (Mon, 08 Aug 2011)
New Revision: 33673
Added:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/details/java/
Removed:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/java/
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/details/java/HibernateJavaEntityComposite.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/details/java/HibernateJavaInheritanceComposite.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/java/Hibernate2_0JavaUiFactory.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/java/HibernateJavaUiFactory.java
Log:
Package name changed to be the similar with jpa package names
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/details/java/HibernateJavaEntityComposite.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/java/details/HibernateJavaEntityComposite.java 2011-07-18 12:16:44 UTC (rev 33010)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/details/java/HibernateJavaEntityComposite.java 2011-08-08 11:29:26 UTC (rev 33673)
@@ -8,7 +8,7 @@
* Contributor:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.hibernate.jpt.ui.internal.java.details;
+package org.jboss.tools.hibernate.jpt.ui.internal.details.java;
import org.eclipse.jpt.common.ui.WidgetFactory;
import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/details/java/HibernateJavaInheritanceComposite.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/java/details/HibernateJavaInheritanceComposite.java 2011-07-18 12:16:44 UTC (rev 33010)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/details/java/HibernateJavaInheritanceComposite.java 2011-08-08 11:29:26 UTC (rev 33673)
@@ -8,7 +8,7 @@
* Contributor:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.hibernate.jpt.ui.internal.java.details;
+package org.jboss.tools.hibernate.jpt.ui.internal.details.java;
import org.eclipse.jpt.common.ui.internal.widgets.Pane;
import org.eclipse.jpt.jpa.core.context.java.JavaEntity;
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/java/Hibernate2_0JavaUiFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/java/Hibernate2_0JavaUiFactory.java 2011-08-08 11:02:43 UTC (rev 33672)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/java/Hibernate2_0JavaUiFactory.java 2011-08-08 11:29:26 UTC (rev 33673)
@@ -23,7 +23,7 @@
import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaEntity;
import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaIdMapping;
import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOrmEntity;
-import org.jboss.tools.hibernate.jpt.ui.internal.java.details.HibernateJavaEntityComposite;
+import org.jboss.tools.hibernate.jpt.ui.internal.details.java.HibernateJavaEntityComposite;
import org.jboss.tools.hibernate.jpt.ui.internal.jpa2.details.HibernateElementCollectionMapping2_0Composite;
import org.jboss.tools.hibernate.jpt.ui.internal.jpa2.details.orm.Hibernate2_0OrmEntityComposite;
import org.jboss.tools.hibernate.jpt.ui.internal.mapping.details.HibernateBasicMappingComposite;
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/java/HibernateJavaUiFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/java/HibernateJavaUiFactory.java 2011-08-08 11:02:43 UTC (rev 33672)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/java/HibernateJavaUiFactory.java 2011-08-08 11:29:26 UTC (rev 33673)
@@ -22,8 +22,8 @@
import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaEntity;
import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaIdMapping;
import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOrmEntity;
+import org.jboss.tools.hibernate.jpt.ui.internal.details.java.HibernateJavaEntityComposite;
import org.jboss.tools.hibernate.jpt.ui.internal.details.orm.HibernateOrmEntityComposite;
-import org.jboss.tools.hibernate.jpt.ui.internal.java.details.HibernateJavaEntityComposite;
import org.jboss.tools.hibernate.jpt.ui.internal.mapping.details.HibernateBasicMappingComposite;
import org.jboss.tools.hibernate.jpt.ui.internal.mapping.details.HibernateIdMappingComposite;
14 years, 8 months
JBoss Tools SVN: r33672 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-08-08 07:02:43 -0400 (Mon, 08 Aug 2011)
New Revision: 33672
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
Log:
https://issues.jboss.org/browse/JBIDE-9370 : NPE when close VPE during page refresh execution
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2011-08-08 10:56:40 UTC (rev 33671)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2011-08-08 11:02:43 UTC (rev 33672)
@@ -574,7 +574,7 @@
// refresh job in time, so we just ignore
// this exception
}
- } catch(Exception ex) {
+ } catch(RuntimeException ex) {
VpePlugin.getPluginLog().logError(ex);
}
getChangeEvents().remove(eventBean);
@@ -1568,9 +1568,9 @@
// refresh job in time, so we just ignore this
// exception
}
- }catch (Exception ex){
+ } catch (RuntimeException ex) {
VpePlugin.getPluginLog().logError(ex);
- }finally {
+ } finally {
if (switcher != null) {
switcher.stopActiveEditor();
}
@@ -2471,6 +2471,8 @@
} catch (VpeDisposeException ex) {
// vpe vas closed when refresh job is running, so just
// ignore this exception
+ } catch(RuntimeException ex) {
+ VpePlugin.getPluginLog().logError(ex);
} finally {
if (switcher != null) {
switcher.stopActiveEditor();
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2011-08-08 10:56:40 UTC (rev 33671)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2011-08-08 11:02:43 UTC (rev 33672)
@@ -260,13 +260,8 @@
private boolean addNode(Node sourceNode, nsIDOMNode visualNextNode, nsIDOMNode visualContainer) {
try {
- nsIDOMNode visualNewNode = null;
-
- try {
- visualNewNode = createNode(sourceNode, visualContainer);
- } catch (Exception ex) {
- VpePlugin.getPluginLog().logError(ex);
- }
+ nsIDOMNode visualNewNode = createNode(sourceNode, visualContainer);
+
// Commented as fix for JBIDE-3012.
// // Fix for JBIDE-1097
@@ -319,7 +314,7 @@
* @return new visual node
*/
public nsIDOMNode createNode(Node sourceNode,
- nsIDOMNode visualOldContainer) {
+ nsIDOMNode visualOldContainer) throws VpeDisposeException {
boolean registerFlag = isCurrentMainDocument();
@@ -338,7 +333,6 @@
// JBIDE-675, checks if editor was disposed or not
if (getPageContext().getSourceBuilder() == null
|| includeDocuments == null) {
-
throw new VpeDisposeException();
}
// check source node can be changed and link can be a null in this case
@@ -385,7 +379,7 @@
VpeTemplate defTemplate = getTemplateManager().getDefTemplate();
creationData = defTemplate.create(getPageContext(), sourceNode,
getVisualDocument());
- } catch (Exception ex) {
+ } catch (RuntimeException ex) {
VpePlugin.getPluginLog().logError(ex);
VpeTemplate defTemplate = getTemplateManager().getDefTemplate();
creationData = defTemplate.create(getPageContext(), sourceNode,
@@ -487,7 +481,7 @@
getPageContext().setCurrentVisualNode(visualOldContainer);
try {
template.validate(getPageContext(), sourceNode, getVisualDocument(), creationData);
- } catch (Exception ex) {
+ } catch (RuntimeException ex) {
VpePlugin.getPluginLog().logError(ex);
}
getPageContext().setCurrentVisualNode(null);
@@ -693,7 +687,7 @@
try {
containerTemplate.setPseudoContent(pageContext, sourceContainer,
visualContainer, getVisualDocument());
- } catch (Exception ex) {
+ } catch (RuntimeException ex) {
VpePlugin.getPluginLog().logError(ex);
}
} else {
14 years, 8 months
JBoss Tools SVN: r33671 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-08-08 06:56:40 -0400 (Mon, 08 Aug 2011)
New Revision: 33671
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-9406 : NullPointerExceeption occures in vpe editor while editing xhtml page
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2011-08-08 10:39:22 UTC (rev 33670)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2011-08-08 10:56:40 UTC (rev 33671)
@@ -61,6 +61,8 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.resref.core.ResourceReference;
import org.jboss.tools.vpe.VpePlugin;
+import org.jboss.tools.vpe.editor.VpeIncludeInfo;
+import org.jboss.tools.vpe.editor.VpeVisualDomBuilder;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeCreatorUtil;
import org.jboss.tools.vpe.resref.core.AbsoluteFolderReferenceList;
@@ -132,6 +134,15 @@
}
return false;
}
+
+ private static IJavaProject getJavaProject(VpePageContext pageContext) {
+ VpeVisualDomBuilder visualBuilder = pageContext != null ? pageContext.getVisualBuilder() : null;
+ VpeIncludeInfo currentIncludeInfo = visualBuilder != null ? visualBuilder.getCurrentIncludeInfo() : null;
+ IFile currentFile = currentIncludeInfo != null ? (IFile) currentIncludeInfo.getStorage() : null;
+ IProject project = currentFile != null ? currentFile.getProject() : null;
+ return JavaCore.create(project);
+ }
+
/**
* Function search into project class path resource, if resource founded in jar file, make a
* temp copy of this resource and return path to copy.
@@ -141,10 +152,12 @@
* @return path to file
*/
private static String seachResourceInClassPath(VpePageContext pageContext, String classPathResource) {
- String result = null;
- final IFile currentFile = (IFile) pageContext.getVisualBuilder().getCurrentIncludeInfo().getStorage();
- final IProject project = currentFile.getProject();
- IJavaProject javaProject = JavaCore.create(project);
+ final IJavaProject javaProject = getJavaProject(pageContext);
+ if (javaProject == null) {
+ return null;
+ }
+
+ String result = null;
try {
for (IPackageFragmentRoot fragmentRoot : javaProject.getAllPackageFragmentRoots()) {
if(fragmentRoot instanceof JarPackageFragmentRoot) {
14 years, 8 months
JBoss Tools SVN: r33670 - trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-08-08 06:39:22 -0400 (Mon, 08 Aug 2011)
New Revision: 33670
Modified:
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/SelectProfilesDialog.java
Log:
JBIDE-9403 : added Activate / Deactivate buttons. Still need to handle multiple selection
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/SelectProfilesDialog.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/SelectProfilesDialog.java 2011-08-08 10:06:53 UTC (rev 33669)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/SelectProfilesDialog.java 2011-08-08 10:39:22 UTC (rev 33670)
@@ -148,8 +148,8 @@
addSelectionButton(container, Messages.SelectProfilesDialog_SelectAll, true);
addSelectionButton(container, Messages.SelectProfilesDialog_DeselectAll, false);
- addActivationButton(container, "Activate", true);
- addActivationButton(container, "Deactivate", false);
+ addActivationButton(container, "Activate", ProfileState.Active);
+ addActivationButton(container, "Deactivate", ProfileState.Disabled);
offlineModeBtn = addCheckButton(container, Messages.SelectProfilesDialog_Offline, offlineMode);
forceUpdateBtn = addCheckButton(container, Messages.SelectProfilesDialog_Force_update, forceUpdate);
}
@@ -278,8 +278,7 @@
profile.setActivationState(ProfileState.Active);
}
}
- profileTableViewer.refresh();
- updateProfilesAsText();
+ refresh();
}
public void widgetDefaultSelected(SelectionEvent e) {
@@ -290,7 +289,7 @@
return button;
}
- private Button addActivationButton(Composite container, String label, final boolean ischecked) {
+ private Button addActivationButton(Composite container, String label, final ProfileState state) {
Button button = new Button(container, SWT.NONE);
button.setLayoutData(new GridData(SWT.FILL, SWT.UP,
false, false, 1, 1));
@@ -302,18 +301,13 @@
IStructuredSelection sel = (IStructuredSelection) s;
Iterator<?> ite = sel.iterator();
while (ite.hasNext()) {
- System.err.println(ite.next());
+ Object o = ite.next();
+ if (o instanceof ProfileSelection) {
+ setActivationState((ProfileSelection)o, state);
+ }
}
}
-// for (ProfileSelection profile : sharedProfiles) {
-// profileTableViewer.setChecked(profile, ischecked);
-// profile.setSelected(ischecked);
-// if (!ischecked || profile.getActivationState() == null) {
-// profile.setActivationState(ProfileState.Active);
-// }
-// }
- profileTableViewer.refresh();
- updateProfilesAsText();
+ refresh();
}
public void widgetDefaultSelected(SelectionEvent e) {
@@ -503,6 +497,22 @@
}
*/
+ private void setActivationState(final ProfileSelection profileSelection, ProfileState state) {
+ profileSelection.setActivationState(state);
+ profileTableViewer.setChecked(profileSelection, true);
+ profileTableViewer.setGrayed(profileSelection, false);
+ if (ProfileState.Disabled.equals(state)) {
+ profileSelection.setSelected(true);
+ }
+ }
+
+
+ private void refresh() {
+ profileTableViewer.refresh();
+ updateProfilesAsText();
+ }
+
+
private class ChangeProfileStateAction extends Action {
private final ProfileState state;
@@ -517,14 +527,8 @@
.getSelection();
if (!selection.isEmpty()) {
final ProfileSelection entry = (ProfileSelection) selection.getFirstElement();
- entry.setActivationState(state);
- profileTableViewer.setChecked(entry, true);
- profileTableViewer.setGrayed(entry, false);
- if (ProfileState.Disabled.equals(state)) {
- entry.setSelected(true);
- }
- updateProfilesAsText();
- profileTableViewer.refresh();
+ setActivationState(entry, state);
+ refresh();
}
super.run();
}
14 years, 8 months
JBoss Tools SVN: r33669 - in trunk/maven/tests/org.jboss.tools.maven.configurators.tests: projects/jaxrs/jaxrs-javaee-api and 16 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-08-08 06:06:53 -0400 (Mon, 08 Aug 2011)
New Revision: 33669
Added:
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-javaee-api/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-javaee-api/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-jersey/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-jersey/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-jersey/src/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-jersey/src/main/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-jersey/src/main/webapp/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-jersey/src/main/webapp/WEB-INF/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-jersey/src/main/webapp/WEB-INF/web.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-rest-10/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-rest-10/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-rest-10/src/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-rest-10/src/main/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-rest-10/src/main/webapp/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-rest-10/src/main/webapp/WEB-INF/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-rest-10/src/main/webapp/WEB-INF/web.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-resteasy/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-resteasy/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-resteasy/src/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-resteasy/src/main/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-resteasy/src/main/webapp/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-resteasy/src/main/webapp/WEB-INF/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-resteasy/src/main/webapp/WEB-INF/web.xml
Modified:
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JaxRsConfiguratorTest.java
Log:
JBIDE-9290 : Added test cases showing support for multiple JAXRS implementations support
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-javaee-api/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-javaee-api/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-javaee-api/pom.xml 2011-08-08 10:06:53 UTC (rev 33669)
@@ -0,0 +1,52 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.jboss.tools.maven.tests</groupId>
+ <artifactId>jaxrs-javaee-api</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>war</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax</groupId>
+ <artifactId>javaee-web-api</artifactId>
+ <version>6.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-jersey/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-jersey/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-jersey/pom.xml 2011-08-08 10:06:53 UTC (rev 33669)
@@ -0,0 +1,15 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools.maven.tests</groupId>
+ <artifactId>jaxrs-jersey</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ <version>1.7-ea05</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-jersey/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-jersey/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-jersey/src/main/webapp/WEB-INF/web.xml 2011-08-08 10:06:53 UTC (rev 33669)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <!-- This is a nice comment -->
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-rest-10/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-rest-10/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-rest-10/pom.xml 2011-08-08 10:06:53 UTC (rev 33669)
@@ -0,0 +1,32 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools.maven.tests</groupId>
+ <artifactId>jaxrs-rest-10</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>jaxrs-api</artifactId>
+ <version>1.0.0.GA</version>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <!-- You should seriously consider using a repository manager or declare
+ repositories in your settings.xml. See http://www.sonatype.com/people/2009/02/why-putting-repositories-in-your-p... -->
+ <repository>
+ <!-- The JBoss Public repository is a composite repository of several
+ major repositories. See http://community.jboss.org/wiki/MavenGettingStarted-Users -->
+ <id>jboss-public-repository</id>
+ <url>http://repository.jboss.org/nexus/content/groups/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <!-- You can disable snapshot resolution to speed up your builds -->
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+</project>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-rest-10/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-rest-10/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-rest-10/src/main/webapp/WEB-INF/web.xml 2011-08-08 10:06:53 UTC (rev 33669)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <!-- This is a nice comment -->
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-resteasy/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-resteasy/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-resteasy/pom.xml 2011-08-08 10:06:53 UTC (rev 33669)
@@ -0,0 +1,33 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools.maven.tests</groupId>
+ <artifactId>jaxrs-resteasy</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>jaxrs-api</artifactId>
+ <version>2.2-beta-1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <!-- You should seriously consider using a repository manager or declare
+ repositories in your settings.xml. See http://www.sonatype.com/people/2009/02/why-putting-repositories-in-your-p... -->
+ <repository>
+ <!-- The JBoss Public repository is a composite repository of several
+ major repositories. See http://community.jboss.org/wiki/MavenGettingStarted-Users -->
+ <id>jboss-public-repository</id>
+ <url>http://repository.jboss.org/nexus/content/groups/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <!-- You can disable snapshot resolution to speed up your builds -->
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+</project>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-resteasy/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-resteasy/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jaxrs/jaxrs-resteasy/src/main/webapp/WEB-INF/web.xml 2011-08-08 10:06:53 UTC (rev 33669)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <!-- This is a nice comment -->
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JaxRsConfiguratorTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JaxRsConfiguratorTest.java 2011-08-08 10:05:01 UTC (rev 33668)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JaxRsConfiguratorTest.java 2011-08-08 10:06:53 UTC (rev 33669)
@@ -15,25 +15,30 @@
@SuppressWarnings("restriction")
public class JaxRsConfiguratorTest extends AbstractMavenConfiguratorTest {
- /*@Test
- public void testJBIDE9290_supportMultipleJaxRsDependencies() throws Exception {
+ @Test
+ public void testJBIDE9290_supportMultipleJaxRsImplems() throws Exception {
IProject[] projects = importProjects("projects/jaxrs/",
new String[]{
"jaxrs-jersey/pom.xml",
- "jaxrs-resteasy/pom.xml"
+ "jaxrs-resteasy/pom.xml",
+ "jaxrs-javaee-api/pom.xml",
+ "jaxrs-rest-10/pom.xml",
},
new ResolverConfiguration());
waitForJobsToComplete(new NullProgressMonitor());
IProject jersey = projects[0];
- assertNoErrors(jersey);
assertIsJaxRsProject(jersey, JaxrsProjectConfigurator.JAX_RS_FACET_1_1);
IProject resteasy = projects[1];
- assertNoErrors(resteasy);
assertIsJaxRsProject(resteasy, JaxrsProjectConfigurator.JAX_RS_FACET_1_1);
+
+ IProject javaeeapi = projects[2];
+ assertIsJaxRsProject(javaeeapi, JaxrsProjectConfigurator.JAX_RS_FACET_1_1);
+ IProject rest_10 = projects[3];
+ assertIsJaxRsProject(rest_10, JaxrsProjectConfigurator.JAX_RS_FACET_1_0);
+
}
- */
@Test
@@ -60,6 +65,7 @@
private void assertIsJaxRsProject(IProject project,
IProjectFacetVersion expectedJaxRsVersion) throws Exception {
+ assertNoErrors(project);
IFacetedProject facetedProject = ProjectFacetsManager.create(project);
assertNotNull(project.getName() + " is not a faceted project", facetedProject);
assertEquals("Unexpected JAX-RS Version", expectedJaxRsVersion, facetedProject.getInstalledVersion(JaxrsProjectConfigurator.JAX_RS_FACET));
14 years, 8 months
JBoss Tools SVN: r33668 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-08 06:05:01 -0400 (Mon, 08 Aug 2011)
New Revision: 33668
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/SystemShowInTableAction.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreAction.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreActionDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java
Log:
JBIDE-9132 - exploire for remote stuff yay!
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2011-08-08 09:37:35 UTC (rev 33667)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2011-08-08 10:05:01 UTC (rev 33668)
@@ -48,13 +48,17 @@
* @return
*/
public static IJBossServerPublishMethodType getCurrentDeploymentMethodType(IServer server) {
- String type = server.getAttribute(IDeployableServer.SERVER_MODE, (String)null);
+ return getCurrentDeploymentMethodType(server, null);
+ }
+
+ public static IJBossServerPublishMethodType getCurrentDeploymentMethodType(IServer server, String defaultType) {
+ String type = server.getAttribute(IDeployableServer.SERVER_MODE, defaultType);
if( type != null ) {
return ExtensionManager.getDefault().getPublishMethod(type);
}
return null;
}
-
+
public static DeploymentPreferences loadPreferencesFromFile(IServer server) {
File f = getFile(server);
InputStream is = null;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2011-08-08 09:37:35 UTC (rev 33667)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2011-08-08 10:05:01 UTC (rev 33668)
@@ -50,6 +50,10 @@
return RSE_ID;
}
+ public void setBehaviour(DeployableServerBehavior beh) {
+ this.behaviour = beh;
+ }
+
private IFileServiceSubSystem fileSubSystem = null;
private IPath remoteRootFolder;
@Deprecated private IPath remoteTemporaryFolder;
@@ -123,7 +127,7 @@
return behaviour.getServer();
}
- private void ensureConnection(IProgressMonitor monitor) {
+ public void ensureConnection(IProgressMonitor monitor) {
if (fileSubSystem != null && !fileSubSystem.isConnected()) {
try {
fileSubSystem.connect(monitor, false);
@@ -132,6 +136,12 @@
}
}
public IPath getRemoteRootFolder() {
+ if( remoteRootFolder == null )
+ try {
+ loadRemoteDeploymentDetails();
+ } catch(CoreException ce) {
+ // TODO
+ }
return remoteRootFolder;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF 2011-08-08 09:37:35 UTC (rev 33667)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF 2011-08-08 10:05:01 UTC (rev 33668)
@@ -32,7 +32,8 @@
org.eclipse.rse.subsystems.shells.local;bundle-version="2.1.300",
org.eclipse.rse.subsystems.shells.ssh;bundle-version="2.1.300",
org.eclipse.rse.subsystems.shells.telnet;bundle-version="1.2.200",
- org.eclipse.ui.console;bundle-version="3.5.100"
+ org.eclipse.ui.console;bundle-version="3.5.100",
+ org.eclipse.ui.views;bundle-version="3.6.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Localization: plugin
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-08-08 09:37:35 UTC (rev 33667)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-08-08 10:05:01 UTC (rev 33668)
@@ -13,8 +13,10 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.wizard.WizardDialog;
@@ -23,6 +25,7 @@
import org.eclipse.rse.core.events.ISystemModelChangeListener;
import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.files.ui.dialogs.SystemRemoteFileDialog;
+import org.eclipse.rse.services.files.IHostFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.ui.wizards.newconnection.RSEMainNewConnectionWizard;
import org.eclipse.swt.SWT;
@@ -41,13 +44,19 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+import org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod;
import org.jboss.ide.eclipse.as.rse.core.RSEUtils;
import org.jboss.ide.eclipse.as.ui.UIUtil;
import org.jboss.ide.eclipse.as.ui.editor.DeploymentModuleOptionCompositeAssistant;
@@ -55,6 +64,7 @@
import org.jboss.ide.eclipse.as.ui.editor.ModuleDeploymentPage;
import org.jboss.ide.eclipse.as.ui.editor.ServerModeSection;
import org.jboss.ide.eclipse.as.ui.editor.ServerModeSectionComposite.ChangeServerPropertyCommand;
+import org.jboss.tools.as.wst.server.ui.xpl.ExploreActionProvider;
public class RSEDeploymentPreferenceUI implements IDeploymentTypeUI {
static {
@@ -65,6 +75,32 @@
return browseClicked4(new Shell(), h);
}
});
+ ExploreActionProvider.exploreBehaviorMap.put("rse", new ExploreActionProvider.IExploreBehavior() {
+ public void openExplorer(IServer server, IModule[] module) {
+ IDeployableServer ds = ServerConverter.getDeployableServer(server);
+ IPath remoteFolder = new Path(RSEUtils.getDeployRootFolder(ds));
+ IJBossServerPublishMethodType type = DeploymentPreferenceLoader.getCurrentDeploymentMethodType(server);
+ RSEPublishMethod method = (RSEPublishMethod)type.createPublishMethod();
+ method.setBehaviour(ServerConverter.getDeployableServerBehavior(server));
+ if( module != null ) {
+ remoteFolder = PublishUtil.getDeployPath(method, module, ds);
+ }
+ try {
+ method.getFileService();
+ method.ensureConnection(new NullProgressMonitor());
+ IHostFile file = method.getFileService().getFile(remoteFolder.removeLastSegments(1).toOSString(), remoteFolder.lastSegment(), new NullProgressMonitor());
+ String path = file.getAbsolutePath();
+
+ IRemoteFile rf = method.getFileServiceSubSystem().getRemoteFileObject(path, null);
+
+ SystemShowInTableAction act = new SystemShowInTableAction(Display.getDefault().getActiveShell());
+ act.setSelectedObject(rf);
+ act.run();
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
+ });
}
public RSEDeploymentPreferenceUI() {
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/SystemShowInTableAction.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/SystemShowInTableAction.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/SystemShowInTableAction.java 2011-08-08 10:05:01 UTC (rev 33668)
@@ -0,0 +1,108 @@
+/*******************************************************************************
+ * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Initial Contributors:
+ * The following IBM employees contributed to the Remote System Explorer
+ * component that contains this file: David McKnight, Kushal Munir,
+ * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
+ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+ *
+ * Contributors:
+ * {Name} (company) - description of contribution.
+ *******************************************************************************/
+
+package org.jboss.ide.eclipse.as.rse.ui;
+
+import java.util.Iterator;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.rse.internal.ui.SystemResources;
+import org.eclipse.rse.internal.ui.view.SystemTableViewPart;
+import org.eclipse.rse.ui.ISystemIconConstants;
+import org.eclipse.rse.ui.RSEUIPlugin;
+import org.eclipse.rse.ui.actions.SystemBaseAction;
+import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+
+
+/**
+ * This is the default action for showing a remote object in a table
+ */
+public class SystemShowInTableAction extends SystemBaseAction
+{
+ private Object _selected;
+
+ /**
+ * Constructor.
+ * @param shell Shell of parent window, used as the parent for the dialog.
+ * Can be null, but be sure to call setParent before the action is used (ie, run).
+ */
+ public SystemShowInTableAction(Shell parent)
+ {
+ super(SystemResources.ACTION_TABLE_LABEL,
+ SystemResources.ACTION_TABLE_TOOLTIP,
+ RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_SHOW_TABLE_ID),
+ parent);
+ setAvailableOffline(true);
+ }
+
+ /**
+ * Called when this action is selected from the popup menu.
+ */
+ public void run()
+ {
+ SystemTableViewPart viewPart = null;
+ IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ try
+ {
+ viewPart = (SystemTableViewPart) page.showView("org.eclipse.rse.ui.view.systemTableView", null, IWorkbenchPage.VIEW_CREATE); //$NON-NLS-1$
+ }
+ catch (PartInitException e)
+ {
+ return;
+ }
+ catch (Exception e)
+ {
+ return;
+ }
+
+ viewPart.setInput((IAdaptable) _selected);
+ page.activate(viewPart);
+
+ }
+
+ /**
+ * Called when the selection changes. The selection is checked to
+ * make sure this action can be performed on the selected object.
+ */
+ public boolean updateSelection(IStructuredSelection selection)
+ {
+ boolean enable = false;
+ Iterator e = selection.iterator();
+ Object selected = e.next();
+
+ if (selected != null && selected instanceof IAdaptable)
+ {
+ ISystemViewElementAdapter va = (ISystemViewElementAdapter) ((IAdaptable) selected).getAdapter(ISystemViewElementAdapter.class);
+ if (va.hasChildren((IAdaptable)selected))
+ {
+ _selected = selected;
+ enable = true;
+ }
+ }
+
+ return enable;
+ }
+
+ public void setSelectedObject(Object o) {
+ _selected = o;
+ }
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreAction.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreAction.java 2011-08-08 09:37:35 UTC (rev 33667)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreAction.java 2011-08-08 10:05:01 UTC (rev 33668)
@@ -10,47 +10,11 @@
************************************************************************************/
package org.jboss.ide.eclipse.as.ui.actions;
-import java.io.IOException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.ui.internal.view.servers.AbstractServerAction;
-import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
-import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
-
/**
* @author snjeza
*
*/
-
-public class ExploreAction extends AbstractServerAction {
-
- public ExploreAction(Shell shell, ISelectionProvider selectionProvider) {
- super(shell, selectionProvider, ExploreUtils.EXPLORE);
- setToolTipText(ExploreUtils.EXPLORE_DESCRIPTION);
- setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.EXPLORE_IMAGE));
- try {
- selectionChanged((IStructuredSelection) selectionProvider
- .getSelection());
- } catch (Exception ignore) {
- }
- }
-
- @Override
- public void perform(IServer server) {
- String deployDirectory = ExploreUtils.getDeployDirectory(server);
- if (deployDirectory != null && deployDirectory.length() > 0) {
- ExploreUtils.explore(deployDirectory);
- }
-
- }
-
- @Override
- public boolean accept(IServer server) {
- return ExploreUtils.canExplore(server);
- }
-
+@Deprecated
+public class ExploreAction {
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreActionDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreActionDelegate.java 2011-08-08 09:37:35 UTC (rev 33667)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreActionDelegate.java 2011-08-08 10:05:01 UTC (rev 33668)
@@ -10,53 +10,12 @@
************************************************************************************/
package org.jboss.ide.eclipse.as.ui.actions;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.server.core.IServer;
/**
* @author Snjeza
*
*/
-public class ExploreActionDelegate implements IObjectActionDelegate {
-
- private ISelection fCurrentSelection;
+@Deprecated
+public class ExploreActionDelegate{
- /* (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
- */
-
- public void run(IAction action) {
- if (fCurrentSelection instanceof IStructuredSelection) {
- IStructuredSelection structuredSelection = (IStructuredSelection) fCurrentSelection;
- Object object = structuredSelection.getFirstElement();
- if (object instanceof IServer) {
- IServer server = (IServer) object;
- String deployDirectory = ExploreUtils.getDeployDirectory(server);
- if (deployDirectory != null && deployDirectory.length() > 0) {
- ExploreUtils.explore(deployDirectory);
- }
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
- */
-
- public void selectionChanged(IAction action, ISelection selection) {
- fCurrentSelection= selection;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
- */
-
- public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-
- }
-
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java 2011-08-08 09:37:35 UTC (rev 33667)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java 2011-08-08 10:05:01 UTC (rev 33668)
@@ -11,6 +11,7 @@
package org.jboss.tools.as.wst.server.ui.xpl;
import java.io.File;
+import java.util.HashMap;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jface.action.Action;
@@ -34,6 +35,44 @@
import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
import org.jboss.ide.eclipse.as.ui.actions.ExploreUtils;
public class ExploreActionProvider extends CommonActionProvider {
+ public static interface IExploreBehavior {
+ public void openExplorer(IServer server, IModule[] module);
+ }
+ public static HashMap<String, IExploreBehavior> exploreBehaviorMap = new HashMap<String, IExploreBehavior>();
+ static {
+ exploreBehaviorMap.put(LocalPublishMethod.LOCAL_PUBLISH_METHOD, new IExploreBehavior() {
+ public void openExplorer(IServer server, IModule[] module) {
+ if( module != null )
+ runExploreModuleServer(server, module);
+ else
+ runExploreServer(server);
+ }
+ public void runExploreServer(IServer server) {
+ String deployDirectory = ExploreUtils.getDeployDirectory(server);
+ if (deployDirectory != null && deployDirectory.length() > 0) {
+ ExploreUtils.explore(deployDirectory);
+ }
+ }
+
+ public void runExploreModuleServer(IServer server, IModule[] module) {
+ IPath path = getModuleDeployPath(server, module);
+ if (path != null) {
+ File file = path.toFile();
+ if (file.exists()) {
+ ExploreUtils.explore(file.getAbsolutePath());
+ }
+ }
+ }
+ private IPath getModuleDeployPath(IServer server, IModule[] module) {
+ IDeployableServer deployableServer = ServerConverter.getDeployableServer(server);
+ if( deployableServer != null )
+ return ExploreUtils.getDeployPath(deployableServer, module);
+ return null;
+ }
+ });
+ }
+
+
private ICommonActionExtensionSite actionSite;
private CommonViewer cv;
public ExploreActionProvider() {
@@ -66,54 +105,25 @@
exploreAction.setDescription(ExploreUtils.EXPLORE_DESCRIPTION);
exploreAction.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.EXPLORE_IMAGE));
}
-
+
private void runExplore() {
- if( getModuleServer() != null )
- runExploreModuleServer();
- else
- runExploreServer();
+ runExplore(getServer(), getModuleServer());
}
+ private void runExplore(IServer server, ModuleServer ms) {
+ String mode = getServer().getAttribute(IDeployableServer.SERVER_MODE, LocalPublishMethod.LOCAL_PUBLISH_METHOD);
+ IExploreBehavior beh = exploreBehaviorMap.get(mode);
+ beh.openExplorer(server, ms == null ? null : ms.module);
+ }
+
public void fillContextMenu(IMenuManager menu) {
- boolean enabled = false;
if( getModuleServer() != null )
menu.insertBefore(ServerActionProvider.CONTROL_MODULE_SECTION_END_SEPARATOR, exploreAction);
else
menu.insertBefore(ServerActionProvider.SERVER_ETC_SECTION_END_SEPARATOR, exploreAction);
- if( getServer() != null ) {
- String mode = getServer().getAttribute(IDeployableServer.SERVER_MODE, LocalPublishMethod.LOCAL_PUBLISH_METHOD);
- if( LocalPublishMethod.LOCAL_PUBLISH_METHOD.equals(mode)) {
- enabled = true;
- }
- }
- exploreAction.setEnabled(enabled);
+ exploreAction.setEnabled(true);
}
- public void runExploreServer() {
- String deployDirectory = ExploreUtils.getDeployDirectory(getServer());
- if (deployDirectory != null && deployDirectory.length() > 0) {
- ExploreUtils.explore(deployDirectory);
- }
- }
-
- public void runExploreModuleServer() {
- IPath path = getModuleDeployPath();
- if (path != null) {
- File file = path.toFile();
- if (file.exists()) {
- ExploreUtils.explore(file.getAbsolutePath());
- }
- }
- }
- private IPath getModuleDeployPath() {
- ModuleServer ms = getModuleServer();
- IModule[] module = ms.module;
- IDeployableServer deployableServer = ServerConverter.getDeployableServer(ms.server);
- if( deployableServer != null )
- return ExploreUtils.getDeployPath(deployableServer, module);
- return null;
- }
-
public IServer getServer() {
Object o = getSelection();
if (o instanceof IServer)
14 years, 8 months
JBoss Tools SVN: r33667 - in trunk/maven/plugins/org.jboss.tools.maven.jaxrs: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-08-08 05:37:35 -0400 (Mon, 08 Aug 2011)
New Revision: 33667
Modified:
trunk/maven/plugins/org.jboss.tools.maven.jaxrs/
trunk/maven/plugins/org.jboss.tools.maven.jaxrs/META-INF/MANIFEST.MF
Log:
JBIDE-9290 : forgot to commit the MANIFEST.MF changes
Property changes on: trunk/maven/plugins/org.jboss.tools.maven.jaxrs
___________________________________________________________________
Added: svn:ignore
+ target
Modified: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/META-INF/MANIFEST.MF 2011-08-08 09:16:51 UTC (rev 33666)
+++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/META-INF/MANIFEST.MF 2011-08-08 09:37:35 UTC (rev 33667)
@@ -17,3 +17,5 @@
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %Bundle-Vendor
+Export-Package: org.jboss.tools.maven.jaxrs,
+ org.jboss.tools.maven.jaxrs.configurators
14 years, 8 months
JBoss Tools SVN: r33666 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config.
by jbosstools-commits＠lists.jboss.org
Author: psrna
Date: 2011-08-08 05:16:51 -0400 (Mon, 08 Aug 2011)
New Revision: 33666
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java
Log:
NPE fixed
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java 2011-08-08 06:25:41 UTC (rev 33665)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java 2011-08-08 09:16:51 UTC (rev 33666)
@@ -91,8 +91,8 @@
String propFile = System.getProperty(SWTBOT_TEST_PROPERTIES_FILE,
null);
String configsDir=System.getProperty(CONFIGURATIONS_DIR,null);
- File configsDirFile=new File(configsDir);
if (configsDir != null) {
+ File configsDirFile=new File(configsDir);
if (!configsDirFile.exists()) {
throw new IOException(CONFIGURATIONS_DIR
+ " " + configsDir + " does not exist!");
14 years, 8 months