JBoss Tools SVN: r33405 - trunk/as/plugins/org.jboss.ide.eclipse.as.core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-01 02:28:42 -0400 (Mon, 01 Aug 2011)
New Revision: 33405
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
Log:
AS7 renamed to 7.x
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2011-08-01 05:51:07 UTC (rev 33404)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2011-08-01 06:28:42 UTC (rev 33405)
@@ -28,9 +28,9 @@
jboss.version.60.description=JBoss Application Server 6.x
jboss.version.60.runtime.name=JBoss 6.x Runtime
-jboss.version.70.name=JBoss AS 7.0
-jboss.version.70.description=JBoss Application Server 7.0
-jboss.version.70.runtime.name=JBoss 7.0 Runtime
+jboss.version.70.name=JBoss AS 7.x
+jboss.version.70.description=JBoss Application Server 7.x
+jboss.version.70.runtime.name=JBoss 7.x Runtime
jboss.eap.version.43.name=JBoss Enterprise Application Platform 4.3
jboss.eap.version.43.description=JBoss Enterprise Application Platform (EAP) 4.3
13 years, 7 months
JBoss Tools SVN: r33404 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-01 01:51:07 -0400 (Mon, 01 Aug 2011)
New Revision: 33404
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller2.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java
Log:
JBIDE-9425 - tracing for launching, related to JBIDE-9243
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2011-08-01 05:47:42 UTC (rev 33403)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2011-08-01 05:51:07 UTC (rev 33404)
@@ -8,9 +8,10 @@
import java.util.List;
import java.util.Properties;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.core.server.IServerStatePoller.PollingException;
-import org.jboss.ide.eclipse.as.core.server.IServerStatePoller.RequiresInfoException;
+import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
@@ -122,8 +123,16 @@
return TIMEOUT_BEHAVIOR_FAIL;
}
- public boolean getCurrentStateSynchronous(IServer server) {
- return onePing(server);
+ public IStatus getCurrentStateSynchronous(IServer server) {
+ String url = getURL(server);
+ boolean b = onePing(url);
+ if( b ) {
+ Status s = new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID,
+ "Web Poller find a running server at url " + url); //$NON-NLS-1$
+ return s;
+ }
+ Status s = new Status(IStatus.INFO, JBossServerCorePlugin.PLUGIN_ID,
+ "Web Poller did not find a running server at url " + url); //$NON-NLS-1$
+ return s;
}
-
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller2.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller2.java 2011-08-01 05:47:42 UTC (rev 33403)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller2.java 2011-08-01 05:51:07 UTC (rev 33404)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.server;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.wst.server.core.IServer;
/**
@@ -32,5 +33,5 @@
*
* @return IServerStatePoller.SERVER_UP or SERVER_DOWN
*/
- public boolean getCurrentStateSynchronous(IServer server);
+ public IStatus getCurrentStateSynchronous(IServer server);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java 2011-08-01 05:47:42 UTC (rev 33403)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java 2011-08-01 05:51:07 UTC (rev 33404)
@@ -30,6 +30,7 @@
import org.jboss.ide.eclipse.as.core.ExtensionManager;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.Messages;
+import org.jboss.ide.eclipse.as.core.Trace;
import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller;
import org.jboss.ide.eclipse.as.core.server.IServerAlreadyStartedHandler;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
@@ -49,18 +50,26 @@
public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor)
throws CoreException {
DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
- if (!jbsBehavior.canStart(mode).isOK())
+ IStatus s = jbsBehavior.canStart(mode);
+
+ Trace.trace(Trace.STRING_FINEST, "Ensuring Server can start: " + s.getMessage()); //$NON-NLS-1$
+ if (!s.isOK())
throw new CoreException(jbsBehavior.canStart(mode));
if (LaunchCommandPreferences.isIgnoreLaunchCommand(jbsBehavior.getServer())) {
+ Trace.trace(Trace.STRING_FINEST, "Server is marked as ignore Launch. Marking as started."); //$NON-NLS-1$
jbsBehavior.setServerStarting();
jbsBehavior.setServerStarted();
return false;
}
+
+ Trace.trace(Trace.STRING_FINEST, "Checking if similar server is already up on the same ports."); //$NON-NLS-1$
boolean started = isServerStarted(jbsBehavior);
if (started) {
+ Trace.trace(Trace.STRING_FINEST, "A server is already started. Now handling the already started scenario."); //$NON-NLS-1$
return handleAlreadyStartedScenario(jbsBehavior);
}
+ Trace.trace(Trace.STRING_FINEST, "A full launch will now proceed."); //$NON-NLS-1$
return true;
}
@@ -75,8 +84,11 @@
// Need to be able to FORCE the poller to poll immediately
if( poller == null || !(poller instanceof IServerStatePoller2))
poller = new WebPortPoller();
- boolean started = ((IServerStatePoller2)poller).getCurrentStateSynchronous(jbsBehavior.getServer());
- return started;
+ IStatus started = ((IServerStatePoller2)poller).getCurrentStateSynchronous(jbsBehavior.getServer());
+ // Trace
+ Trace.trace(Trace.STRING_FINER, "Checking if a server is already started: " + started.getMessage()); //$NON-NLS-1$
+
+ return started.isOK();
}
protected boolean handleAlreadyStartedScenario( DelegatingServerBehavior jbsBehavior) {
@@ -90,6 +102,7 @@
return false;
}
}
+ Trace.trace(Trace.STRING_FINEST, "There is no handler available to prompt the user. The server will be set to started automatically. "); //$NON-NLS-1$
// force server to started mode
jbsBehavior.setServerStarting();
jbsBehavior.setServerStarted();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-08-01 05:47:42 UTC (rev 33403)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-08-01 05:51:07 UTC (rev 33404)
@@ -15,8 +15,11 @@
import java.util.List;
import java.util.Properties;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2;
@@ -132,9 +135,9 @@
return TIMEOUT_BEHAVIOR_FAIL;
}
- public boolean getCurrentStateSynchronous(final IServer server) {
+ public IStatus getCurrentStateSynchronous(final IServer server) {
try {
- return JBoss7ManagerUtil.executeWithService(new IServiceAware<Boolean>() {
+ Boolean result = JBoss7ManagerUtil.executeWithService(new IServiceAware<Boolean>() {
@Override
public Boolean execute(IJBoss7ManagerService service) throws Exception {
@@ -142,10 +145,21 @@
return state == JBoss7ServerState.RUNNING ? IServerStatePoller.SERVER_UP : IServerStatePoller.SERVER_DOWN;
}
}, server);
+ if( result.booleanValue()) {
+ Status s = new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID,
+ "A JBoss 7 Management Service on " + server.getHost() //$NON-NLS-1$
+ + ", port " + getManagementPort(server) + " has responded that the server is completely started."); //$NON-NLS-1$ //$NON-NLS-2$
+ return s;
+ }
+ Status s = new Status(IStatus.INFO, JBossServerCorePlugin.PLUGIN_ID,
+ "A JBoss 7 Management Service on " + server.getHost() //$NON-NLS-1$
+ + ", port " + getManagementPort(server) + " has responded that the server is not completely started."); //$NON-NLS-1$ //$NON-NLS-2$
+ return s;
} catch(Exception e) {
-e.printStackTrace();
- // ignore
+ Status s = new Status(IStatus.INFO, JBossServerCorePlugin.PLUGIN_ID,
+ "An attempt to reach the JBoss 7 Management Service on host " + server.getHost() //$NON-NLS-1$
+ + " and port " + getManagementPort(server) + " has resulted in an exception"); //$NON-NLS-1$ //$NON-NLS-2$
+ return s;
}
- return IServerStatePoller.SERVER_DOWN;
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java 2011-08-01 05:47:42 UTC (rev 33403)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java 2011-08-01 05:51:07 UTC (rev 33404)
@@ -13,7 +13,6 @@
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService;
-import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.osgi.framework.BundleContext;
public class JBoss7ManagerUtil {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java 2011-08-01 05:47:42 UTC (rev 33403)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java 2011-08-01 05:51:07 UTC (rev 33404)
@@ -29,7 +29,6 @@
import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
-import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
@@ -257,19 +256,24 @@
ServerLogger.getDefault().log(server,s);
}
- public boolean getCurrentStateSynchronous(IServer server) {
+ public IStatus getCurrentStateSynchronous(IServer server) {
JMXClassLoaderRepository.getDefault().addConcerned(server, this);
JMXPollerRunnable runnable2 = new JMXPollerRunnable();
JMXSafeRunner runner2 = new JMXSafeRunner(server);
try {
runner2.run(runnable);
int started2 = runnable2.result ? STATE_STARTED : STATE_TRANSITION;
- if( started2 == STATE_STARTED )
- return IServerStatePoller.SERVER_UP;
+ if( started2 == STATE_STARTED ) {
+ Status s = new Status(IStatus.OK, Activator.PLUGIN_ID,
+ "JMX Poller found a running server on " + server.getHost());
+ return s;
+ }
} catch(CoreException ce) {
} finally {
JMXClassLoaderRepository.getDefault().removeConcerned(server, this);
}
- return IServerStatePoller.SERVER_DOWN;
+ Status s = new Status(IStatus.INFO, Activator.PLUGIN_ID,
+ "JMX Poller did not find a running server on " + server.getHost());
+ return s;
}
-}
+}
\ No newline at end of file
13 years, 7 months
JBoss Tools SVN: r33403 - trunk/build/aggregate/soa-site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-01 01:47:42 -0400 (Mon, 01 Aug 2011)
New Revision: 33403
Modified:
trunk/build/aggregate/soa-site/build.xml
Log:
apply changes to ../site/build.xml to ../soa-site/build.xml to suppress using staging.previous URLs
Modified: trunk/build/aggregate/soa-site/build.xml
===================================================================
--- trunk/build/aggregate/soa-site/build.xml 2011-08-01 05:37:19 UTC (rev 33402)
+++ trunk/build/aggregate/soa-site/build.xml 2011-08-01 05:47:42 UTC (rev 33403)
@@ -276,30 +276,49 @@
<echo level="verbose">Got ${aggregate.zips.dir}/compositeArtifacts.xml</echo>
<xmlproperty file="${aggregate.zips.dir}/compositeArtifacts.xml" validate="false" collapseAttributes="true" />
<echo level="verbose">Found ${repository.children.size} contained repos to search</echo>
+
+ <!-- counter variable -->
+ <var name="counter" value="" />
<!-- foreach entry repository.children.child.location -->
<for param="location" list="${repository.children.child.location}">
<sequential>
+ <var name="counter" value="${counter}0" />
+ <var name="i" unset="true"/>
+ <length property="i" string="${counter}" />
<if>
- <available file="/home/hudson/static_build_env/jbds/builds/staging" type="dir" />
+ <not>
+ <contains string="@{location}" substring="/staging.previous/"/>
+ </not>
<then>
- <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="/home/hudson/static_build_env/jbds/builds/staging/" />
<if>
- <not>
- <available file="${location.cleaned}" />
- </not>
+ <available file="/home/hudson/static_build_env/jbds/builds/staging" type="dir" />
<then>
+ <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="/home/hudson/static_build_env/jbds/builds/staging/" />
+ <if>
+ <not>
+ <available file="${location.cleaned}" />
+ </not>
+ <then>
+ <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" />
+ </then>
+ </if>
+ </then>
+ <else>
<propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" />
- </then>
+ </else>
</if>
+ <echo level="error">[${i}/${repository.children.size}] Site URL = ${location.cleaned} (@{location})</echo>
+ <fetchZipsFromList repo="${location.cleaned}" />
</then>
<else>
- <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" />
+ <echo level="error">[${i}/${repository.children.size}] Skip @{location}</echo>
</else>
</if>
- <echo level="error">Site URL = ${location.cleaned} (@{location})</echo>
- <fetchZipsFromList repo="${location.cleaned}" />
</sequential>
</for>
+ <var name="counter" unset="true" />
+ <var name="i" unset="true"/>
+
<delete file="${aggregate.zips.dir}/compositeArtifacts.xml" quiet="true" />
</then>
<else>
13 years, 7 months
JBoss Tools SVN: r33402 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-01 01:37:19 -0400 (Mon, 01 Aug 2011)
New Revision: 33402
Modified:
trunk/build/publish.sh
Log:
instead of staging/FOO, staging.previous/FOO, and staging.previous/FOO.2, omit the FOO.2 folder to save space on disk
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2011-08-01 05:32:30 UTC (rev 33401)
+++ trunk/build/publish.sh 2011-08-01 05:37:19 UTC (rev 33402)
@@ -300,21 +300,27 @@
# echo -e "rmdir foobar" | sftp tools@filemgmt.jboss.org:/downloads_htdocs/tools/builds/staging.previous/
# rmdir /tmp/foobar
- # TODO: JBIDE-8667 move current to previous; move next to current
-
+ # JBIDE-8667 move current to previous; move next to current
if [[ ${DESTINATION##*@*:*} == "" ]]; then # user@server, do remote op
# create folders if not already there (could be empty)
echo -e "mkdir ${JOB_NAME}" | sftp $DESTINATION/builds/staging.previous/
- echo -e "mkdir ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/
+ #echo -e "mkdir ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/
- # purge contents of /builds/staging.previous/${JOB_NAME}.2 and remove empty dir
- mkdir -p /tmp/${JOB_NAME}.2
- rsync -arzq --delete /tmp/${JOB_NAME}.2 $DESTINATION/builds/staging.previous/
- echo -e "rmdir ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/
- rmdir /tmp/${JOB_NAME}.2
+ # IF using .2 folders, purge contents of /builds/staging.previous/${JOB_NAME}.2 and remove empty dir
+ # NOTE: comment out next section - should only purge one staging.previous/* folder
+ #mkdir -p /tmp/${JOB_NAME}.2
+ #rsync -arzq --delete /tmp/${JOB_NAME}.2 $DESTINATION/builds/staging.previous/
+ #echo -e "rmdir ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/
+ #rmdir /tmp/${JOB_NAME}.2
+ # OR, purge contents of /builds/staging.previous/${JOB_NAME} and remove empty dir
+ mkdir -p /tmp/${JOB_NAME}
+ rsync -arzq --delete /tmp/${JOB_NAME} $DESTINATION/builds/staging.previous/
+ echo -e "rmdir ${JOB_NAME}" | sftp $DESTINATION/builds/staging.previous/
+ rmdir /tmp/${JOB_NAME}
+
# move contents of /builds/staging.previous/${JOB_NAME} into /builds/staging.previous/${JOB_NAME}.2
- echo -e "rename ${JOB_NAME} ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/
+ #echo -e "rename ${JOB_NAME} ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/
# move contents of /builds/staging/${JOB_NAME} into /builds/staging.previous/${JOB_NAME}
echo -e "rename ${JOB_NAME} ../staging.previous/${JOB_NAME}" | sftp $DESTINATION/builds/staging/
@@ -323,13 +329,18 @@
echo -e "rename ${JOB_NAME}.next ${JOB_NAME}" | sftp $DESTINATION/builds/staging/
else # work locally
# create folders if not already there (could be empty)
- mkdir -p $DESTINATION/builds/staging.previous/${JOB_NAME} $DESTINATION/builds/staging.previous/${JOB_NAME}.2
+ mkdir -p $DESTINATION/builds/staging.previous/${JOB_NAME}
+ #mkdir -p $DESTINATION/builds/staging.previous/${JOB_NAME}.2
# purge contents of /builds/staging.previous/${JOB_NAME}.2 and remove empty dir
- rm -fr $DESTINATION/builds/staging.previous/${JOB_NAME}.2/
+ # NOTE: comment out next section - should only purge one staging.previous/* folder
+ #rm -fr $DESTINATION/builds/staging.previous/${JOB_NAME}.2/
+
+ # OR, purge contents of /builds/staging.previous/${JOB_NAME} and remove empty dir
+ rm -fr $DESTINATION/builds/staging.previous/${JOB_NAME}/
# move contents of /builds/staging.previous/${JOB_NAME} into /builds/staging.previous/${JOB_NAME}.2
- mv $DESTINATION/builds/staging.previous/${JOB_NAME} $DESTINATION/builds/staging.previous/${JOB_NAME}.2
+ #mv $DESTINATION/builds/staging.previous/${JOB_NAME} $DESTINATION/builds/staging.previous/${JOB_NAME}.2
# move contents of /builds/staging/${JOB_NAME} into /builds/staging.previous/${JOB_NAME}
mv $DESTINATION/builds/staging/${JOB_NAME} $DESTINATION/builds/staging.previous/${JOB_NAME}
@@ -354,7 +365,7 @@
<children size='3'>
<child location='../../../staging/${JOB_NAME}/all/repo/'/>
<child location='../../../staging.previous/${JOB_NAME}/all/repo/'/>
-<child location='../../../staging.previous/${JOB_NAME}.2/all/repo/'/>
+<!-- <child location='../../../staging.previous/${JOB_NAME}.2/all/repo/'/> -->
</children>
</repository>"
echo $metadata >> ${STAGINGDIR}/all/compositeContent.xml
13 years, 7 months
JBoss Tools SVN: r33401 - in trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2011-08-01 01:32:30 -0400 (Mon, 01 Aug 2011)
New Revision: 33401
Modified:
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.properties
Log:
JBIDE-9432:modify the provider and plugin name
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF 2011-08-01 05:18:52 UTC (rev 33400)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF 2011-08-01 05:32:30 UTC (rev 33401)
@@ -1,12 +1,13 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.jboss.tools.bpel.cheatsheet;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Activator: org.jboss.tools.bpel.cheatsheet.Activator
+Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.ui.cheatsheets
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-Vendor: %providerName
+Bundle-Vendor: %PLUGIN_PROVIDER
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.properties
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.properties 2011-08-01 05:18:52 UTC (rev 33400)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.properties 2011-08-01 05:32:30 UTC (rev 33401)
@@ -8,5 +8,5 @@
# Contributors:
# JBoss by Red Hat - Initial implementation.
###############################################################################
-pluginName=BPEL Cheatsheet
-providerName=JBoss by Red Hat
\ No newline at end of file
+PLUGIN_NAME=JBoss BPEL Cheatsheet
+PLUGIN_PROVIDER=JBoss by Red Hat
\ No newline at end of file
13 years, 7 months
JBoss Tools SVN: r33400 - trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-01 01:18:52 -0400 (Mon, 01 Aug 2011)
New Revision: 33400
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/META-INF/MANIFEST.MF
Log:
/JBIDE-9431 - provider name and plugin name fix
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/META-INF/MANIFEST.MF 2011-08-01 05:14:52 UTC (rev 33399)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/META-INF/MANIFEST.MF 2011-08-01 05:18:52 UTC (rev 33400)
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Integration
+Bundle-Name: JBoss AS Server Adapter / JMX Integration
Bundle-SymbolicName: org.jboss.ide.eclipse.as.jmx.integration;singleton:=true
Bundle-Version: 2.3.0.qualifier
Bundle-Activator: org.jboss.ide.eclipse.as.jmx.integration.Activator
@@ -16,3 +16,4 @@
org.jboss.ide.eclipse.as.ui;bundle-version="2.2.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Vendor: JBoss by Red Hat
13 years, 7 months
JBoss Tools SVN: r33399 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-01 01:14:52 -0400 (Mon, 01 Aug 2011)
New Revision: 33399
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
Log:
JBIDE-9429 - snjezana's patch committed
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java 2011-08-01 04:03:55 UTC (rev 33398)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java 2011-08-01 05:14:52 UTC (rev 33399)
@@ -53,7 +53,7 @@
"AS", //$NON-NLS-1$
"Application Server", //$NON-NLS-1$
BIN_PATH+File.separatorChar + TWIDDLE_JAR_NAME,
- new String[]{V6_0,V5_1, V5_0, V4_2, V4_0, V3_2}, new ASServerTypeCondition());
+ new String[]{V6_0, V6_1, V5_1, V5_0, V4_2, V4_0, V3_2}, new ASServerTypeCondition());
public static final JBossServerType AS7 = new JBossServerType(
"AS", //$NON-NLS-1$
@@ -64,7 +64,7 @@
"as" + File.separatorChar + //$NON-NLS-1$
"server" + File.separatorChar + //$NON-NLS-1$
"main", //$NON-NLS-1$
- new String[]{V7_0,}, new AS7ServerTypeCondition());
+ new String[]{V7_0,V7_1}, new AS7ServerTypeCondition());
public static final JBossServerType EAP_STD = new JBossServerType(
"EAP_STD",//$NON-NLS-1$
@@ -106,7 +106,7 @@
UNKNOWN_STR,
UNKNOWN_STR,
"",//$NON-NLS-1$
- new String[]{V7_0, V6_0, V5_1, V5_0, V4_3, V4_2, V4_0, V3_2}, null);
+ new String[]{V7_0, V7_1, V6_0, V6_1, V5_1, V5_0, V4_3, V4_2, V4_0, V3_2}, null);
public String toString() {
return id;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-08-01 04:03:55 UTC (rev 33398)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-08-01 05:14:52 UTC (rev 33399)
@@ -54,6 +54,7 @@
public static final String V6_0 = "6.0"; //$NON-NLS-1$
public static final String V6_1 = "6.1"; //$NON-NLS-1$
public static final String V7_0 = "7.0"; //$NON-NLS-1$
+ public static final String V7_1 = "7.1"; //$NON-NLS-1$
/* Files or folders inside the TOOLING */
13 years, 7 months
JBoss Tools SVN: r33398 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-01 00:03:55 -0400 (Mon, 01 Aug 2011)
New Revision: 33398
Modified:
trunk/build/aggregate/site/build.xml
Log:
don't collect URLs with /staging.previous/ in them; also, add loop counter so we know where we're at as we parse 66 URLs in the composite*.xml files
Modified: trunk/build/aggregate/site/build.xml
===================================================================
--- trunk/build/aggregate/site/build.xml 2011-08-01 03:20:03 UTC (rev 33397)
+++ trunk/build/aggregate/site/build.xml 2011-08-01 04:03:55 UTC (rev 33398)
@@ -276,30 +276,49 @@
<echo level="verbose">Got ${aggregate.zips.dir}/compositeArtifacts.xml</echo>
<xmlproperty file="${aggregate.zips.dir}/compositeArtifacts.xml" validate="false" collapseAttributes="true" />
<echo level="verbose">Found ${repository.children.size} contained repos to search</echo>
+
+ <!-- counter variable -->
+ <var name="counter" value="" />
<!-- foreach entry repository.children.child.location -->
<for param="location" list="${repository.children.child.location}">
<sequential>
+ <var name="counter" value="${counter}0" />
+ <var name="i" unset="true"/>
+ <length property="i" string="${counter}" />
<if>
- <available file="/home/hudson/static_build_env/jbds/builds/staging" type="dir" />
+ <not>
+ <contains string="@{location}" substring="/staging.previous/"/>
+ </not>
<then>
- <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="/home/hudson/static_build_env/jbds/builds/staging/" />
<if>
- <not>
- <available file="${location.cleaned}" />
- </not>
+ <available file="/home/hudson/static_build_env/jbds/builds/staging" type="dir" />
<then>
+ <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="/home/hudson/static_build_env/jbds/builds/staging/" />
+ <if>
+ <not>
+ <available file="${location.cleaned}" />
+ </not>
+ <then>
+ <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" />
+ </then>
+ </if>
+ </then>
+ <else>
<propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" />
- </then>
+ </else>
</if>
+ <echo level="error">[${i}/${repository.children.size}] Site URL = ${location.cleaned} (@{location})</echo>
+ <fetchZipsFromList repo="${location.cleaned}" />
</then>
<else>
- <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" />
+ <echo level="error">[${i}/${repository.children.size}] Skip @{location}</echo>
</else>
</if>
- <echo level="error">Site URL = ${location.cleaned} (@{location})</echo>
- <fetchZipsFromList repo="${location.cleaned}" />
</sequential>
</for>
+ <var name="counter" unset="true" />
+ <var name="i" unset="true"/>
+
<delete file="${aggregate.zips.dir}/compositeArtifacts.xml" quiet="true" />
</then>
<else>
13 years, 7 months
JBoss Tools SVN: r33397 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: template and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-07-31 23:20:03 -0400 (Sun, 31 Jul 2011)
New Revision: 33397
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
Log:
https://issues.jboss.org/browse/JBIDE-9339 VPE should have better exceptions handling related to third party templates
added safe wrapper for template's calls
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2011-08-01 00:34:11 UTC (rev 33396)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2011-08-01 03:20:03 UTC (rev 33397)
@@ -525,7 +525,7 @@
}
//Create a composite to the Editor
- Composite cmpEd = new Composite (cmpEdTl, SWT.NATIVE);
+ final Composite cmpEd = new Composite (cmpEdTl, SWT.NATIVE);
GridLayout layoutEd = new GridLayout(1, false);
layoutEd.marginBottom = 0;
layoutEd.marginHeight = 1;
@@ -587,11 +587,15 @@
}
public void completed(ProgressEvent event) {
- if(MozillaEditor.this.getXulRunnerEditor().getWebBrowser()!=null){
- //process this code only in case when editor hasn't been disposed,
- //see https://jira.jboss.org/browse/JBIDE-6373
- MozillaEditor.this.onLoadWindow();
- xulRunnerEditor.getBrowser().removeProgressListener(this);
+ try {
+ if (MozillaEditor.this.getXulRunnerEditor().getWebBrowser() != null) {
+ //process this code only in case when editor hasn't been disposed,
+ //see https://jira.jboss.org/browse/JBIDE-6373
+ MozillaEditor.this.onLoadWindow();
+ xulRunnerEditor.getBrowser().removeProgressListener(this);
+ }
+ } catch (Exception ex) {
+ showXulRunnerError(cmpEd, ex);
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2011-08-01 00:34:11 UTC (rev 33396)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2011-08-01 03:20:03 UTC (rev 33397)
@@ -1053,6 +1053,7 @@
}
if (template != null) {
template.init(templateElement, caseSensitive);
+ template = new VpeTemplateSafeWrapper(template);
}
return template;
}
13 years, 7 months
JBoss Tools SVN: r33396 - trunk/bpel/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-07-31 20:34:11 -0400 (Sun, 31 Jul 2011)
New Revision: 33396
Modified:
trunk/bpel/docs/reference/en-US/Book_Info.xml
trunk/bpel/docs/reference/en-US/additionalreqs.xml
trunk/bpel/docs/reference/en-US/tasks.xml
Log:
updated for TOOLSDOC-184
Modified: trunk/bpel/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/bpel/docs/reference/en-US/Book_Info.xml 2011-08-01 00:18:24 UTC (rev 33395)
+++ trunk/bpel/docs/reference/en-US/Book_Info.xml 2011-08-01 00:34:11 UTC (rev 33396)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
- <pubsnumber>3</pubsnumber>
+ <pubsnumber>4</pubsnumber>
<abstract>
<para>The JBoss BPEL User Guide explains how to use the BPEL Tools to create BPEL files quickly and with precision.</para>
</abstract>
Modified: trunk/bpel/docs/reference/en-US/additionalreqs.xml
===================================================================
--- trunk/bpel/docs/reference/en-US/additionalreqs.xml 2011-08-01 00:18:24 UTC (rev 33395)
+++ trunk/bpel/docs/reference/en-US/additionalreqs.xml 2011-08-01 00:34:11 UTC (rev 33396)
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<chapter id="install">
<title>Additional BPEL Requirements</title>
+ <para>
+ The following sections describe how to setup and isntall the BPEL engine into your JBoss Application Server (JBossAS). If you are running JBoss SOA-P then the following sections are already done for you.
+ </para>
<section>
<title>Additional Tools</title>
<para>For installation and configuring BPEL engine into a JBossAS environment you will need the following: </para>
@@ -18,7 +21,7 @@
</section>
<section id="installRuntime">
- <title>Installation JBoss BPEL Runtime</title>
+ <title>Installing the JBoss BPEL Runtime</title>
<itemizedlist>
<listitem>
<para>Unpack the JBossAS installation archive into the required location.</para>
Modified: trunk/bpel/docs/reference/en-US/tasks.xml
===================================================================
--- trunk/bpel/docs/reference/en-US/tasks.xml 2011-08-01 00:18:24 UTC (rev 33395)
+++ trunk/bpel/docs/reference/en-US/tasks.xml 2011-08-01 00:34:11 UTC (rev 33396)
@@ -405,7 +405,7 @@
<section id="createdeploy">
<title>Creating a deploy.xml file</title>
<para>
- If you want to deploy a BPEL project to the JBoss BPEL Runtime, a <filename>deploy.xml</filename> file needs to be created. The steps below show you how to create this file in JBDS:
+ If you want to deploy a BPEL project to the JBoss BPEL Runtime, a <filename>deploy.xml</filename> file needs to be created. The steps below show you how to create this file:
</para>
<itemizedlist>
<listitem>
@@ -512,7 +512,7 @@
</imageobject>
</mediaobject>
</figure>
- <para>Read the <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/as/html_single/index...">JBoss Server Manager Reference Guide</ulink> for more detail on this process.</para>
+ <para condition="jbt">Read the <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/as/html_single/index...">JBoss Server Manager Reference Guide</ulink> for more detail on this process.</para>
</listitem>
<listitem>
<para>You can enter the link <ulink url="http://localhost:8080/bpel-console/app.html">http://localhost:8080/bpel-console/app.html</ulink> in your web browser to access the deployed processes.</para>
@@ -526,7 +526,7 @@
</figure>
</listitem>
</itemizedlist>
- <para>
+ <para condition="jbt">
Please visit the <ulink url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201">JBoss Tools Users Forum</ulink> for more information and assistance.
</para>
</section>
13 years, 7 months