JBoss Tools SVN: r32446 - 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-06-29 10:23:40 -0400 (Wed, 29 Jun 2011)
New Revision: 32446
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
Log:
[JBIDE-9054] added util method to get server bin directory
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-06-29 14:23:20 UTC (rev 32445)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-06-29 14:23:40 UTC (rev 32446)
@@ -40,8 +40,8 @@
.append(serverID.replace(' ', '_'));
}
- public static String getServerBinDirectory(JBossServer server) throws CoreException {
- return getServerHomePath(server).append(IJBossRuntimeResourceConstants.BIN).toOSString();
+ public static IPath getServerBinDirectory(JBossServer server) throws CoreException {
+ return getServerHomePath(server).append(IJBossRuntimeResourceConstants.BIN);
}
@SuppressWarnings("unchecked")
12 years, 10 months
JBoss Tools SVN: r32445 - 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-06-29 10:23:20 -0400 (Wed, 29 Jun 2011)
New Revision: 32445
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
Log:
[JBIDE-9054] added util method to get server bin directory
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-06-29 14:13:53 UTC (rev 32444)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-06-29 14:23:20 UTC (rev 32445)
@@ -40,6 +40,10 @@
.append(serverID.replace(' ', '_'));
}
+ public static String getServerBinDirectory(JBossServer server) throws CoreException {
+ return getServerHomePath(server).append(IJBossRuntimeResourceConstants.BIN).toOSString();
+ }
+
@SuppressWarnings("unchecked")
public static <BEHAVIOR> BEHAVIOR checkedGetServerBehavior(IServer server, Class<BEHAVIOR> behaviorClass) throws CoreException {
BEHAVIOR serverBehavior = (BEHAVIOR) server.loadAdapter(behaviorClass, new NullProgressMonitor());
12 years, 10 months
JBoss Tools SVN: r32444 - 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-06-29 10:13:53 -0400 (Wed, 29 Jun 2011)
New Revision: 32444
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
Log:
[JBIDE-9054] added util method to get server behavior from server
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-06-29 14:12:32 UTC (rev 32443)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-06-29 14:13:53 UTC (rev 32444)
@@ -41,7 +41,7 @@
}
@SuppressWarnings("unchecked")
- public static <BEHAVIOR> BEHAVIOR checkedGetJBossServerBehavior(IServer server, Class<BEHAVIOR> behaviorClass) throws CoreException {
+ public static <BEHAVIOR> BEHAVIOR checkedGetServerBehavior(IServer server, Class<BEHAVIOR> behaviorClass) throws CoreException {
BEHAVIOR serverBehavior = (BEHAVIOR) server.loadAdapter(behaviorClass, new NullProgressMonitor());
if (serverBehavior == null) {
throw new CoreException(
12 years, 10 months
JBoss Tools SVN: r32443 - 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: adietish
Date: 2011-06-29 10:12:32 -0400 (Wed, 29 Jun 2011)
New Revision: 32443
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
Log:
[JBIDE-9054] added util method to get server behavior from server
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2011-06-29 13:52:15 UTC (rev 32442)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2011-06-29 14:12:32 UTC (rev 32443)
@@ -75,6 +75,7 @@
public static String TerminateTwiddleFailed;
public static String CannotSetUpImproperServer;
public static String CannotLocateServerHome;
+ public static String CouldNotFindServerBehavior;
public static String ServerRuntimeNotFound;
public static String ServerRuntimeConfigNotFound;
public static String ServerNotFound;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-06-29 13:52:15 UTC (rev 32442)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-06-29 14:12:32 UTC (rev 32443)
@@ -55,6 +55,7 @@
TerminateTwiddleFailed=Cannot terminate twiddle process
CannotSetUpImproperServer=Cannot prepare server {0} for launch because it is not a proper JBoss Server
CannotLocateServerHome= Server {0} is corrupt and the server home is unable to be located.
+CouldNotFindServerBehavior=Could not find server behavior for server {0}.
ServerRuntimeNotFound=Runtime for server {0} cannot be found.
ServerRuntimeConfigNotFound=Configuration for runtime {0} is not set.
ServerNotFound=Server {0} not found.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-06-29 13:52:15 UTC (rev 32442)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-06-29 14:12:32 UTC (rev 32443)
@@ -40,6 +40,17 @@
.append(serverID.replace(' ', '_'));
}
+ @SuppressWarnings("unchecked")
+ public static <BEHAVIOR> BEHAVIOR checkedGetJBossServerBehavior(IServer server, Class<BEHAVIOR> behaviorClass) throws CoreException {
+ BEHAVIOR serverBehavior = (BEHAVIOR) server.loadAdapter(behaviorClass, new NullProgressMonitor());
+ if (serverBehavior == null) {
+ throw new CoreException(
+ new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ NLS.bind(Messages.CouldNotFindServerBehavior, server.getName())));
+ }
+ return serverBehavior;
+ }
+
@Deprecated
public static IPath makeRelative(IJBossServerRuntime rt, IPath p) {
if( rt != null && rt.getRuntime() != null )
12 years, 10 months
JBoss Tools SVN: r32442 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-06-29 09:52:15 -0400 (Wed, 29 Jun 2011)
New Revision: 32442
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsUtils.java
Log:
https://issues.jboss.org/browse/JBIDE-9203 , while loading properties \r\t\n and unicode will be displayed as readable text.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsUtils.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsUtils.java 2011-06-29 12:34:28 UTC (rev 32441)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsUtils.java 2011-06-29 13:52:15 UTC (rev 32442)
@@ -64,6 +64,7 @@
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.loaders.impl.EncodedProperties;
import org.jboss.tools.common.model.project.IModelNature;
import org.jboss.tools.common.model.ui.editors.dnd.DropURI;
import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper;
@@ -394,7 +395,7 @@
* @return the java properties list generated from the reader file
*/
private static Properties readFileToProperties(Table table, Reader r) {
- Properties properties = new Properties();
+ EncodedProperties properties = new EncodedProperties();
try {
properties.load(r);
r.close();
@@ -410,6 +411,7 @@
* Fill in new values
*/
int k = 0;
+ String value = null;
Set<String> keys = properties.stringPropertyNames();
List<String> keysList = new ArrayList<String>(keys);
Collections.sort(keysList);
@@ -417,7 +419,13 @@
TableItem tableItem = null;
tableItem = new TableItem(table, SWT.BORDER, k);
k++;
- tableItem.setText(new String[] {key, properties.getProperty(key)});
+ value = properties.getProperty(key);
+ if (value != null) {
+ value = value.replaceAll("\t", "\\\\t") //$NON-NLS-1$ //$NON-NLS-2$
+ .replaceAll("\r", "\\\\r") //$NON-NLS-1$ //$NON-NLS-2$
+ .replaceAll("\n", "\\\\n"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ tableItem.setText(new String[] {key, value});
}
return properties;
}
12 years, 10 months
JBoss Tools SVN: r32441 - 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: adietish
Date: 2011-06-29 08:34:28 -0400 (Wed, 29 Jun 2011)
New Revision: 32441
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java
Log:
[JBIDE-9054] renamed #checkedLoadAdapter to #checkedGetServer to better reflect what it does
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-29 12:33:30 UTC (rev 32440)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-29 12:34:28 UTC (rev 32441)
@@ -155,7 +155,7 @@
} else {
serverStopping();
String host = getServer().getHost();
- JBoss7Server server = ServerConverter.checkedGetServer(getServer(), JBoss7Server.class);
+ JBoss7Server server = ServerConverter.checkedGetJBossServer(getServer(), JBoss7Server.class);
int mgmtPort = server.getManagementPort();
// TODO: for now only local, implement for remote afterwards
if (isServerRunning(host, mgmtPort)) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-06-29 12:33:30 UTC (rev 32440)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-06-29 12:34:28 UTC (rev 32441)
@@ -47,7 +47,7 @@
}
@SuppressWarnings("unchecked")
- public static <SERVER> SERVER checkedGetServer(IServer server, Class<SERVER> serverClass) throws CoreException {
+ public static <SERVER> SERVER checkedGetJBossServer(IServer server, Class<SERVER> serverClass) throws CoreException {
if (server == null) {
return null;
}
12 years, 10 months
JBoss Tools SVN: r32440 - 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: adietish
Date: 2011-06-29 08:33:30 -0400 (Wed, 29 Jun 2011)
New Revision: 32440
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java
Log:
[JBIDE-9054] renamed #checkedLoadAdapter to #checkedGetServer to better reflect what it does
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-29 12:05:19 UTC (rev 32439)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-29 12:33:30 UTC (rev 32440)
@@ -155,7 +155,7 @@
} else {
serverStopping();
String host = getServer().getHost();
- JBoss7Server server = ServerConverter.checkedLoadAdapter(getServer(), JBoss7Server.class);
+ JBoss7Server server = ServerConverter.checkedGetServer(getServer(), JBoss7Server.class);
int mgmtPort = server.getManagementPort();
// TODO: for now only local, implement for remote afterwards
if (isServerRunning(host, mgmtPort)) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-06-29 12:05:19 UTC (rev 32439)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-06-29 12:33:30 UTC (rev 32440)
@@ -47,7 +47,7 @@
}
@SuppressWarnings("unchecked")
- public static <SERVER> SERVER checkedLoadAdapter(IServer server, Class<SERVER> serverClass) throws CoreException {
+ public static <SERVER> SERVER checkedGetServer(IServer server, Class<SERVER> serverClass) throws CoreException {
if (server == null) {
return null;
}
12 years, 10 months
JBoss Tools SVN: r32439 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-29 08:05:19 -0400 (Wed, 29 Jun 2011)
New Revision: 32439
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
Log:
[JBIDE-9054] corrected warnings by replacing deprecated constant class
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2011-06-29 11:59:54 UTC (rev 32438)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2011-06-29 12:05:19 UTC (rev 32439)
@@ -10,6 +10,24 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal;
+import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants.DEPLOY;
+import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.JBOSSTOOLS_TMP;
+import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.JBOSS_WEB_DEFAULT_PORT;
+import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.JNDI_DEFAULT_PORT;
+import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.JNDI_PORT;
+import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.JNDI_PORT_DEFAULT_XPATH;
+import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.JNDI_PORT_DETECT;
+import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.JNDI_PORT_DETECT_XPATH;
+import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.SERVER_AS_50;
+import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.SERVER_PASSWORD;
+import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.SERVER_USERNAME;
+import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.TEMP_DEPLOY;
+import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.TMP;
+import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.WEB_PORT;
+import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.WEB_PORT_DEFAULT_XPATH;
+import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.WEB_PORT_DETECT;
+import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.WEB_PORT_DETECT_XPATH;
+
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Date;
@@ -27,10 +45,8 @@
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathQuery;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
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.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
/**
@@ -39,7 +55,7 @@
*
*/
public class JBossServer extends DeployableServer
- implements IJBossServerConstants, IDeployableServer, IURLProvider {
+ implements IDeployableServer, IURLProvider {
public void setDefaults(IProgressMonitor monitor) {
super.setDefaults(monitor);
@@ -51,7 +67,7 @@
}
private boolean isAS50() {
- return getServer().getServerType().getRuntimeType().getId().equals(IJBossToolingConstants.SERVER_AS_50);
+ return getServer().getServerType().getRuntimeType().getId().equals(SERVER_AS_50);
}
public String getHost() {
@@ -100,12 +116,12 @@
}
if( type.equals(DEPLOY_METADATA)) {
return JBossServerCorePlugin.getServerStateLocation(server).
- append(IJBossServerConstants.DEPLOY).makeAbsolute().toString();
+ append(DEPLOY).makeAbsolute().toString();
} else if( type.equals(DEPLOY_SERVER)) {
String loc = jbsrt.getConfigLocation();
String config = jbsrt.getJBossConfiguration();
IPath p = new Path(loc).append(config)
- .append(IJBossServerConstants.DEPLOY);
+ .append(DEPLOY);
return ServerUtil.makeGlobal(jbsrt.getRuntime(), p).toString();
}
return null;
@@ -124,13 +140,13 @@
new Path(server.getAttribute(TEMP_DEPLOY_DIRECTORY, ""))).toString(); //$NON-NLS-1$
if( type.equals(DEPLOY_METADATA)) {
return JBossServerCorePlugin.getServerStateLocation(server).
- append(IJBossServerConstants.TEMP_DEPLOY).makeAbsolute().toString();
+ append(TEMP_DEPLOY).makeAbsolute().toString();
} else if( type.equals(DEPLOY_SERVER)) {
String loc = jbsrt.getConfigLocation();
String config = jbsrt.getJBossConfiguration();
IPath p = new Path(loc)
- .append(config).append(IJBossServerConstants.TMP)
- .append(IJBossServerConstants.JBOSSTOOLS_TMP);
+ .append(config).append(TMP)
+ .append(JBOSSTOOLS_TMP);
return ServerUtil.makeGlobal(jbsrt.getRuntime(), p).toString();
}
return null;
12 years, 10 months
JBoss Tools SVN: r32438 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-29 07:59:54 -0400 (Wed, 29 Jun 2011)
New Revision: 32438
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossLaunchAdapter.java
Log:
[JBIDE-9054] corrected warnings by replacing deprecated constant class
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossLaunchAdapter.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossLaunchAdapter.java 2011-06-29 11:29:45 UTC (rev 32437)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossLaunchAdapter.java 2011-06-29 11:59:54 UTC (rev 32438)
@@ -37,17 +37,23 @@
import org.eclipse.wst.server.core.model.ServerDelegate;
import org.eclipse.wst.server.core.util.HttpLaunchable;
import org.eclipse.wst.server.core.util.WebResource;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
+/**
+ *
+ * @author Rob Stryker
+ *
+ */
public class JBossLaunchAdapter extends LaunchableAdapterDelegate {
private static final String SIMPLE_PORTAL_PATH = "simple-portal"; //$NON-NLS-1$
private static final String JBOSS_PORTLET = "jboss.portlet"; //$NON-NLS-1$
private static final String PORTAL_PATH = "portal"; //$NON-NLS-1$
- private static final String JAVA_NAMING_PROVIDER_URL_PROPKEY = IJBossServerConstants.NAMING_FACTORY_PROVIDER_URL;
- private static final String JAVA_NAMING_FACTORY_INITIAL_PROPKEY = IJBossServerConstants.NAMING_FACTORY_KEY;
+ private static final String JAVA_NAMING_PROVIDER_URL_PROPKEY = IJBossRuntimeConstants.NAMING_FACTORY_PROVIDER_URL;
+ private static final String JAVA_NAMING_FACTORY_INITIAL_PROPKEY = IJBossRuntimeConstants.NAMING_FACTORY_KEY;
private static final String SERVER_DEFAULT_DEPLOY_JBOSS_PORTAL_SAR = "deploy/jboss-portal.sar"; //$NON-NLS-1$
@@ -85,15 +91,15 @@
JndiLaunchable launchable = null;
JBossServer server = (JBossServer)delegate;
IPath p = new Path(server.getConfigDirectory())
- .append(IJBossServerConstants.JNDI_PROPERTIES);
+ .append(IJBossRuntimeResourceConstants.JNDI_PROPERTIES);
Properties props = new Properties();
try {
props.load(new FileInputStream(p.toFile()));
} catch( IOException ioe ) {
props.put(JAVA_NAMING_FACTORY_INITIAL_PROPKEY,
- IJBossServerConstants.NAMING_FACTORY_VALUE);
+ IJBossRuntimeConstants.NAMING_FACTORY_VALUE);
props.put(JAVA_NAMING_PROVIDER_URL_PROPKEY,
- IJBossServerConstants.NAMING_FACTORY_INTERFACES);
+ IJBossRuntimeConstants.NAMING_FACTORY_INTERFACES);
}
if(moduleObject instanceof EJBBean) {
@@ -168,7 +174,7 @@
}
URL url = new URL(urlString);
IPath jbossLocation = runtime.getLocation();
- IPath configPath = jbossLocation.append(IJBossServerConstants.SERVER).append(jbossRuntime.getJBossConfiguration());
+ IPath configPath = jbossLocation.append(IJBossRuntimeResourceConstants.SERVER).append(jbossRuntime.getJBossConfiguration());
File configFile = configPath.toFile();
// JBoss Portal server
if (exists(configFile, SERVER_DEFAULT_DEPLOY_JBOSS_PORTAL_SAR)) {
12 years, 10 months
JBoss Tools SVN: r32437 - in trunk/forge: plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-06-29 07:29:45 -0400 (Wed, 29 Jun 2011)
New Revision: 32437
Added:
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntime.java
trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntimeTest.java
Removed:
trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeRuntimeTest.java
Modified:
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java
Log:
added ForgeEmbeddedRuntime
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java 2011-06-29 10:48:56 UTC (rev 32436)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/preferences/ForgeInstallations.java 2011-06-29 11:29:45 UTC (rev 32437)
@@ -1,22 +1,20 @@
package org.jboss.tools.forge.core.preferences;
-import java.util.List;
-
import org.jboss.tools.forge.core.process.ForgeRuntime;
public class ForgeInstallations {
- private static final String PREF_FORGE_INSTALLATIONS = "installations";
+// private static final String PREF_FORGE_INSTALLATIONS = "installations";
- private static List<ForgeRuntime> installations = null;
+// private static List<ForgeRuntime> installations = null;
private static ForgeRuntime defaultInstallation = null;
- public static ForgeRuntime[] getInstallations() {
+// public static ForgeRuntime[] getInstallations() {
// if (installations == null) {
// initializeInstallations();
// }
- return (ForgeRuntime[])installations.toArray(new ForgeRuntime[installations.size()]);
- }
+// return (ForgeRuntime[])installations.toArray(new ForgeRuntime[installations.size()]);
+// }
public static ForgeRuntime getDefault() {
// if (installations == null) {
@@ -28,8 +26,16 @@
// private static IEclipsePreferences getForgeCorePreferences() {
// return InstanceScope.INSTANCE.getNode(ForgeCorePlugin.PLUGIN_ID);
// }
-//
+
// private static void initializeInstallations() {
+// initializeEmbeddedRuntime();
+// }
+
+// private static void initializeEmbeddedRuntime() {
+
+// }
+
+// private static void initializeInstallations() {
// String installPrefsXml = getForgeCorePreferences().get(PREF_FORGE_INSTALLATIONS, null);
// if (installPrefsXml == null || "".equals(installPrefsXml)) {
// createInitialInstallations();
Added: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntime.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntime.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntime.java 2011-06-29 11:29:45 UTC (rev 32437)
@@ -0,0 +1,31 @@
+package org.jboss.tools.forge.core.process;
+
+import java.io.IOException;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.forge.core.ForgeCorePlugin;
+
+public class ForgeEmbeddedRuntime implements ForgeRuntime {
+
+ public static final ForgeRuntime INSTANCE = new ForgeEmbeddedRuntime();
+
+ private ForgeEmbeddedRuntime() {}
+
+ @Override
+ public final String getName() {
+ return "embedded";
+ }
+
+ @Override
+ public String getLocation() {
+ String result = null;
+ try {
+ result = FileLocator.getBundleFile(Platform.getBundle("org.jboss.tools.forge.runtime")).getAbsolutePath();
+ } catch (IOException e) {
+ ForgeCorePlugin.log(e);
+ }
+ return result;
+ }
+
+}
Copied: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntimeTest.java (from rev 32429, trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeRuntimeTest.java)
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntimeTest.java (rev 0)
+++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntimeTest.java 2011-06-29 11:29:45 UTC (rev 32437)
@@ -0,0 +1,36 @@
+package org.jboss.tools.forge.core.process;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Platform;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ForgeEmbeddedRuntimeTest {
+
+ private String name = null;
+ private String location = null;
+
+ @Before
+ public void setUp() throws Exception {
+ name = "embedded";
+ location = FileLocator.getBundleFile(Platform.getBundle("org.jboss.tools.forge.runtime")).getAbsolutePath();
+ }
+
+ @After
+ public void tearDown() {
+ name = null;
+ location = null;
+ }
+
+ @Test
+ public void testForgeEmbeddedRuntime() {
+ assertNotNull(ForgeEmbeddedRuntime.INSTANCE);
+ assertEquals(name, ForgeEmbeddedRuntime.INSTANCE.getName());
+ assertEquals(location, ForgeEmbeddedRuntime.INSTANCE.getLocation());
+ }
+
+}
Deleted: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeRuntimeTest.java
===================================================================
--- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeRuntimeTest.java 2011-06-29 10:48:56 UTC (rev 32436)
+++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeRuntimeTest.java 2011-06-29 11:29:45 UTC (rev 32437)
@@ -1,27 +0,0 @@
-package org.jboss.tools.forge.core.process;
-
-import static org.junit.Assert.fail;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ForgeRuntimeTest {
-
- private ForgeRuntime forgeRuntime = null;
-
- @Before
- public void setUp() throws Exception {
-// forgeRuntime = new ForgeRuntime("test", )
- }
-
- @After
- public void tearDown() throws Exception {
- }
-
- @Test
- public void testStartStop() {
- fail("Not yet implemented");
- }
-
-}
12 years, 10 months