JBoss Tools SVN: r39227 - branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2012-03-01 10:35:18 -0500 (Thu, 01 Mar 2012)
New Revision: 39227
Modified:
branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java
Log:
[JBIDE-11122] Fix for index out of bounds error (already fixed in trunk)
Modified: branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java 2012-03-01 12:40:56 UTC (rev 39226)
+++ branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java 2012-03-01 15:35:18 UTC (rev 39227)
@@ -988,7 +988,12 @@
}
if (element.getAttribute("type") != null) {//$NON-NLS-1$
elemType = element.getAttributeValue("type");//$NON-NLS-1$
- String nsprefix = elemType.substring(0, elemType.indexOf(':'));
+ String nsprefix = ""; //$NON-NLS-1$
+ try {
+ nsprefix = elemType.substring(0, elemType.indexOf(':'));
+ } catch (StringIndexOutOfBoundsException e) {
+ // ignore
+ }
String testUri = getURIfromSchemaPrefix(element, nsprefix);
if (elemType.indexOf(':') > -1) {
if (!(elemType.startsWith("xs:") || elemType.startsWith("xsd:"))){ //$NON-NLS-1$ //$NON-NLS-2$
12 years, 2 months
JBoss Tools SVN: r39226 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-03-01 07:40:56 -0500 (Thu, 01 Mar 2012)
New Revision: 39226
Added:
trunk/jacoco-jboss/
Log:
12 years, 2 months
JBoss Tools SVN: r39225 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-03-01 07:40:42 -0500 (Thu, 01 Mar 2012)
New Revision: 39225
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
Log:
[JBIDE-11105] not creating server adapter if the user chose not to create a server adapter
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-03-01 12:31:23 UTC (rev 39224)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-03-01 12:40:42 UTC (rev 39225)
@@ -162,9 +162,11 @@
private void createServerAdapter(IProgressMonitor monitor, List<IProject> importedProjects)
throws OpenShiftException {
- Assert.isTrue(importedProjects.size() > 0);
- IProject project = importedProjects.get(0);
- new ServerAdapterFactory().create(project, this, monitor);
+ if (isCreateServerAdapter()) {
+ Assert.isTrue(importedProjects.size() > 0);
+ IProject project = importedProjects.get(0);
+ new ServerAdapterFactory().create(project, this, monitor);
+ }
}
@Override
12 years, 2 months
JBoss Tools SVN: r39224 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard: appimport and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-03-01 07:31:23 -0500 (Thu, 01 Mar 2012)
New Revision: 39224
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java
Log:
[JBIDE-10511] moved check for existing server to server adapter factory so that it'll get executed in all import cases (use existing project, create new project)
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-03-01 11:45:36 UTC (rev 39223)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-03-01 12:31:23 UTC (rev 39224)
@@ -16,7 +16,6 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerType;
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
@@ -82,28 +81,9 @@
, getRemoteName()
, getRepositoryFile())
.execute(monitor);
- String appName = getApplication().getName();
- String host = getApplication().getApplicationUrl();
- IServer found = findServer(appName, host);
- if( found == null )
- createServerAdapter(monitor, importedProjects);
- else {
- new ServerAdapterFactory().addModules(found, importedProjects, monitor);
- }
+ createServerAdapter(monitor, importedProjects);
}
- private IServer findServer(String appName, String host) {
- IServer[] all = ServerCore.getServers();
- for( int i = 0; i < all.length; i++ ) {
- String host1 = all[i].getHost();
- String app1 = ExpressServerUtils.getExpressApplicationName(all[i]);
- if( (host.endsWith("/" + host1 + "/") || (host.endsWith("/" + host1)))
- && appName.equals(app1))
- return all[i];
- }
- return null;
- }
-
/**
* Enables the user chosen, unshared project to be used on the chosen
* OpenShift application. Clones the application git repository, copies the
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java 2012-03-01 11:45:36 UTC (rev 39223)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java 2012-03-01 12:31:23 UTC (rev 39224)
@@ -30,6 +30,7 @@
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerType;
import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.core.ServerUtil;
import org.eclipse.wst.server.core.internal.Server;
import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
@@ -75,12 +76,30 @@
mode, application, user, project.getName(), remoteName, monitor);
}
+ private IServer findServer(String applicationName, String host) {
+ IServer[] all = ServerCore.getServers();
+ for( int i = 0; i < all.length; i++ ) {
+ String host1 = all[i].getHost();
+ String app1 = ExpressServerUtils.getExpressApplicationName(all[i]);
+ if( (host.endsWith("/" + host1 + "/") || (host.endsWith("/" + host1)))
+ && applicationName.equals(app1))
+ return all[i];
+ }
+ return null;
+ }
+
+
protected void createServerAdapter(List<IProject> importedProjects, IServerType serverType,
IRuntime runtime, String mode, IApplication application, IUser user,
String deployProject, String remoteName, IProgressMonitor monitor) {
try {
renameWebContextRoot(importedProjects);
- IServer server = doCreateServerAdapter(serverType, runtime, mode, application, user, deployProject, remoteName);
+ String name = application.getName();
+ String host = application.getApplicationUrl();
+ IServer server = findServer(name, host);
+ if( server == null ) {
+ server = doCreateServerAdapter(serverType, runtime, mode, application, user, deployProject, remoteName);
+ }
addModules(getModules(importedProjects), server, monitor);
} catch (CoreException ce) {
OpenShiftUIActivator.getDefault().getLog().log(ce.getStatus());
12 years, 2 months
JBoss Tools SVN: r39223 - trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-03-01 06:45:36 -0500 (Thu, 01 Mar 2012)
New Revision: 39223
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java
Log:
https://issues.jboss.org/browse/JBIDE-8701 - facets.jsp page was changed, junit should work correctly.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2012-03-01 11:08:03 UTC (rev 39222)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2012-03-01 11:45:36 UTC (rev 39223)
@@ -38,7 +38,7 @@
// suite.addTestSuite(VpePopupMenuTest.class);
suite.addTestSuite(VpeEditAnyDialogTest.class);
suite.addTestSuite(MultipleSelectionTest.class);
-// suite.addTestSuite(ScrollingTest_Jbide8701.class);
+ suite.addTestSuite(ScrollingTest_Jbide8701.class);
suite.addTestSuite(ToggleClassCastTest_Jbide9790.class);
return new VpeTestSetup(suite);
}
12 years, 2 months
JBoss Tools SVN: r39222 - in trunk/maven/plugins/org.jboss.tools.maven.seam: src/org/jboss/tools/maven/seam and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-03-01 06:08:03 -0500 (Thu, 01 Mar 2012)
New Revision: 39222
Modified:
trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml
trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/ParentAdder.java
Log:
JBIDE-11123 : remove groupId and version of maven modules. Also bumped up required maven version to 3.0
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml 2012-03-01 08:58:15 UTC (rev 39221)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml 2012-03-01 11:08:03 UTC (rev 39222)
@@ -34,7 +34,7 @@
</properties>
<prerequisites>
- <maven>2.0.9</maven>
+ <maven>3.0</maven>
</prerequisites>
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2012-03-01 08:58:15 UTC (rev 39221)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2012-03-01 11:08:03 UTC (rev 39222)
@@ -32,7 +32,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
@@ -62,8 +61,6 @@
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
import org.jboss.tools.maven.core.IJBossMavenConstants;
import org.jboss.tools.maven.core.MavenCoreActivator;
import org.jboss.tools.maven.core.ProjectUtil;
@@ -178,11 +175,7 @@
if (!pom.exists()) {
Model model = new Model();
model.setModelVersion(IJBossMavenConstants.MAVEN_MODEL_VERSION);
- model.setGroupId(m2FacetModel
- .getStringProperty(IJBossMavenConstants.GROUP_ID));
model.setArtifactId(testArtifactId);
- model.setVersion(m2FacetModel
- .getStringProperty(IJBossMavenConstants.VERSION));
model.setName(m2FacetModel.getStringProperty(IJBossMavenConstants.NAME) + " - test"); //$NON-NLS-1$
model.setPackaging("jar"); //$NON-NLS-1$
model.setDescription(m2FacetModel
@@ -333,11 +326,7 @@
if (!pom.exists()) {
Model model = new Model();
model.setModelVersion(IJBossMavenConstants.MAVEN_MODEL_VERSION);
- model.setGroupId(m2FacetModel
- .getStringProperty(IJBossMavenConstants.GROUP_ID));
model.setArtifactId(earArtifactId);
- model.setVersion(m2FacetModel
- .getStringProperty(IJBossMavenConstants.VERSION));
model.setName(m2FacetModel.getStringProperty(IJBossMavenConstants.NAME) + " - EAR"); //$NON-NLS-1$
model.setPackaging("ear"); //$NON-NLS-1$
model.setDescription(m2FacetModel
@@ -466,12 +455,6 @@
}
}
- private void removeRuntime(IProject project) throws CoreException {
- IFacetedProject facetedProject = ProjectFacetsManager.create( project );
- facetedProject.setRuntime(null, null);
-
- }
-
private void configureEjbProject(IDataModel m2FacetModel,
IDataModel seamFacetModel) {
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(ejbProjectName);
@@ -480,11 +463,7 @@
if (!pom.exists()) {
Model model = new Model();
model.setModelVersion(IJBossMavenConstants.MAVEN_MODEL_VERSION);
- model.setGroupId(m2FacetModel
- .getStringProperty(IJBossMavenConstants.GROUP_ID));
model.setArtifactId(ejbArtifactId);
- model.setVersion(m2FacetModel
- .getStringProperty(IJBossMavenConstants.VERSION));
model.setName(m2FacetModel.getStringProperty(IJBossMavenConstants.NAME) + " - EJB"); //$NON-NLS-1$
model.setPackaging("ejb"); //$NON-NLS-1$
model.setDescription(m2FacetModel
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/ParentAdder.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/ParentAdder.java 2012-03-01 08:58:15 UTC (rev 39221)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/ParentAdder.java 2012-03-01 11:08:03 UTC (rev 39222)
@@ -47,5 +47,12 @@
}
model.setParent(parent);
}
+ //Since we add the parent, we remove the version / groupId
+ if (groupId != null && groupId.equals(model.getGroupId())) {
+ model.setGroupId(null);
+ }
+ if (version != null && version.equals(model.getVersion())) {
+ model.setVersion(null);
+ }
}
}
\ No newline at end of file
12 years, 2 months
JBoss Tools SVN: r39221 - branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-03-01 03:58:15 -0500 (Thu, 01 Mar 2012)
New Revision: 39221
Modified:
branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java
Log:
Fixed - JBIDE-11069
Wrong/Missing marker information on JAX-RS validation errors
Modified: branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java 2012-03-01 08:23:40 UTC (rev 39220)
+++ branches/jbosstools-3.3.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java 2012-03-01 08:58:15 UTC (rev 39221)
@@ -339,6 +339,10 @@
int severity, final int offset, int length) throws JavaModelException {
final ValidatorMessage validationMsg = ValidatorMessage.create(msg,
this.getResource());
+ validationMsg.setType(JaxrsMetamodelBuilder.JAXRS_PROBLEM);
+ final ICompilationUnit compilationUnit = this.getJavaElement().getCompilationUnit();
+ final CompilationUnit ast = CompilationUnitsRepository.getInstance().getAST(compilationUnit);
+ validationMsg.setAttribute(IMarker.LOCATION, NLS.bind(ValidationMessages.LINE_NUMBER, ast.getLineNumber(offset)));
validationMsg.setAttribute(IMarker.MARKER,
JaxrsMetamodelBuilder.JAXRS_PROBLEM);
validationMsg.setAttribute(IMarker.SEVERITY, severity);
12 years, 2 months
JBoss Tools SVN: r39220 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-01 03:23:40 -0500 (Thu, 01 Mar 2012)
New Revision: 39220
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
Log:
JBIDE-11116 to trunk (additional patch, new server wizard fails without it)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2012-03-01 08:19:17 UTC (rev 39219)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2012-03-01 08:23:40 UTC (rev 39220)
@@ -27,7 +27,7 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.ScrolledPageBook;
-import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.util.SocketUtil;
import org.eclipse.wst.server.ui.internal.command.ServerCommand;
@@ -167,8 +167,9 @@
return true;
}
protected boolean showListenOnAllHostsCheckbox() {
- IServer server = callback.getServer().getOriginal();
- JBossExtendedProperties props = (JBossExtendedProperties)server
+
+ IRuntime rt = callback.getRuntime();
+ JBossExtendedProperties props = (JBossExtendedProperties)rt
.loadAdapter(JBossExtendedProperties.class,
new NullProgressMonitor());
return props == null ? false : props.runtimeSupportsBindingToAllInterfaces();
12 years, 2 months
JBoss Tools SVN: r39219 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-01 03:19:17 -0500 (Thu, 01 Mar 2012)
New Revision: 39219
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS710ExtendedProperties.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS7ExtendedProperties.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossExtendedProperties.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
Log:
JBIDE-11116 to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java 2012-03-01 08:14:15 UTC (rev 39218)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java 2012-03-01 08:19:17 UTC (rev 39219)
@@ -11,13 +11,14 @@
package org.jboss.ide.eclipse.as.core.server.internal;
import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossAS710ExtendedProperties;
import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossAS7ExtendedProperties;
import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossExtendedProperties;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
-public class ExtendedServerPropertiesAdapterFactory implements IAdapterFactory {
+public class ExtendedServerPropertiesAdapterFactory implements IAdapterFactory, IJBossToolingConstants {
public static JBossExtendedProperties getExtendedProperties(IServer server) {
return (JBossExtendedProperties) new ExtendedServerPropertiesAdapterFactory().getAdapter(server, JBossExtendedProperties.class);
@@ -25,31 +26,42 @@
@Override
public Object getAdapter(Object adaptableObject, Class adapterType) {
- if( adaptableObject instanceof IServer && adapterType == JBossExtendedProperties.class) {
- String typeId = ((IServer)adaptableObject).getServerType().getId();
- if( IJBossToolingConstants.SERVER_AS_32.equals(typeId))
- return new JBossExtendedProperties((IServer)adaptableObject);
- if( IJBossToolingConstants.SERVER_AS_40.equals(typeId))
- return new JBossExtendedProperties((IServer)adaptableObject);
- if( IJBossToolingConstants.SERVER_AS_42.equals(typeId))
- return new JBossExtendedProperties((IServer)adaptableObject);
- if( IJBossToolingConstants.SERVER_AS_50.equals(typeId))
- return new JBossExtendedProperties((IServer)adaptableObject);
- if( IJBossToolingConstants.SERVER_AS_51.equals(typeId))
- return new JBossExtendedProperties((IServer)adaptableObject);
- if( IJBossToolingConstants.SERVER_AS_60.equals(typeId))
- return new JBossExtendedProperties((IServer)adaptableObject);
- if( IJBossToolingConstants.SERVER_EAP_43.equals(typeId))
- return new JBossExtendedProperties((IServer)adaptableObject);
- if( IJBossToolingConstants.SERVER_EAP_50.equals(typeId))
- return new JBossExtendedProperties((IServer)adaptableObject);
+ if( adapterType != JBossExtendedProperties.class )
+ return null;
+ String typeId = null;
+ IServer s = null;
+ IRuntime r = null;
+ if( adaptableObject instanceof IServer ) {
+ typeId = ((IServer)adaptableObject).getServerType().getId();
+ s = (IServer)adaptableObject;
+ } else if( adaptableObject instanceof IRuntime ) {
+ typeId = ((IRuntime)adaptableObject).getRuntimeType().getId();
+ r = (IRuntime)adaptableObject;
+ }
+ if( typeId != null ) {
+ if( SERVER_AS_32.equals(typeId) || AS_32.equals(typeId))
+ return new JBossExtendedProperties(s == null ? r : s);
+ if( SERVER_AS_40.equals(typeId) || AS_40.equals(typeId))
+ return new JBossExtendedProperties(s == null ? r : s);
+ if( SERVER_AS_42.equals(typeId) || AS_42.equals(typeId))
+ return new JBossExtendedProperties(s == null ? r : s);
+ if( SERVER_AS_50.equals(typeId) || AS_50.equals(typeId))
+ return new JBossExtendedProperties(s == null ? r : s);
+ if( SERVER_AS_51.equals(typeId) || AS_51.equals(typeId))
+ return new JBossExtendedProperties(s == null ? r : s);
+ if( SERVER_AS_60.equals(typeId) || AS_60.equals(typeId))
+ return new JBossExtendedProperties(s == null ? r : s);
+ if( SERVER_EAP_43.equals(typeId) || EAP_43.equals(typeId))
+ return new JBossExtendedProperties(s == null ? r : s);
+ if( SERVER_EAP_50.equals(typeId) || EAP_50.equals(typeId))
+ return new JBossExtendedProperties(s == null ? r : s);
- if( IJBossToolingConstants.SERVER_AS_70.equals(typeId))
- return new JBossAS7ExtendedProperties((IServer)adaptableObject);
- if( IJBossToolingConstants.SERVER_AS_71.equals(typeId))
- return new JBossAS710ExtendedProperties((IServer)adaptableObject);
- if( IJBossToolingConstants.SERVER_EAP_60.equals(typeId))
- return new JBossAS710ExtendedProperties((IServer)adaptableObject);
+ if( SERVER_AS_70.equals(typeId) || AS_70.equals(typeId))
+ return new JBossAS7ExtendedProperties(s == null ? r : s);
+ if( SERVER_AS_71.equals(typeId) || AS_71.equals(typeId))
+ return new JBossAS710ExtendedProperties(s == null ? r : s);
+ if( SERVER_EAP_60.equals(typeId) || EAP_60.equals(typeId))
+ return new JBossAS710ExtendedProperties(s == null ? r : s);
// NEW_SERVER_ADAPTER
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS710ExtendedProperties.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS710ExtendedProperties.java 2012-03-01 08:14:15 UTC (rev 39218)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS710ExtendedProperties.java 2012-03-01 08:19:17 UTC (rev 39219)
@@ -10,15 +10,15 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.extendedproperties;
-import org.eclipse.wst.server.core.IServer;
+import org.eclipse.core.runtime.IAdaptable;
/**
*
*/
public class JBossAS710ExtendedProperties extends JBossAS7ExtendedProperties {
- public JBossAS710ExtendedProperties(IServer server) {
- super(server);
+ public JBossAS710ExtendedProperties(IAdaptable obj) {
+ super(obj);
}
public int getJMXProviderType() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS7ExtendedProperties.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS7ExtendedProperties.java 2012-03-01 08:14:15 UTC (rev 39218)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS7ExtendedProperties.java 2012-03-01 08:19:17 UTC (rev 39219)
@@ -10,14 +10,14 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.extendedproperties;
-import org.eclipse.wst.server.core.IServer;
+import org.eclipse.core.runtime.IAdaptable;
/**
*
*/
public class JBossAS7ExtendedProperties extends JBossExtendedProperties {
- public JBossAS7ExtendedProperties(IServer server) {
- super(server);
+ public JBossAS7ExtendedProperties(IAdaptable obj) {
+ super(obj);
}
public String getNewFilesetDefaultRootFolder() {
@@ -28,4 +28,11 @@
return JMX_DEFAULT_PROVIDER;
}
+ public boolean runtimeSupportsBindingToAllInterfaces() {
+ String version = getServerBeanLoader().getFullServerVersion();
+ if( version.startsWith("7.0.1") || version.startsWith("7.0.0")) //$NON-NLS-1$//$NON-NLS-2$
+ return false;
+ return true;
+ }
+
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossExtendedProperties.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossExtendedProperties.java 2012-03-01 08:14:15 UTC (rev 39218)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossExtendedProperties.java 2012-03-01 08:19:17 UTC (rev 39219)
@@ -1,7 +1,10 @@
package org.jboss.ide.eclipse.as.core.server.internal.extendedproperties;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.resolvers.ConfigNameResolver;
+import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
/**
@@ -12,9 +15,16 @@
*/
public class JBossExtendedProperties {
private IServer server;
- public JBossExtendedProperties(IServer server) {
- this.server = server;
+ private IRuntime runtime;
+ public JBossExtendedProperties(IAdaptable adaptable) {
+ if( adaptable instanceof IServer) {
+ this.server = (IServer)adaptable;
+ this.runtime = server.getRuntime();
+ } else if( adaptable instanceof IRuntime){
+ this.runtime = (IRuntime)adaptable;
+ }
}
+
public String getNewFilesetDefaultRootFolder() {
return "servers/${jboss_config}"; //$NON-NLS-1$
}
@@ -36,4 +46,13 @@
public int getJMXProviderType() {
return JMX_AS_3_TO_6_PROVIDER;
}
+
+
+ public boolean runtimeSupportsBindingToAllInterfaces() {
+ return true;
+ }
+
+ protected ServerBeanLoader getServerBeanLoader() {
+ return new ServerBeanLoader(runtime.getLocation().toFile());
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2012-03-01 08:14:15 UTC (rev 39218)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2012-03-01 08:19:17 UTC (rev 39219)
@@ -12,6 +12,7 @@
import java.util.ArrayList;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -26,6 +27,7 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.ScrolledPageBook;
+import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.util.SocketUtil;
import org.eclipse.wst.server.ui.internal.command.ServerCommand;
@@ -35,6 +37,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.BehaviourModel.Behaviour;
import org.jboss.ide.eclipse.as.core.server.internal.BehaviourModel.BehaviourImpl;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossExtendedProperties;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
@@ -164,7 +167,11 @@
return true;
}
protected boolean showListenOnAllHostsCheckbox() {
- return true;
+ IServer server = callback.getServer().getOriginal();
+ JBossExtendedProperties props = (JBossExtendedProperties)server
+ .loadAdapter(JBossExtendedProperties.class,
+ new NullProgressMonitor());
+ return props == null ? false : props.runtimeSupportsBindingToAllInterfaces();
}
protected void executeShellToggled() {
12 years, 2 months
JBoss Tools SVN: r39218 - branches/jbosstools-3.3.0.Beta1/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/utils/xpl.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-03-01 03:14:15 -0500 (Thu, 01 Mar 2012)
New Revision: 39218
Modified:
branches/jbosstools-3.3.0.Beta1/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/utils/xpl/JSFAppConfigUtils.java
Log:
JBIDE-11078 guard against NPE for non web projects
Modified: branches/jbosstools-3.3.0.Beta1/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/utils/xpl/JSFAppConfigUtils.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/utils/xpl/JSFAppConfigUtils.java 2012-03-01 07:59:20 UTC (rev 39217)
+++ branches/jbosstools-3.3.0.Beta1/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/utils/xpl/JSFAppConfigUtils.java 2012-03-01 08:14:15 UTC (rev 39218)
@@ -74,14 +74,15 @@
List<String> filesList = Collections.emptyList();
if (ModuleCoreNature.isFlexibleProject(project)) {
IModelProvider provider = ModelProviderManager.getModelProvider(project);
- Object webAppObj = provider.getModelObject();
- if (webAppObj != null){
- if (webAppObj instanceof WebApp)
- filesList = getConfigFilesForJ2EEApp(project);
- else if (webAppObj instanceof org.eclipse.jst.javaee.web.WebApp)
- filesList = getConfigFilesForJEEApp((org.eclipse.jst.javaee.web.WebApp)webAppObj);
+ if (provider != null) {
+ Object webAppObj = provider.getModelObject();
+ if (webAppObj != null){
+ if (webAppObj instanceof WebApp)
+ filesList = getConfigFilesForJ2EEApp(project);
+ else if (webAppObj instanceof org.eclipse.jst.javaee.web.WebApp)
+ filesList = getConfigFilesForJEEApp((org.eclipse.jst.javaee.web.WebApp)webAppObj);
+ }
}
-
}
return filesList;
}
12 years, 2 months