[jboss-cvs] jbosside/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/facet ...

[Marshall Culpepper]

  User: mculpepper
  Date: 06/11/10 12:07:12

  Modified:    ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/facet 
                        Ejb30FacetProjectCreationDataModelProvider.java
  Log:
  re-applying rob's changes
  
  Revision  Changes    Path
  1.4       +4 -5      jbosside/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/facet/Ejb30FacetProjectCreationDataModelProvider.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Ejb30FacetProjectCreationDataModelProvider.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/facet/Ejb30FacetProjectCreationDataModelProvider.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Ejb30FacetProjectCreationDataModelProvider.java	10 Nov 2006 17:03:57 -0000	1.3
  +++ Ejb30FacetProjectCreationDataModelProvider.java	10 Nov 2006 17:07:12 -0000	1.4
  @@ -22,8 +22,7 @@
   import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
   import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
   import org.eclipse.wst.server.core.ServerCore;
  -import org.jboss.ide.eclipse.as.core.server.JBossServer;
  -import org.jboss.ide.eclipse.as.core.server.runtime.JBossServerRuntime;
  +import org.jboss.ide.eclipse.as.core.runtime.server.AbstractJBossServerRuntime;
   import org.jboss.ide.eclipse.ejb3.core.classpath.EJB3ClasspathContainer;
   
   public class Ejb30FacetProjectCreationDataModelProvider extends J2EEFacetProjectCreationDataModelProvider {
  @@ -79,7 +78,7 @@
   				String id = (String)properties.get("id");
   				org.eclipse.wst.server.core.IRuntime wstRuntime = ServerCore.findRuntime(id);
   				try {
  -					JBossServerRuntime jbrt = (JBossServerRuntime) wstRuntime.getAdapter(JBossServerRuntime.class);
  +					AbstractJBossServerRuntime jbrt = (AbstractJBossServerRuntime) wstRuntime.getAdapter(AbstractJBossServerRuntime.class);
   					if( hasEJB3(jbrt)) {
   						list.add(descriptors[i]);
   					}
  @@ -96,11 +95,11 @@
   		return super.getValidPropertyDescriptors(propertyName);
   	}
   	
  -	protected boolean hasEJB3(JBossServerRuntime jbrt) {
  +	protected boolean hasEJB3(AbstractJBossServerRuntime jbrt) {
   	      IPath jarToCheck = EJB3ClasspathContainer.jbossConfigRelativeJarPaths[0];
   
   	      String jbossBaseDir = jbrt.getRuntime().getLocation().toOSString();
  -	      String jbossConfigDir = jbrt.getConfigName();
  +	      String jbossConfigDir = jbrt.getJBossConfiguration();
   	      IPath absoluteJarPath = new Path(jbossBaseDir).append("server").append(jbossConfigDir).append(jarToCheck);
   	      return absoluteJarPath.toFile().exists();
   	}