JBoss Tools SVN: r14020 - trunk/esb/docs/esb_ref_guide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2009-03-05 10:23:36 -0500 (Thu, 05 Mar 2009)
New Revision: 14020
Modified:
trunk/esb/docs/esb_ref_guide/en/modules/esb_support.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-449 - Eclipse wizards for ESB files description updated
Modified: trunk/esb/docs/esb_ref_guide/en/modules/esb_support.xml
===================================================================
--- trunk/esb/docs/esb_ref_guide/en/modules/esb_support.xml 2009-03-05 15:09:33 UTC (rev 14019)
+++ trunk/esb/docs/esb_ref_guide/en/modules/esb_support.xml 2009-03-05 15:23:36 UTC (rev 14020)
@@ -132,7 +132,23 @@
<para> Clicking <emphasis>
<property>Next</property>
</emphasis> brings you to the wizard page where you can select a ESB project example from the example list.
- Every ESB example has two projects, one is a ESB project and another is a Java project used to test the ESB project.</para>
+ Every ESB example has two projects, one is a ESB project and another is a Java project used to test the ESB project.</para>
+ <para>Here is a list of ready examples available:</para>
+
+ <itemizedlist>
+
+ <listitem><para><emphasis role="bold">JBoss ESB HelloWorld Example</emphasis> - demonstrates the minimal files necessary to make a basic ESB component execute as well as to prove that the ESB os properly configured.</para></listitem>
+ <listitem><para><emphasis role="bold">JBoss ESB HelloWorld Action 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><para><emphasis role="bold">JBoss ESB Web Service consumer1 Example</emphasis> - demonstrates how to consume a 181 Web Service in an ESB action.</para></listitem>
+ <listitem><para><emphasis role="bold">JBoss ESB Web Service producer Example</emphasis> - demonstrates how to deploy a JSR181 Webservice endpoint on JBossESB using the SOAPProcessor action.</para></listitem>
+ <listitem><para><emphasis role="bold">JBoss ESB Smooks CSV -> XML Example</emphasis> - demonstrates how to transform a comma separated value (CSV) file to an XML.</para></listitem>
+ <listitem><para><emphasis role="bold">JBoss ESB Smooks XML -> POJO Example</emphasis> - demonstrates the use of Smooks performing a simpe transformation by converting an XML file into Java POJOs.</para></listitem>
+ <listitem><para><emphasis role="bold">JBoss ESB Smooks XML -> XML date-manipulation Example</emphasis> - demonstrates how to manually define and apply a Message Transformation within JBoss ESB.</para></listitem>
+ <listitem><para><emphasis role="bold">JBoss ESB Smooks XML -> XML Example</emphasis> - a very basic example of how to manually define and apply a Message Transformation within JBoss ESB. It applies a very simple XSLT to a SampleOrder.xml message and prints the before and after XML to the console. </para></listitem>
+
+ </itemizedlist>
+
<figure>
<title>JBoss Tools ESB Project Examples</title>
<mediaobject>
@@ -142,8 +158,8 @@
</mediaobject>
</figure>
- <para>Select <emphasis><property>JBoss ESB HelloWorld Example</property> </emphasis> ESB and Client project, and then click
- <emphasis><property>Finish</property></emphasis>, then you will get two projects created. </para>
+ <para>We will take as our example <emphasis><property>JBoss ESB HelloWorld Example</property> </emphasis> ESB and Client project, choose them using the Ctrl button and then click
+ <emphasis><property>Finish</property></emphasis>. As a result you will get two projects created. </para>
<figure>
<title>JBoss ESB Project Examples: helloworld and helloworld_testclient</title>
<mediaobject>
15 years, 8 months
JBoss Tools SVN: r14019 - trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-03-05 10:09:33 -0500 (Thu, 05 Mar 2009)
New Revision: 14019
Modified:
trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/ELParserTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3701
Modified: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/ELParserTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/ELParserTest.java 2009-03-05 14:41:06 UTC (rev 14018)
+++ trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/ELParserTest.java 2009-03-05 15:09:33 UTC (rev 14019)
@@ -137,7 +137,7 @@
checkCorrectEL(t,"\\#{exprA}");
checkCorrectEL(t,"#{\"\\\"exprA\\\"\"}");
checkCorrectEL(t,"#{\"\\\"#\\\"\"}");
- checkCorrectEL(t,"#{’#’}"); //Why this is correct?
+ //checkCorrectEL(t,"#{’#’}"); //Why this is correct?
}
public void testElReferencesObjectProperties() {
15 years, 8 months
JBoss Tools SVN: r14018 - branches/jbosstools-3.0.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-03-05 09:41:06 -0500 (Thu, 05 Mar 2009)
New Revision: 14018
Modified:
branches/jbosstools-3.0.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
Log:
fix for JUnit test error
testSettingsPage Failure Settings page is not valid: Model source folder "/TestSeamSettingsPreferencesPage" does not exist.
junit.framework.AssertionFailedError: Settings page is not valid: Model source folder "/TestSeamSettingsPreferencesPage" does not exist.
at org.jboss.tools.seam.ui.test.preferences.SeamSettingsPreferencesPageTest.testSettingsPage(SeamSettingsPreferencesPageTest.java:104)
at junit.extensions.TestDecorator.basicRun(TestDecorator.java:24)
at junit.extensions.TestSetup$1.protect(TestSetup.java:21)
at junit.extensions.TestSetup.run(TestSetup.java:25)
Modified: branches/jbosstools-3.0.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
===================================================================
--- branches/jbosstools-3.0.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2009-03-05 12:52:57 UTC (rev 14017)
+++ branches/jbosstools-3.0.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2009-03-05 14:41:06 UTC (rev 14018)
@@ -688,7 +688,7 @@
public static IResource getJavaSourceRoot(IProject project) {
IJavaProject javaProject = getJavaProject(project);
- if(javaProject == null || !javaProject.isOpen()) return null;
+ if(javaProject == null) return null;
try {
IClasspathEntry[] es = javaProject.getResolvedClasspath(true);
for (int i = 0; i < es.length; i++) {
15 years, 8 months
JBoss Tools SVN: r14017 - trunk/esb/docs/esb_ref_guide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2009-03-05 07:52:57 -0500 (Thu, 05 Mar 2009)
New Revision: 14017
Modified:
trunk/esb/docs/esb_ref_guide/en/modules/esb_support.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-468 - details from what's new section added.
Modified: trunk/esb/docs/esb_ref_guide/en/modules/esb_support.xml
===================================================================
--- trunk/esb/docs/esb_ref_guide/en/modules/esb_support.xml 2009-03-05 12:09:24 UTC (rev 14016)
+++ trunk/esb/docs/esb_ref_guide/en/modules/esb_support.xml 2009-03-05 12:52:57 UTC (rev 14017)
@@ -189,6 +189,7 @@
<para>Thus, you have just added the ESB project to the JBoss server module list. Right click the JBoss Server and select <emphasis><property>Publish</property></emphasis> to publish the project on the server.
You can check the deploying result in the Console view.</para>
+ <para>The <emphasis><property>Run</property></emphasis> and <emphasis><property>Debug</property></emphasis> options work on ESB projects causing a (re)deploy for a user designated server.</para>
<para>You can also use the "Finger touch" for a quick restart of the project without restarting the server:</para>
<figure>
<title>Finger Touch button</title>
15 years, 8 months
JBoss Tools SVN: r14016 - in branches/jbosstools-3.0.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu: action and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2009-03-05 07:09:24 -0500 (Thu, 05 Mar 2009)
New Revision: 14016
Modified:
branches/jbosstools-3.0.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java
branches/jbosstools-3.0.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/VpeTextOperationAction.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3922
Modified: branches/jbosstools-3.0.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java
===================================================================
--- branches/jbosstools-3.0.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java 2009-03-05 10:59:53 UTC (rev 14015)
+++ branches/jbosstools-3.0.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java 2009-03-05 12:09:24 UTC (rev 14016)
@@ -232,9 +232,9 @@
manager.add(new Separator());
}
- manager.add(new VpeTextOperationAction(CUT_ACTION, ActionFactory.CUT.getId(), node, pageContext));
- manager.add(new VpeTextOperationAction(COPY_ACTION, ActionFactory.COPY.getId(), node, pageContext));
- manager.add(new VpeTextOperationAction(PASTE_ACTION, ActionFactory.PASTE.getId(), node, pageContext));
+ manager.add(new VpeTextOperationAction(CUT_ACTION, ActionFactory.CUT.getId(), node, pageContext,sourceEditor));
+ manager.add(new VpeTextOperationAction(COPY_ACTION, ActionFactory.COPY.getId(), node, pageContext,sourceEditor));
+ manager.add(new VpeTextOperationAction(PASTE_ACTION, ActionFactory.PASTE.getId(), node, pageContext,sourceEditor));
} else if (node.getNodeType() == Node.TEXT_NODE) {
manager.add(new Action(CUT_ACTION) {
public void run() {
Modified: branches/jbosstools-3.0.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/VpeTextOperationAction.java
===================================================================
--- branches/jbosstools-3.0.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/VpeTextOperationAction.java 2009-03-05 10:59:53 UTC (rev 14015)
+++ branches/jbosstools-3.0.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/VpeTextOperationAction.java 2009-03-05 12:09:24 UTC (rev 14016)
@@ -11,6 +11,7 @@
package org.jboss.tools.vpe.editor.menu.action;
import org.eclipse.jface.action.Action;
+import org.eclipse.wst.sse.ui.StructuredTextEditor;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.util.SelectionUtil;
import org.w3c.dom.Node;
@@ -25,6 +26,7 @@
private String id = null;
private Node region = null;
private VpePageContext pageContext = null;
+ private StructuredTextEditor sourceEditor;
/**
* Constructor.
@@ -33,12 +35,14 @@
* @param id action id
* @param region the Node object
* @param pageContext the VpePageContext object
+ * @param sourceEditor
*/
- public VpeTextOperationAction(String name, String id, Node region, VpePageContext pageContext) {
+ public VpeTextOperationAction(String name, String id, Node region, VpePageContext pageContext, StructuredTextEditor sourceEditor) {
super(name);
this.id = id;
this.region = region;
this.pageContext = pageContext;
+ this.sourceEditor = sourceEditor;
}
/**
@@ -46,5 +50,6 @@
*/
public void run() {
SelectionUtil.setSourceSelection(pageContext, region);
+ this.sourceEditor.getAction(id).run();
}
}
\ No newline at end of file
15 years, 8 months
JBoss Tools SVN: r14015 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu: action and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2009-03-05 05:59:53 -0500 (Thu, 05 Mar 2009)
New Revision: 14015
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/VpeTextOperationAction.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3922
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java 2009-03-05 07:43:57 UTC (rev 14014)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java 2009-03-05 10:59:53 UTC (rev 14015)
@@ -232,9 +232,9 @@
manager.add(new Separator());
}
- manager.add(new VpeTextOperationAction(CUT_ACTION, ActionFactory.CUT.getId(), node, pageContext));
- manager.add(new VpeTextOperationAction(COPY_ACTION, ActionFactory.COPY.getId(), node, pageContext));
- manager.add(new VpeTextOperationAction(PASTE_ACTION, ActionFactory.PASTE.getId(), node, pageContext));
+ manager.add(new VpeTextOperationAction(CUT_ACTION, ActionFactory.CUT.getId(), node, pageContext,sourceEditor));
+ manager.add(new VpeTextOperationAction(COPY_ACTION, ActionFactory.COPY.getId(), node, pageContext,sourceEditor));
+ manager.add(new VpeTextOperationAction(PASTE_ACTION, ActionFactory.PASTE.getId(), node, pageContext,sourceEditor));
} else if (node.getNodeType() == Node.TEXT_NODE) {
manager.add(new Action(CUT_ACTION) {
public void run() {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/VpeTextOperationAction.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/VpeTextOperationAction.java 2009-03-05 07:43:57 UTC (rev 14014)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/VpeTextOperationAction.java 2009-03-05 10:59:53 UTC (rev 14015)
@@ -11,6 +11,7 @@
package org.jboss.tools.vpe.editor.menu.action;
import org.eclipse.jface.action.Action;
+import org.eclipse.wst.sse.ui.StructuredTextEditor;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.util.SelectionUtil;
import org.w3c.dom.Node;
@@ -25,6 +26,7 @@
private String id = null;
private Node region = null;
private VpePageContext pageContext = null;
+ private StructuredTextEditor sourceEditor;
/**
* Constructor.
@@ -33,12 +35,14 @@
* @param id action id
* @param region the Node object
* @param pageContext the VpePageContext object
+ * @param sourceEditor
*/
- public VpeTextOperationAction(String name, String id, Node region, VpePageContext pageContext) {
+ public VpeTextOperationAction(String name, String id, Node region, VpePageContext pageContext, StructuredTextEditor sourceEditor) {
super(name);
this.id = id;
this.region = region;
this.pageContext = pageContext;
+ this.sourceEditor = sourceEditor;
}
/**
@@ -46,5 +50,6 @@
*/
public void run() {
SelectionUtil.setSourceSelection(pageContext, region);
+ this.sourceEditor.getAction(id).run();
}
}
\ No newline at end of file
15 years, 8 months
JBoss Tools SVN: r14014 - trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-03-05 02:43:57 -0500 (Thu, 05 Mar 2009)
New Revision: 14014
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/EarArchiveType.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/WarArchiveType.java
Log:
JBIDE-3902 - checking for binary module
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/EarArchiveType.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/EarArchiveType.java 2009-03-05 07:43:38 UTC (rev 14013)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/EarArchiveType.java 2009-03-05 07:43:57 UTC (rev 14014)
@@ -17,6 +17,7 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jst.server.core.IEnterpriseApplication;
+import org.eclipse.jst.server.core.IJ2EEModule;
import org.eclipse.wst.server.core.IModule;
import org.jboss.ide.eclipse.archives.core.model.ArchivesModelException;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
@@ -93,16 +94,20 @@
IModule[] childModules = earModule.getModules();
for( int i = 0; i < childModules.length; i++ ) {
IModule child = childModules[i];
- IArchiveType type = ModulePackageTypeConverter.getPackageTypeFor(child);
- IArchive childPack;
- if( type == null ) {
- childPack = createGenericIArchive(child.getProject(), null, child.getProject().getName() + JAR_EXTENSION);
- } else {
- if( new Path(childModules[i].getName()).segmentCount() > 1 )
- continue;
- childPack = type.createDefaultConfiguration(child.getProject().getName(), new NullProgressMonitor());
+ IJ2EEModule j2eeChild = (IJ2EEModule)child.loadAdapter(IJ2EEModule.class, new NullProgressMonitor());
+ if( j2eeChild != null && !j2eeChild.isBinary()) {
+ IArchiveType type = ModulePackageTypeConverter.getPackageTypeFor(child);
+ IArchive childPack;
+ if( type == null ) {
+ childPack = createGenericIArchive(child.getProject(), null, child.getProject().getName() + JAR_EXTENSION);
+ } else {
+ if( new Path(childModules[i].getName()).segmentCount() > 1 )
+ continue;
+ childPack = type.createDefaultConfiguration(child.getProject().getName(), new NullProgressMonitor());
+ }
+ if( childPack != null )
+ topLevel.addChild(childPack);
}
- topLevel.addChild(childPack);
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/WarArchiveType.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/WarArchiveType.java 2009-03-05 07:43:38 UTC (rev 14013)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/WarArchiveType.java 2009-03-05 07:43:57 UTC (rev 14014)
@@ -18,12 +18,14 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jst.server.core.IJ2EEModule;
import org.eclipse.jst.server.core.IWebModule;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
@@ -217,7 +219,10 @@
IModule[] childModules = webModule.getModules();
for (int i = 0; i < childModules.length; i++) {
IModule child = childModules[i];
- lib.addChild(createGenericIArchive(child.getProject(), null, child.getProject().getName() + ".jar"));//$NON-NLS-1$
+ IJ2EEModule j2eeChild = (IJ2EEModule)child.loadAdapter(IJ2EEModule.class, new NullProgressMonitor());
+ if( j2eeChild != null && !j2eeChild.isBinary()) {
+ lib.addChild(createGenericIArchive(child.getProject(), null, child.getProject().getName() + ".jar"));//$NON-NLS-1$
+ }
}
return topLevel;
} catch( Exception e ) {
15 years, 8 months
JBoss Tools SVN: r14013 - branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-03-05 02:43:38 -0500 (Thu, 05 Mar 2009)
New Revision: 14013
Modified:
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/EarArchiveType.java
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/WarArchiveType.java
Log:
JBIDE-3902 - checking for binary module
Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/EarArchiveType.java
===================================================================
--- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/EarArchiveType.java 2009-03-05 07:01:49 UTC (rev 14012)
+++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/EarArchiveType.java 2009-03-05 07:43:38 UTC (rev 14013)
@@ -17,6 +17,7 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jst.server.core.IEnterpriseApplication;
+import org.eclipse.jst.server.core.IJ2EEModule;
import org.eclipse.wst.server.core.IModule;
import org.jboss.ide.eclipse.archives.core.model.ArchivesModelException;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
@@ -93,16 +94,20 @@
IModule[] childModules = earModule.getModules();
for( int i = 0; i < childModules.length; i++ ) {
IModule child = childModules[i];
- IArchiveType type = ModulePackageTypeConverter.getPackageTypeFor(child);
- IArchive childPack;
- if( type == null ) {
- childPack = createGenericIArchive(child.getProject(), null, child.getProject().getName() + JAR_EXTENSION);
- } else {
- if( new Path(childModules[i].getName()).segmentCount() > 1 )
- continue;
- childPack = type.createDefaultConfiguration(child.getProject().getName(), new NullProgressMonitor());
+ IJ2EEModule j2eeChild = (IJ2EEModule)child.loadAdapter(IJ2EEModule.class, new NullProgressMonitor());
+ if( j2eeChild != null && !j2eeChild.isBinary()) {
+ IArchiveType type = ModulePackageTypeConverter.getPackageTypeFor(child);
+ IArchive childPack;
+ if( type == null ) {
+ childPack = createGenericIArchive(child.getProject(), null, child.getProject().getName() + JAR_EXTENSION);
+ } else {
+ if( new Path(childModules[i].getName()).segmentCount() > 1 )
+ continue;
+ childPack = type.createDefaultConfiguration(child.getProject().getName(), new NullProgressMonitor());
+ }
+ if( childPack != null )
+ topLevel.addChild(childPack);
}
- topLevel.addChild(childPack);
}
}
Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/WarArchiveType.java
===================================================================
--- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/WarArchiveType.java 2009-03-05 07:01:49 UTC (rev 14012)
+++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/WarArchiveType.java 2009-03-05 07:43:38 UTC (rev 14013)
@@ -18,12 +18,14 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jst.server.core.IJ2EEModule;
import org.eclipse.jst.server.core.IWebModule;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
@@ -217,7 +219,10 @@
IModule[] childModules = webModule.getModules();
for (int i = 0; i < childModules.length; i++) {
IModule child = childModules[i];
- lib.addChild(createGenericIArchive(child.getProject(), null, child.getProject().getName() + ".jar"));//$NON-NLS-1$
+ IJ2EEModule j2eeChild = (IJ2EEModule)child.loadAdapter(IJ2EEModule.class, new NullProgressMonitor());
+ if( j2eeChild != null && !j2eeChild.isBinary()) {
+ lib.addChild(createGenericIArchive(child.getProject(), null, child.getProject().getName() + ".jar"));//$NON-NLS-1$
+ }
}
return topLevel;
} catch( Exception e ) {
15 years, 8 months
JBoss Tools SVN: r14012 - branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-03-05 02:01:49 -0500 (Thu, 05 Mar 2009)
New Revision: 14012
Modified:
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
fixing JBIDE-3756 again
Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2009-03-05 06:59:16 UTC (rev 14011)
+++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2009-03-05 07:01:49 UTC (rev 14012)
@@ -570,5 +570,13 @@
name="JBoss Server">
</providerUI>
</extension>
-
+
+ <extension
+ point="org.eclipse.debug.ui.launchConfigurationTypeImages">
+ <launchConfigurationTypeImage
+ configTypeID="org.jboss.ide.eclipse.as.core.server.startupConfiguration"
+ icon="icons/jboss.gif"
+ id="org.jboss.ide.eclipse.as.ui.launchConfigurationTypeImage1">
+ </launchConfigurationTypeImage>
+ </extension>
</plugin>
15 years, 8 months
JBoss Tools SVN: r14011 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-03-05 01:59:16 -0500 (Thu, 05 Mar 2009)
New Revision: 14011
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
fixing JBIDE-3756 again
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2009-03-05 06:47:29 UTC (rev 14010)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2009-03-05 06:59:16 UTC (rev 14011)
@@ -570,5 +570,13 @@
name="JBoss Server">
</providerUI>
</extension>
+ <extension
+ point="org.eclipse.debug.ui.launchConfigurationTypeImages">
+ <launchConfigurationTypeImage
+ configTypeID="org.jboss.ide.eclipse.as.core.server.startupConfiguration"
+ icon="icons/jboss.gif"
+ id="org.jboss.ide.eclipse.as.ui.launchConfigurationTypeImage1">
+ </launchConfigurationTypeImage>
+ </extension>
</plugin>
15 years, 8 months