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

[Robert Stryker]

  User: rawb    
  Date: 06/11/10 10:49:28

  Modified:    ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/classpath  
                        AopFromRuntimeClasspathContainer.java
                        EJB3ClasspathContainer.java
  Log:
  Silly API changes in .as required some cleanup.   Sorry. - Stryker
  
  Revision  Changes    Path
  1.2       +4 -4      jbosside/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/classpath/AopFromRuntimeClasspathContainer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AopFromRuntimeClasspathContainer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/classpath/AopFromRuntimeClasspathContainer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- AopFromRuntimeClasspathContainer.java	6 Nov 2006 17:04:25 -0000	1.1
  +++ AopFromRuntimeClasspathContainer.java	10 Nov 2006 15:49:28 -0000	1.2
  @@ -29,7 +29,7 @@
   import org.eclipse.jdt.core.IJavaProject;
   import org.eclipse.wst.server.core.IRuntime;
   import org.eclipse.wst.server.core.ServerCore;
  -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.jdt.aop.core.classpath.AopJdk15ClasspathContainer;
   
   /**
  @@ -61,7 +61,7 @@
   
      
      protected IJavaProject javaProject;
  -   protected JBossServerRuntime jbsRuntime;
  +   protected AbstractJBossServerRuntime jbsRuntime;
      
      public AopFromRuntimeClasspathContainer(IPath path, IJavaProject project) {
         super(path);
  @@ -70,7 +70,7 @@
         String runtimeName = path.segment(1);
         IRuntime runtime = ServerCore.findRuntime(runtimeName);
         if( runtime != null ) 
  -    	  jbsRuntime = (JBossServerRuntime)runtime.loadAdapter(JBossServerRuntime.class, new NullProgressMonitor());
  +    	  jbsRuntime = (AbstractJBossServerRuntime)runtime.loadAdapter(AbstractJBossServerRuntime.class, new NullProgressMonitor());
      }
   
      public IPath[] getAopJarPaths() {
  @@ -78,7 +78,7 @@
            return new IPath[0];
   
         String jbossBaseDir = jbsRuntime.getRuntime().getLocation().toOSString();
  -      String jbossConfigDir = jbsRuntime.getConfigName();
  +      String jbossConfigDir = jbsRuntime.getJBossConfiguration();
   
         ArrayList paths = new ArrayList();
   
  
  
  
  1.2       +4 -4      jbosside/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/classpath/EJB3ClasspathContainer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EJB3ClasspathContainer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/classpath/EJB3ClasspathContainer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- EJB3ClasspathContainer.java	6 Nov 2006 17:04:25 -0000	1.1
  +++ EJB3ClasspathContainer.java	10 Nov 2006 15:49:28 -0000	1.2
  @@ -30,7 +30,7 @@
   import org.eclipse.jdt.core.IJavaProject;
   import org.eclipse.wst.server.core.IRuntime;
   import org.eclipse.wst.server.core.ServerCore;
  -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.jdt.aop.core.classpath.AopClasspathContainer;
   
   /**
  @@ -68,7 +68,7 @@
      
      
      protected IJavaProject javaProject;
  -   protected JBossServerRuntime jbsRuntime;
  +   protected AbstractJBossServerRuntime jbsRuntime;
      
      public EJB3ClasspathContainer(IPath path, IJavaProject project) {
         super(path);
  @@ -77,7 +77,7 @@
         String runtimeName = path.segment(1);
         IRuntime runtime = ServerCore.findRuntime(runtimeName);
         if( runtime != null ) 
  -    	  jbsRuntime = (JBossServerRuntime)runtime.loadAdapter(JBossServerRuntime.class, new NullProgressMonitor());
  +    	  jbsRuntime = (AbstractJBossServerRuntime)runtime.loadAdapter(AbstractJBossServerRuntime.class, new NullProgressMonitor());
      }
   
      public IPath[] getAopJarPaths() {
  @@ -85,7 +85,7 @@
            return new IPath[0];
   
         String jbossBaseDir = jbsRuntime.getRuntime().getLocation().toOSString();
  -      String jbossConfigDir = jbsRuntime.getConfigName();
  +      String jbossConfigDir = jbsRuntime.getJBossConfiguration();
   
         ArrayList paths = new ArrayList();