JBoss Tools SVN: r30390 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-06 15:06:50 -0400 (Wed, 06 Apr 2011)
New Revision: 30390
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IBuildParticipantFeature.java
Log:
JBIDE-3120
https://issues.jboss.org/browse/JBIDE-3120
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IBuildParticipantFeature.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IBuildParticipantFeature.java 2011-04-06 18:53:17 UTC (rev 30389)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IBuildParticipantFeature.java 2011-04-06 19:06:50 UTC (rev 30390)
@@ -21,11 +21,18 @@
*
*/
public interface IBuildParticipantFeature {
-
+
+ /**
+ * Sets CDI project access object once per lifetime of this object.
+ * @param n
+ */
public void setProject(CDICoreNature n);
- public void buildIsAboutToBegin();
-
+ /**
+ * Implementation should create and keep one instance of IDefinitionContextExtension.
+ *
+ * @return
+ */
public IDefinitionContextExtension getContext();
}
13 years, 3 months
JBoss Tools SVN: r30389 - branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-04-06 14:53:17 -0400 (Wed, 06 Apr 2011)
New Revision: 30389
Modified:
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/RunJarContainerWrapper.java
Log:
JBIDE-8461 to maintenance
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2011-04-06 18:48:49 UTC (rev 30388)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2011-04-06 18:53:17 UTC (rev 30389)
@@ -15,6 +15,7 @@
import java.util.Iterator;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunch;
@@ -26,7 +27,10 @@
import org.eclipse.wst.server.core.ServerUtil;
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.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
public class JBossServerStartupLaunchConfiguration extends AbstractJBossLaunchConfigType {
@@ -73,6 +77,20 @@
i.next().setupLaunchConfiguration(workingCopy, server);
}
}
+
+ public String[] getJavaLibraryPath(ILaunchConfiguration configuration) throws CoreException {
+ IServer server = ServerUtil.getServer(configuration);
+ JBossServer jbs = AbstractJBossLaunchConfigType.findJBossServer(server.getId());
+ IJBossServerRuntime runtime = (IJBossServerRuntime)
+ jbs.getServer().getRuntime().loadAdapter(IJBossServerRuntime.class, null);
+ IPath nativeFolder = runtime.getRuntime().getLocation()
+ .append(IJBossRuntimeResourceConstants.BIN)
+ .append(IJBossRuntimeResourceConstants.NATIVE);
+ if( nativeFolder.toFile().exists() ) {
+ return new String[]{nativeFolder.toOSString()};
+ }
+ return new String[]{};
+ }
protected StartLaunchDelegate getDelegate(ILaunchConfiguration configuration) throws CoreException {
IServer server = ServerUtil.getServer(configuration);
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-04-06 18:48:49 UTC (rev 30388)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-04-06 18:53:17 UTC (rev 30389)
@@ -28,6 +28,10 @@
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.debug.core.model.IProcess;
+import org.eclipse.jdt.core.IClasspathAttribute;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.internal.launching.RuntimeClasspathEntry;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
import org.eclipse.jdt.launching.IVMInstall;
@@ -46,6 +50,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.IStartLaunchSetupParticipant;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.StartLaunchDelegate;
+import org.jboss.ide.eclipse.as.core.server.internal.launch.RunJarContainerWrapper.RunJarContainer;
import org.jboss.ide.eclipse.as.core.util.ArgsUtil;
import org.jboss.ide.eclipse.as.core.util.IConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
@@ -129,43 +134,11 @@
}
} catch( MalformedURLException murle) {}
-
vmArgs= ArgsUtil.setArg(vmArgs, null,
IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.ENDORSED_DIRS,
runtime.getRuntime().getLocation().append(
IJBossRuntimeResourceConstants.LIB).append(
IJBossRuntimeResourceConstants.ENDORSED).toOSString(), true);
-
- if( runtime.getRuntime().getLocation().append(
- IJBossRuntimeResourceConstants.BIN).append(
- IJBossRuntimeResourceConstants.NATIVE).toFile().exists() ) {
- String argVal = ArgsUtil.getValue(vmArgs, null,
- IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.JAVA_LIB_PATH);
-
- String libPath =
- runtime.getRuntime().getLocation()
- .append(IJBossRuntimeResourceConstants.BIN)
- .append(IJBossRuntimeResourceConstants.NATIVE).toOSString();
- if( argVal != null ) {
- if( argVal.startsWith("\"")) //$NON-NLS-1$
- argVal = argVal.substring(1);
- if( argVal.endsWith("\"")) //$NON-NLS-1$
- argVal = argVal.substring(0, argVal.length()-1);
- if( argVal.startsWith(":")) //$NON-NLS-1$
- argVal = argVal.substring(1);
-
- String[] asArr = argVal.split(File.pathSeparator);
- asArr[0] = libPath;
- String implode = ""; //$NON-NLS-1$
- for( int i = 0; i < asArr.length; i++ )
- implode += asArr[i] + File.pathSeparator;
- libPath = implode;
- }
- vmArgs = ArgsUtil.setArg(vmArgs, null,
- IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.JAVA_LIB_PATH,
- libPath, true);
- }
-
/* Claspath */
List<String> cp = wc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, new ArrayList<String>());
List<String> newCP = fixCP(cp, jbs);
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/RunJarContainerWrapper.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/RunJarContainerWrapper.java 2011-04-06 18:48:49 UTC (rev 30388)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/RunJarContainerWrapper.java 2011-04-06 18:53:17 UTC (rev 30389)
@@ -12,6 +12,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.jdt.core.ClasspathContainerInitializer;
import org.eclipse.jdt.core.IClasspathContainer;
@@ -70,13 +71,20 @@
public RunJarContainer(IPath path) {
this.path = path;
}
+ public RunJarContainer(String serverName) {
+ this(new Path(ID).append(serverName));
+ }
public IClasspathEntry[] getClasspathEntries() {
String name = path.segment(1);
+ return getClasspathEntries(name);
+ }
+
+ public static IClasspathEntry[] getClasspathEntries(String serverName) {
IServer[] servers = ServerCore.getServers();
IServer s = null;
for( int i = 0; i < servers.length; i++ ) {
- if( servers[i].getName().equals(name))
+ if( servers[i].getName().equals(serverName))
s = servers[i];
}
if( s != null ) {
13 years, 3 months
JBoss Tools SVN: r30388 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-04-06 14:48:49 -0400 (Wed, 06 Apr 2011)
New Revision: 30388
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/RunJarContainerWrapper.java
Log:
JBIDE-8461 patch for trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2011-04-06 18:24:47 UTC (rev 30387)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2011-04-06 18:48:49 UTC (rev 30388)
@@ -15,6 +15,7 @@
import java.util.Iterator;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunch;
@@ -26,7 +27,10 @@
import org.eclipse.wst.server.core.ServerUtil;
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.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
public class JBossServerStartupLaunchConfiguration extends AbstractJBossLaunchConfigType {
@@ -73,6 +77,20 @@
i.next().setupLaunchConfiguration(workingCopy, server);
}
}
+
+ public String[] getJavaLibraryPath(ILaunchConfiguration configuration) throws CoreException {
+ IServer server = ServerUtil.getServer(configuration);
+ JBossServer jbs = AbstractJBossLaunchConfigType.findJBossServer(server.getId());
+ IJBossServerRuntime runtime = (IJBossServerRuntime)
+ jbs.getServer().getRuntime().loadAdapter(IJBossServerRuntime.class, null);
+ IPath nativeFolder = runtime.getRuntime().getLocation()
+ .append(IJBossRuntimeResourceConstants.BIN)
+ .append(IJBossRuntimeResourceConstants.NATIVE);
+ if( nativeFolder.toFile().exists() ) {
+ return new String[]{nativeFolder.toOSString()};
+ }
+ return new String[]{};
+ }
protected StartLaunchDelegate getDelegate(ILaunchConfiguration configuration) throws CoreException {
IServer server = ServerUtil.getServer(configuration);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-04-06 18:24:47 UTC (rev 30387)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-04-06 18:48:49 UTC (rev 30388)
@@ -28,6 +28,10 @@
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.debug.core.model.IProcess;
+import org.eclipse.jdt.core.IClasspathAttribute;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.internal.launching.RuntimeClasspathEntry;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
import org.eclipse.jdt.launching.IVMInstall;
@@ -46,6 +50,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.IStartLaunchSetupParticipant;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.StartLaunchDelegate;
+import org.jboss.ide.eclipse.as.core.server.internal.launch.RunJarContainerWrapper.RunJarContainer;
import org.jboss.ide.eclipse.as.core.util.ArgsUtil;
import org.jboss.ide.eclipse.as.core.util.IConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
@@ -129,43 +134,11 @@
}
} catch( MalformedURLException murle) {}
-
vmArgs= ArgsUtil.setArg(vmArgs, null,
IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.ENDORSED_DIRS,
runtime.getRuntime().getLocation().append(
IJBossRuntimeResourceConstants.LIB).append(
IJBossRuntimeResourceConstants.ENDORSED).toOSString(), true);
-
- if( runtime.getRuntime().getLocation().append(
- IJBossRuntimeResourceConstants.BIN).append(
- IJBossRuntimeResourceConstants.NATIVE).toFile().exists() ) {
- String argVal = ArgsUtil.getValue(vmArgs, null,
- IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.JAVA_LIB_PATH);
-
- String libPath =
- runtime.getRuntime().getLocation()
- .append(IJBossRuntimeResourceConstants.BIN)
- .append(IJBossRuntimeResourceConstants.NATIVE).toOSString();
- if( argVal != null ) {
- if( argVal.startsWith("\"")) //$NON-NLS-1$
- argVal = argVal.substring(1);
- if( argVal.endsWith("\"")) //$NON-NLS-1$
- argVal = argVal.substring(0, argVal.length()-1);
- if( argVal.startsWith(":")) //$NON-NLS-1$
- argVal = argVal.substring(1);
-
- String[] asArr = argVal.split(File.pathSeparator);
- asArr[0] = libPath;
- String implode = ""; //$NON-NLS-1$
- for( int i = 0; i < asArr.length; i++ )
- implode += asArr[i] + File.pathSeparator;
- libPath = implode;
- }
- vmArgs = ArgsUtil.setArg(vmArgs, null,
- IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.JAVA_LIB_PATH,
- libPath, true);
- }
-
/* Claspath */
List<String> cp = wc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, new ArrayList<String>());
List<String> newCP = fixCP(cp, jbs);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/RunJarContainerWrapper.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/RunJarContainerWrapper.java 2011-04-06 18:24:47 UTC (rev 30387)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/RunJarContainerWrapper.java 2011-04-06 18:48:49 UTC (rev 30388)
@@ -12,6 +12,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.jdt.core.ClasspathContainerInitializer;
import org.eclipse.jdt.core.IClasspathContainer;
@@ -70,13 +71,20 @@
public RunJarContainer(IPath path) {
this.path = path;
}
+ public RunJarContainer(String serverName) {
+ this(new Path(ID).append(serverName));
+ }
public IClasspathEntry[] getClasspathEntries() {
String name = path.segment(1);
+ return getClasspathEntries(name);
+ }
+
+ public static IClasspathEntry[] getClasspathEntries(String serverName) {
IServer[] servers = ServerCore.getServers();
IServer s = null;
for( int i = 0; i < servers.length; i++ ) {
- if( servers[i].getName().equals(name))
+ if( servers[i].getName().equals(serverName))
s = servers[i];
}
if( s != null ) {
13 years, 3 months
JBoss Tools SVN: r30387 - trunk/build/util.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-06 14:24:47 -0400 (Wed, 06 Apr 2011)
New Revision: 30387
Added:
trunk/build/util/getLatestArtifactFromNexus.sh
Log:
add new util for pulling URL of latest snapshot update site zip for Drools 5.2.0-SNAPSHOT
Added: trunk/build/util/getLatestArtifactFromNexus.sh
===================================================================
--- trunk/build/util/getLatestArtifactFromNexus.sh (rev 0)
+++ trunk/build/util/getLatestArtifactFromNexus.sh 2011-04-06 18:24:47 UTC (rev 30387)
@@ -0,0 +1,55 @@
+#!/bin/bash
+# for a given maven-metadata.xml URL, and a given filename pattern, return the actual URL to that filename
+# eg., https://repository.jboss.org/nexus/content/groups/public/org/drools/org.d... org.drools.updatesite-5.2.0-SNAPSHOT-assembly.zip
+# where the metadata contains this:
+# <?xml version="1.0" encoding="UTF-8"?>
+# <metadata modelVersion="1.1.0">
+# <groupId>org.drools</groupId>
+# <artifactId>org.drools.updatesite</artifactId>
+# <version>5.2.0-SNAPSHOT</version>
+# <versioning>
+# <snapshot>
+# <timestamp>20110406.160435</timestamp>
+#
+# <buildNumber>85</buildNumber>
+# </snapshot>
+# <lastUpdated>20110406160435</lastUpdated>
+# <snapshotVersions>
+# <snapshotVersion>
+# <extension>zip</extension>
+# <value>5.2.0-20110406.160435-85</value>
+#
+# <updated>20110406160435</updated>
+# </snapshotVersion>
+
+# if no two artifacts given, throw usage
+if [[ $# -lt 2 ]]; then
+ echo "Usage: $0 <URL> <filename>"
+ echo "Example: $0 https://repository.jboss.org/nexus/content/groups/public/org/drools/org.d... org.drools.updatesite-5.2.0-SNAPSHOT-assembly.zip"
+ exit
+fi
+URL=$1
+filename=$2
+
+#set up tmp dir
+tmpdir=`mktemp -d`
+mkdir -p $tmpdir
+pushd $tmpdir >/dev/null
+
+# get the metadata
+wget --no-clobber -q ${URL}/maven-metadata.xml
+
+# parse it
+cat maven-metadata.xml | egrep "timestamp|buildNumber" > tmp.txt
+timestamp=$(cat tmp.txt | grep timestamp | head -1 | sed -e "s#.*<timestamp>\(.\+\)<\/timestamp>.*#\1#g");
+buildNumber=$(cat tmp.txt | grep buildNumber | head -1 | sed -e "s#.*<buildNumber>\(.\+\)<\/buildNumber>.*#\1#g");
+
+# return amended URL
+SNAPSHOT=${timestamp}-${buildNumber}
+filename=${filename/SNAPSHOT/${SNAPSHOT}}
+
+echo "${URL}/${filename}"
+
+# cleanup
+popd >/dev/null
+rm -fr $tmpdir
Property changes on: trunk/build/util/getLatestArtifactFromNexus.sh
___________________________________________________________________
Added: svn:executable
+ *
13 years, 3 months
JBoss Tools SVN: r30386 - trunk/modeshape/plugins/org.jboss.tools.modeshape.rest.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2011-04-06 13:05:49 -0400 (Wed, 06 Apr 2011)
New Revision: 30386
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties
Log:
JBIDE-6656 Create a documentation plugin. Removed "docs/" from build.properties as that folder was moved to the new documentation plugin.
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties 2011-04-06 16:29:09 UTC (rev 30385)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties 2011-04-06 17:05:49 UTC (rev 30386)
@@ -19,11 +19,9 @@
about.properties,\
feature.png,\
.,\
- docs/,\
about.html,\
jcip-annotations.jar,\
modeshape-client.jar
-src.includes = src/
jars.compile.order = .
source.. = src/
output.. = bin/
13 years, 3 months
JBoss Tools SVN: r30385 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-04-06 12:29:09 -0400 (Wed, 06 Apr 2011)
New Revision: 30385
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/CommonJBIDE2010Test.java
Log:
https://issues.jboss.org/browse/JBIDE-8691 : JUnit JBIDE2010Test.testElTemplateSimple2() fails after moving to XULRunner 1.9.2.16 and Eclipse 3.7
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/CommonJBIDE2010Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/CommonJBIDE2010Test.java 2011-04-06 16:00:10 UTC (rev 30384)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/CommonJBIDE2010Test.java 2011-04-06 16:29:09 UTC (rev 30385)
@@ -40,7 +40,7 @@
protected static final String KEY_5 = "bean1.property3"; //$NON-NLS-1$
/** The Constant VALUE_4. */
- protected static final String VALUE_4 = "background: red"; //$NON-NLS-1$
+ protected static final String VALUE_4 = "background-color: red"; //$NON-NLS-1$
/** The Constant KEY_4. */
protected static final String KEY_4 = "bean1.property2"; //$NON-NLS-1$
13 years, 3 months
JBoss Tools SVN: r30384 - branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/dialogs.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2011-04-06 12:00:10 -0400 (Wed, 06 Apr 2011)
New Revision: 30384
Modified:
branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/dialogs/PublishedLocationsDialog.java
Log:
JBIDE-8688 ModeShape Tools' Published Locations Dialog's Table Is Sized Too Small When It Contains Just A Couple Rows. Table is now being sized by the number of published locations. When a small number a couple blank rows are added to the size.
Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/dialogs/PublishedLocationsDialog.java
===================================================================
--- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/dialogs/PublishedLocationsDialog.java 2011-04-06 15:58:42 UTC (rev 30383)
+++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/dialogs/PublishedLocationsDialog.java 2011-04-06 16:00:10 UTC (rev 30384)
@@ -16,7 +16,9 @@
import static org.jboss.tools.modeshape.rest.IUiConstants.REPOSITORY_IMAGE;
import static org.jboss.tools.modeshape.rest.IUiConstants.SERVER_IMAGE;
import static org.jboss.tools.modeshape.rest.IUiConstants.WORKSPACE_IMAGE;
+
import java.util.Collection;
+
import org.eclipse.core.resources.IFile;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
@@ -46,8 +48,8 @@
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.jboss.tools.modeshape.rest.Activator;
+import org.jboss.tools.modeshape.rest.PublishedResourceHelper.WorkspaceLocation;
import org.jboss.tools.modeshape.rest.RestClientI18n;
-import org.jboss.tools.modeshape.rest.PublishedResourceHelper.WorkspaceLocation;
import org.modeshape.common.util.CheckArg;
import org.modeshape.web.jcr.rest.client.domain.Server;
@@ -136,7 +138,7 @@
RestClientI18n.publishedLocationsDialogMsg.text(file.getFullPath()), MessageDialog.INFORMATION,
new String[] {IDialogConstants.OK_LABEL}, 0);
- CheckArg.isNotNull(workspaceLocations, "workspaceLocations");
+ CheckArg.isNotNull(workspaceLocations, "workspaceLocations"); //$NON-NLS-1$
this.workspaceLocations = workspaceLocations;
// make sure dialog is resizable
@@ -185,6 +187,12 @@
table.setLayoutData(new GridData(GridData.FILL_BOTH));
table.setHeaderVisible(true);
table.setLinesVisible(true);
+
+ // set height of table
+ ((GridData)table.getLayoutData()).minimumHeight = (table.getItemHeight() * 3);
+ int locations = this.workspaceLocations.size() + 2;
+ int numRows = (locations < 6) ? locations : Math.min(locations, 12);
+ ((GridData)table.getLayoutData()).heightHint = (table.getItemHeight() * numRows);
// create columns
for (int numCols = COLUMNS.length, i = 0; i < numCols; ++i) {
@@ -347,7 +355,7 @@
// should never get here
assert false;
- return "";
+ return ""; //$NON-NLS-1$
}
/**
13 years, 3 months
JBoss Tools SVN: r30383 - trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2011-04-06 11:58:42 -0400 (Wed, 06 Apr 2011)
New Revision: 30383
Modified:
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java
Log:
OPEN - issue JBIDE-6919: [tester] uid/pwd is not passed to the server in GET requests
https://issues.jboss.org/browse/JBIDE-6919
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java 2011-04-06 15:58:27 UTC (rev 30382)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java 2011-04-06 15:58:42 UTC (rev 30383)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2011 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -135,6 +135,7 @@
private static final String JAX_RS = "JAX-RS"; //$NON-NLS-1$
private static final String EMPTY_STRING = ""; //$NON-NLS-1$
private static final String RESULT_HEADER_DELIMITER = "%";//$NON-NLS-1$
+ private static final String HTTPS_STRING = "https";//$NON-NLS-1$
/**
* The ID of the view as specified by the extension.
@@ -1173,6 +1174,13 @@
String tempUID = null;
String tempPwd = null;
+
+ // per JBIDE-6919, if we encounter an "https" url make sure
+ // basic authorization checkbox is checked
+ if (url.trim().startsWith(HTTPS_STRING)) {
+ useBasicAuthCB.setSelection(true);
+ }
+
// If basic authorization checkbox is checked, use the uid/pwd
if (useBasicAuthCB.getSelection()) {
UidPwdDialog authDialog = new UidPwdDialog(getSite().getShell());
13 years, 3 months
JBoss Tools SVN: r30382 - branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2011-04-06 11:58:27 -0400 (Wed, 06 Apr 2011)
New Revision: 30382
Modified:
branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java
Log:
OPEN - issue JBIDE-6919: [tester] uid/pwd is not passed to the server in GET requests
https://issues.jboss.org/browse/JBIDE-6919
Modified: branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java
===================================================================
--- branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java 2011-04-06 15:55:54 UTC (rev 30381)
+++ branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java 2011-04-06 15:58:27 UTC (rev 30382)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2011 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -135,6 +135,7 @@
private static final String JAX_RS = "JAX-RS"; //$NON-NLS-1$
private static final String EMPTY_STRING = ""; //$NON-NLS-1$
private static final String RESULT_HEADER_DELIMITER = "%";//$NON-NLS-1$
+ private static final String HTTPS_STRING = "https";//$NON-NLS-1$
/**
* The ID of the view as specified by the extension.
@@ -1173,6 +1174,13 @@
String tempUID = null;
String tempPwd = null;
+
+ // per JBIDE-6919, if we encounter an "https" url make sure
+ // basic authorization checkbox is checked
+ if (url.trim().startsWith(HTTPS_STRING)) {
+ useBasicAuthCB.setSelection(true);
+ }
+
// If basic authorization checkbox is checked, use the uid/pwd
if (useBasicAuthCB.getSelection()) {
UidPwdDialog authDialog = new UidPwdDialog(getSite().getShell());
13 years, 3 months