JBoss Tools SVN: r32800 - workspace/grid/bpel-examples.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2011-07-11 05:59:47 -0400 (Mon, 11 Jul 2011)
New Revision: 32800
Modified:
workspace/grid/bpel-examples/HelloWorld.zip
Log:
JBIDE-9304: cleanup the bpel examples
Modified: workspace/grid/bpel-examples/HelloWorld.zip
===================================================================
(Binary files differ)
14 years, 9 months
JBoss Tools SVN: r32799 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-11 05:59:40 -0400 (Mon, 11 Jul 2011)
New Revision: 32799
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java
Log:
[JBIDE-9215] returned thread that was created
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java 2011-07-11 09:55:26 UTC (rev 32798)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java 2011-07-11 09:59:40 UTC (rev 32799)
@@ -118,11 +118,12 @@
* @param expectedState the state to wait for
* @param pollThread the poll thread to stop
* @param behaviour the server behavior to use.
+ * @return
* @return the new poll thread
*/
- public static void pollServer(final boolean expectedState, PollThread pollThread, DelegatingServerBehavior behaviour) {
+ public static PollThread pollServer(final boolean expectedState, PollThread pollThread, DelegatingServerBehavior behaviour) {
IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, behaviour.getServer());
- pollServer(expectedState, poller, pollThread, behaviour);
+ return pollServer(expectedState, poller, pollThread, behaviour);
}
/**
14 years, 9 months
JBoss Tools SVN: r32798 - workspace/grid/bpel-examples.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2011-07-11 05:55:26 -0400 (Mon, 11 Jul 2011)
New Revision: 32798
Modified:
workspace/grid/bpel-examples/BluePrint1.zip
workspace/grid/bpel-examples/BluePrint2.zip
workspace/grid/bpel-examples/BluePrint3.zip
workspace/grid/bpel-examples/BluePrint4.zip
workspace/grid/bpel-examples/BluePrint5.zip
workspace/grid/bpel-examples/Fault_Compensation.zip
workspace/grid/bpel-examples/HelloWorld.zip
workspace/grid/bpel-examples/Hello_World_Header_Ode.zip
workspace/grid/bpel-examples/Hello_World_Header_WSDL.zip
workspace/grid/bpel-examples/Loan_Approval.zip
workspace/grid/bpel-examples/Loan_Approval_WS.zip
workspace/grid/bpel-examples/Math.zip
workspace/grid/bpel-examples/Salutations.zip
workspace/grid/bpel-examples/Say_Hello.zip
workspace/grid/bpel-examples/Service_Handler.zip
workspace/grid/bpel-examples/Simple_Correlation.zip
workspace/grid/bpel-examples/Simple_Invoke.zip
workspace/grid/bpel-examples/Simple_Invoke_WS.zip
workspace/grid/bpel-examples/Simple_Pick.zip
workspace/grid/bpel-examples/While_Wait.zip
workspace/grid/bpel-examples/While_Wait_WS.zip
Log:
JBIDE-9304: cleanup the bpel examples
Modified: workspace/grid/bpel-examples/BluePrint1.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/BluePrint2.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/BluePrint3.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/BluePrint4.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/BluePrint5.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Fault_Compensation.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/HelloWorld.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Hello_World_Header_Ode.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Hello_World_Header_WSDL.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Loan_Approval.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Loan_Approval_WS.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Math.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Salutations.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Say_Hello.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Service_Handler.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Simple_Correlation.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Simple_Invoke.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Simple_Invoke_WS.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Simple_Pick.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/While_Wait.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/While_Wait_WS.zip
===================================================================
(Binary files differ)
14 years, 9 months
JBoss Tools SVN: r32797 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-11 05:44:05 -0400 (Mon, 11 Jul 2011)
New Revision: 32797
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java
Log:
[JBIDE-9215] removed unneeded method parameter
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java 2011-07-11 09:39:42 UTC (rev 32796)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java 2011-07-11 09:44:05 UTC (rev 32797)
@@ -116,14 +116,12 @@
* expected state and server behavior.
*
* @param expectedState the state to wait for
- * @param poller the poller to use to wait for the expected state
* @param pollThread the poll thread to stop
* @param behaviour the server behavior to use.
* @return the new poll thread
*/
- public static void pollServer(final boolean expectedState, PollThread pollThread, DelegatingServerBehavior behaviour,
- IServer server) {
- IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, server);
+ public static void pollServer(final boolean expectedState, PollThread pollThread, DelegatingServerBehavior behaviour) {
+ IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, behaviour.getServer());
pollServer(expectedState, poller, pollThread, behaviour);
}
14 years, 9 months
JBoss Tools SVN: r32796 - trunk/maven/plugins/org.jboss.tools.maven.ui.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-07-11 05:39:42 -0400 (Mon, 11 Jul 2011)
New Revision: 32796
Modified:
trunk/maven/plugins/org.jboss.tools.maven.ui/plugin.properties
trunk/maven/plugins/org.jboss.tools.maven.ui/plugin.xml
Log:
JBIDE-9321: made the JBoss repos available via autocompletion in the <repositories> element, in the pom editor
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/plugin.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/plugin.properties 2011-07-11 09:15:28 UTC (rev 32795)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/plugin.properties 2011-07-11 09:39:42 UTC (rev 32796)
@@ -1,3 +1,9 @@
Bundle-Vendor = JBoss by Red Hat
Bundle-Name = JBoss Maven Integration
-JBoss_Maven_Integration = JBoss Maven Integration
\ No newline at end of file
+JBoss_Maven_Integration = JBoss Maven Integration
+Maven_Profiles = Maven Profiles
+Select_Maven_Profiles= Select Maven Profiles
+JBoss_Public_Repo_name=JBoss Public repository
+JBoss_Public_Repo_description=The JBoss Public repository is a composite repository of several major repositories
+JBoss_Releases_Repo_name=JBoss Releases repository
+JBoss_Releases_Repo_description=The JBoss Releases repository mostly contains JBoss projects artifacts
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/plugin.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/plugin.xml 2011-07-11 09:15:28 UTC (rev 32795)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/plugin.xml 2011-07-11 09:39:42 UTC (rev 32796)
@@ -34,12 +34,12 @@
point="org.eclipse.ui.commands">
<category
id="org.jboss.tools.maven.ui.commands.profiles"
- name="Maven Profiles">
+ name="%Maven_Profiles">
</category>
<command
categoryId="org.jboss.tools.maven.ui.commands.profiles"
id="org.jboss.tools.maven.ui.commands.selectMavenProfileCommand"
- name="Select Maven Profiles">
+ name="%Select_Maven_Profiles">
</command>
</extension>
@@ -63,7 +63,7 @@
<!--FIXME I can't make the menu appear in the maven menu-->
<extension
point="org.eclipse.ui.menus">
- <menuContribution locationURI="popup:org.eclipse.m2e.core.mavenMenu?after=update" allPopups="true">
+ <menuContribution locationURI="popup:org.eclipse.m2e.core.mavenMenu?after=additions" allPopups="true">
<!--menuContribution locationURI="popup:common.new.menu?after=new" allPopups="true" -->
<command
commandId="org.jboss.tools.maven.ui.commands.selectMavenProfileCommand"
@@ -88,7 +88,7 @@
commandId="org.jboss.tools.maven.ui.commands.selectMavenProfileCommand"
icon="icons/maven-profiles.gif"
id="org.jboss.tools.maven.ui.toolbars.selectMavenProfilesCommand"
- tooltip="Select Maven Profiles">
+ tooltip="%Select_Maven_Profiles">
</command>
</toolbar>
</menuContribution>
@@ -109,4 +109,48 @@
</with>
</definition>
</extension>
+
+ <extension point="org.eclipse.ui.editors.templates">
+ <template id="org.jboss.tools.maven.editor.xml.templates.repository.jboss.public"
+ contextTypeId="org.eclipse.m2e.editor.xml.templates.contextType.repositories"
+ name="%JBoss_Public_Repo_name"
+ description="%JBoss_Public_Repo_description">
+ <pattern> <!-- 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>${cursor}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></pattern>
+ </template>
+ </extension>
+ <extension point="org.eclipse.ui.editors.templates">
+ <template id="org.jboss.tools.maven.editor.xml.templates.repository.jboss.releases"
+ contextTypeId="org.eclipse.m2e.editor.xml.templates.contextType.repositories"
+ name="%JBoss_Releases_Repo_name"
+ description="%JBoss_Releases_Repo_description">
+ <pattern> <!-- 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 Release repository mostly contains JBoss projects artifacts.
+ See http://community.jboss.org/wiki/MavenGettingStarted-Users -->
+ <id>${cursor}jboss-releases-repository</id>
+ <url>https://repository.jboss.org/nexus/content/repositories/releases/&...
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository></pattern>
+ </template>
+ </extension>
</plugin>
14 years, 9 months
JBoss Tools SVN: r32795 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-11 05:15:28 -0400 (Mon, 11 Jul 2011)
New Revision: 32795
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java
Log:
[JBIDE-9215] corrected error reporting (was: twice the root cause, now: user error & the root cause)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java 2011-07-11 09:11:23 UTC (rev 32794)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java 2011-07-11 09:15:28 UTC (rev 32795)
@@ -22,17 +22,14 @@
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
-import org.jboss.ide.eclipse.as.core.server.internal.IJBossBehaviourDelegate;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties;
-import org.jboss.ide.eclipse.as.core.util.ArgsUtil;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils;
import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
-import org.jboss.ide.eclipse.as.core.util.ServerUtil;
import org.jboss.ide.eclipse.as.core.util.ThreadUtils;
public class RSEJBoss7StartLaunchDelegate extends AbstractRSELaunchDelegate {
@@ -97,40 +94,17 @@
}
private String getDefaultStopCommand(IServer server, boolean errorOnFail) throws CoreException {
- String rseHome = RSEUtils.getRSEHomeDir(server, errorOnFail);
-
- String stop = new Path(rseHome)
- .append(IJBossRuntimeResourceConstants.BIN)
- .append(IJBossRuntimeResourceConstants.SHUTDOWN_SH).toString()
- + IJBossRuntimeConstants.SPACE;
-
- // Pull args from single utility method
- // stop += StopLaunchConfiguration.getDefaultArgs(jbs);
- IJBossBehaviourDelegate delegate = ServerUtil.checkedGetBehaviorDelegate(server);
- stop += delegate.getDefaultStopArguments();
- return stop;
+ return null;
}
private String getDefaultLaunchCommand(ILaunchConfiguration config) throws CoreException {
String serverId = JBossLaunchConfigProperties.getServerId(config);
JBossServer jbossServer = ServerConverter.checkedFindJBossServer(serverId);
- String rseHome = jbossServer.getServer().getAttribute(RSEUtils.RSE_SERVER_HOME_DIR, "");
+ String rseHome = RSEUtils.getRSEHomeDir(jbossServer.getServer());
// initialize startup command to something reasonable
String currentArgs = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, ""); //$NON-NLS-1$
String currentVMArgs = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, ""); //$NON-NLS-1$
- currentVMArgs = ArgsUtil.setArg(currentVMArgs, null,
- IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.ENDORSED_DIRS,
- new Path(rseHome).append(
- IJBossRuntimeResourceConstants.LIB).append(
- IJBossRuntimeResourceConstants.ENDORSED).toOSString(), true);
-
- String libPath = new Path(rseHome).append(IJBossRuntimeResourceConstants.BIN)
- .append(IJBossRuntimeResourceConstants.NATIVE).toOSString();
- currentVMArgs = ArgsUtil.setArg(currentVMArgs, null,
- IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.JAVA_LIB_PATH,
- libPath, true);
-
String cmd = "java " + currentVMArgs + " -classpath " +
new Path(rseHome).append(IJBossRuntimeResourceConstants.BIN).append(
IJBossRuntimeResourceConstants.START_JAR).toString() + IJBossRuntimeConstants.SPACE +
14 years, 9 months
JBoss Tools SVN: r32794 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-11 05:11:23 -0400 (Mon, 11 Jul 2011)
New Revision: 32794
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java
Log:
[JBIDE-9215] corrected comment
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java 2011-07-11 09:04:32 UTC (rev 32793)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java 2011-07-11 09:11:23 UTC (rev 32794)
@@ -37,8 +37,8 @@
IHostShell shell = model.createStartupShell("/", command, new String[] {}, new NullProgressMonitor());
addShellOutputListener(shell);
} catch (SystemMessageException sme) {
- behavior.setServerStopped(); // Not sure when this comes, but we should
- // try to keep track
+ // could not connect to remote system
+ behavior.setServerStopped();
throw new CoreException(new Status(IStatus.ERROR,
org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID,
sme.getMessage(), sme));
14 years, 9 months
JBoss Tools SVN: r32793 - workspace/grid/bpel-examples.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2011-07-11 05:04:32 -0400 (Mon, 11 Jul 2011)
New Revision: 32793
Modified:
workspace/grid/bpel-examples/BluePrint1.zip
workspace/grid/bpel-examples/BluePrint2.zip
workspace/grid/bpel-examples/BluePrint3.zip
workspace/grid/bpel-examples/BluePrint4.zip
workspace/grid/bpel-examples/BluePrint5.zip
workspace/grid/bpel-examples/Fault_Compensation.zip
workspace/grid/bpel-examples/HelloWorld.zip
workspace/grid/bpel-examples/Hello_World_Header_Ode.zip
workspace/grid/bpel-examples/Hello_World_Header_WSDL.zip
workspace/grid/bpel-examples/Loan_Approval.zip
workspace/grid/bpel-examples/Loan_Approval_WS.zip
workspace/grid/bpel-examples/Math.zip
workspace/grid/bpel-examples/Salutations.zip
workspace/grid/bpel-examples/Say_Hello.zip
workspace/grid/bpel-examples/Service_Handler.zip
workspace/grid/bpel-examples/Simple_Correlation.zip
workspace/grid/bpel-examples/Simple_Invoke.zip
workspace/grid/bpel-examples/Simple_Invoke_WS.zip
workspace/grid/bpel-examples/Simple_Pick.zip
workspace/grid/bpel-examples/While_Wait.zip
workspace/grid/bpel-examples/While_Wait_WS.zip
Log:
JBIDE-9304: cleanup the bpel examples
Modified: workspace/grid/bpel-examples/BluePrint1.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/BluePrint2.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/BluePrint3.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/BluePrint4.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/BluePrint5.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Fault_Compensation.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/HelloWorld.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Hello_World_Header_Ode.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Hello_World_Header_WSDL.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Loan_Approval.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Loan_Approval_WS.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Math.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Salutations.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Say_Hello.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Service_Handler.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Simple_Correlation.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Simple_Invoke.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Simple_Invoke_WS.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/Simple_Pick.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/While_Wait.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/bpel-examples/While_Wait_WS.zip
===================================================================
(Binary files differ)
14 years, 9 months
JBoss Tools SVN: r32792 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-11 04:30:50 -0400 (Mon, 11 Jul 2011)
New Revision: 32792
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7StartLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSECorePlugin.java
Log:
[JBIDE-9215] corrected components that are registered to launch as7
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7StartLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7StartLaunchConfiguration.java 2011-07-11 07:50:01 UTC (rev 32791)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7StartLaunchConfiguration.java 2011-07-11 08:30:50 UTC (rev 32792)
@@ -21,14 +21,12 @@
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.internal.IStartup;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.server.internal.launch.IStartLaunchDelegate;
import org.jboss.ide.eclipse.as.core.server.internal.launch.IStartLaunchSetupParticipant;
-import org.jboss.ide.eclipse.as.core.server.internal.launch.LocalJBossStartLaunchDelegate;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
/**
@@ -41,7 +39,7 @@
static {
setupParticipants = new ArrayList<IStartLaunchSetupParticipant>();
- setupParticipants.add(new LocalJBossStartLaunchDelegate());
+ setupParticipants.add(new LocalJBoss7StartLaunchDelegate());
launchDelegates = new HashMap<String, IStartLaunchDelegate>();
launchDelegates.put(LocalPublishMethod.LOCAL_PUBLISH_METHOD, new LocalJBoss7StartLaunchDelegate());
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSECorePlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSECorePlugin.java 2011-07-11 07:50:01 UTC (rev 32791)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSECorePlugin.java 2011-07-11 08:30:50 UTC (rev 32792)
@@ -40,7 +40,7 @@
DelegatingJBoss7ServerBehavior.addDelegateMapping(RSEPublishMethod.RSE_ID, RSEJBoss7BehaviourDelegate.class);
DelegatingJBoss7StartLaunchConfiguration.addLaunchDelegateMapping(RSEPublishMethod.RSE_ID, new RSEJBoss7StartLaunchDelegate());
- DelegatingJBoss7StartLaunchConfiguration.addSetupLaunchParticipant(new RSEJBossStartLaunchDelegate());
+ DelegatingJBoss7StartLaunchConfiguration.addSetupLaunchParticipant(new RSEJBoss7StartLaunchDelegate());
}
14 years, 9 months
JBoss Tools SVN: r32791 - trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-07-11 03:50:01 -0400 (Mon, 11 Jul 2011)
New Revision: 32791
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java
Log:
JBIDE-9232 - ignoring jsf 1.x for now in classpath container.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2011-07-11 07:00:29 UTC (rev 32790)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2011-07-11 07:50:01 UTC (rev 32791)
@@ -12,10 +12,10 @@
package org.jboss.ide.eclipse.as.classpath.core.runtime;
import java.io.File;
+import java.io.FileFilter;
import java.text.MessageFormat;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
+import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -26,7 +26,6 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.internal.core.ClasspathEntry;
import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.jst.server.core.RuntimeClasspathProviderDelegate;
import org.eclipse.wst.server.core.IRuntime;
@@ -96,14 +95,6 @@
}
}
- public static class ClientAllFilter {
- public static boolean accepts(IPath path) {
- if( !path.lastSegment().endsWith(EXT_JAR)) return false;
- if( path.lastSegment().toLowerCase().endsWith("jaxb-xjc.jar")) return false; //$NON-NLS-1$
- return true;
- }
- }
-
public IClasspathEntry[] resolveClasspathContainer(IProject project, IRuntime runtime) {
if( runtime == null )
return new IClasspathEntry[0];
@@ -211,7 +202,8 @@
protected Set<Entry> get70(IPath location) {
Set<Entry> list = new HashSet<Entry>();
- addPaths(location.append(AS7_MODULES).append(JAVAX), list, true);
+ SimpleFileFilter filter = new SimpleFileFilter(new String[]{"jsf-api-1.2_13.jar", "jsf-impl-1.2_13.jar"}); // Problematic jar //$NON-NLS-1$
+ addPaths(location.append(AS7_MODULES).append(JAVAX), list, true, filter);
return list;
}
@@ -223,20 +215,37 @@
addPaths(folder, list, false);
}
+ protected class SimpleFileFilter implements FileFilter {
+ private List<String> ignore;
+ public SimpleFileFilter(String[] ignore) {
+ this.ignore = Arrays.asList(ignore);
+ }
+ public boolean accept(File pathname) {
+ if( !pathname.getName().endsWith(EXT_JAR)) return false;
+ boolean contains = ignore.contains(pathname.getName());
+ return !contains;
+ }
+ }
+
protected void addPaths(IPath folder, Set<Entry> list, boolean recurse) {
+ addPaths(folder, list, recurse, new SimpleFileFilter(new String[]{"jaxb-xjc.jar"})); //$NON-NLS-1$
+ }
+
+ protected void addPaths(IPath folder, Set<Entry> list, boolean recurse, FileFilter filter) {
if( folder.toFile().exists()) {
File f = folder.toFile();
if(f.isDirectory()) {
File[] asFiles = f.listFiles();
for( int i = 0; i < asFiles.length; i++ ) {
- if( asFiles[i].getName().endsWith(EXT_JAR) && ClientAllFilter.accepts(folder.append(asFiles[i].getName()))) {
+ if( filter == null || filter.accept(folder.append(asFiles[i].getName()).toFile())) {
addSinglePath(folder.append(asFiles[i].getName()), list);
} else if( recurse && asFiles[i].isDirectory()) {
- addPaths(folder.append(asFiles[i].getName()), list, true);
+ addPaths(folder.append(asFiles[i].getName()), list, true, filter);
}
}
} else { // item is a file, not a folder
- addSinglePath(folder, list);
+ if( filter == null || filter.accept(folder.toFile()))
+ addSinglePath(folder, list);
}
}
}
14 years, 9 months