[jboss-cvs] jbosside/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/classpath ...
Robert Stryker
rob.stryker at jboss.com
Wed Mar 21 12:32:26 EDT 2007
User: rawb
Date: 07/03/21 12:32:26
Modified: ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/classpath
AopFromRuntimeClasspathContainer.java
EJB3ClasspathContainer.java
Log:
Removed aop project references
Revision Changes Path
1.5 +30 -7 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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- AopFromRuntimeClasspathContainer.java 10 Nov 2006 17:07:12 -0000 1.4
+++ AopFromRuntimeClasspathContainer.java 21 Mar 2007 16:32:26 -0000 1.5
@@ -26,20 +26,21 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IClasspathContainer;
+import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.core.runtime.server.AbstractJBossServerRuntime;
-import org.jboss.ide.eclipse.jdt.aop.core.classpath.AopJdk15ClasspathContainer;
/**
* @author Marshall
*/
-public class AopFromRuntimeClasspathContainer extends AopJdk15ClasspathContainer
+public class AopFromRuntimeClasspathContainer implements IClasspathContainer
{
public static final String CONTAINER_ID = "org.jboss.ide.eclipse.jdt.ejb3.wizards.core.classpath.AOP15_CONTAINER";
-
- public static final String DESCRIPTION = AopJdk15ClasspathContainer.DESCRIPTION;
+ public static final String DESCRIPTION = "JBossAOP 1.3 Libraries (jdk 1.5)";
private static IPath clientPath, libPath, aopDeployerPath;
static {
@@ -62,10 +63,9 @@
protected IJavaProject javaProject;
protected AbstractJBossServerRuntime jbsRuntime;
-
+ protected IPath path;
public AopFromRuntimeClasspathContainer(IPath path, IJavaProject project) {
- super(path);
-
+ this.path = path;
this.javaProject = project;
String runtimeName = path.segment(1);
IRuntime runtime = ServerCore.findRuntime(runtimeName);
@@ -113,4 +113,27 @@
public String getDescription() {
return DESCRIPTION + " [" + (jbsRuntime == null ? "error" : jbsRuntime.getRuntime().getName()) + "]";
}
+
+ public IClasspathEntry[] getClasspathEntries() {
+ ArrayList entries = new ArrayList();
+ IPath jarPaths[] = getAopJarPaths();
+
+ for (int i = 0; i < jarPaths.length; i++) {
+ IPath jar = jarPaths[i];
+
+ // Later we can add the source jars here..
+ IClasspathEntry entry = JavaCore.newLibraryEntry(jar, null, null, false);
+ entries.add(entry);
+ }
+
+ return (IClasspathEntry[]) entries.toArray(new IClasspathEntry[entries.size()]);
+ }
+
+ public int getKind() {
+ return K_APPLICATION;
+ }
+
+ public IPath getPath() {
+ return path;
+ }
}
1.5 +31 -5 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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- EJB3ClasspathContainer.java 10 Nov 2006 17:07:12 -0000 1.4
+++ EJB3ClasspathContainer.java 21 Mar 2007 16:32:26 -0000 1.5
@@ -27,16 +27,18 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.jdt.core.IClasspathContainer;
+import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.core.runtime.server.AbstractJBossServerRuntime;
-import org.jboss.ide.eclipse.jdt.aop.core.classpath.AopClasspathContainer;
/**
* @author Marshall
*/
-public class EJB3ClasspathContainer extends AopClasspathContainer
+public class EJB3ClasspathContainer implements IClasspathContainer
{
public static final String CONTAINER_ID = "org.jboss.ide.eclipse.jdt.ejb3.wizards.core.classpath.EJB3_CONTAINER";
@@ -69,10 +71,9 @@
protected IJavaProject javaProject;
protected AbstractJBossServerRuntime jbsRuntime;
-
+ protected IPath path;
public EJB3ClasspathContainer(IPath path, IJavaProject project) {
- super(path);
-
+ this.path = path;
this.javaProject = project;
String runtimeName = path.segment(1);
IRuntime runtime = ServerCore.findRuntime(runtimeName);
@@ -120,4 +121,29 @@
public String getDescription() {
return DESCRIPTION + " [" + (jbsRuntime == null ? "error" : jbsRuntime.getRuntime().getName()) + "]";
}
+
+ public IClasspathEntry[] getClasspathEntries()
+ {
+ ArrayList entries = new ArrayList();
+ IPath jarPaths[] = getAopJarPaths();
+
+ for (int i = 0; i < jarPaths.length; i++)
+ {
+ IPath jar = jarPaths[i];
+
+ // Later we can add the source jars here..
+ IClasspathEntry entry = JavaCore.newLibraryEntry(jar, null, null, false);
+ entries.add(entry);
+ }
+
+ return (IClasspathEntry[]) entries.toArray(new IClasspathEntry[entries.size()]);
+ }
+
+ public int getKind() {
+ return K_APPLICATION;
+ }
+
+ public IPath getPath() {
+ return path;
+ }
}
More information about the jboss-cvs-commits
mailing list