diff --git a/buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy b/buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy index 2e0751545a..fe7f7e597e 100644 --- a/buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy +++ b/buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy @@ -64,11 +64,9 @@ class AspectJPlugin implements Plugin { project.tasks.withType(GenerateEclipseClasspath) { project.eclipse.classpath.file.whenMerged { classpath -> def entries = classpath.entries.findAll { it instanceof ProjectDependency}.findAll { entry -> - def projectPath = entry.path.replaceAll('/',':') -println projectPath + def projectPath = entry.path.replaceAll('/','') project.rootProject.allprojects.find{ p-> if(p.plugins.findPlugin(EclipsePlugin)) { - println " checking " + p.eclipse.project.name return p.eclipse.project.name == projectPath && p.plugins.findPlugin(AspectJPlugin) } false diff --git a/gradle/ide-integration.gradle b/gradle/ide-integration.gradle index 5672927458..30feeae920 100644 --- a/gradle/ide-integration.gradle +++ b/gradle/ide-integration.gradle @@ -51,7 +51,7 @@ project(':spring-security-samples-aspectj') { doLast { def classpath = new XmlParser().parse(srcFile) - classpath.classpathentry.findAll{ it.@path == '/spring-security-aspects' }.each { node -> + classpath.classpathentry.findAll{ it.@path.startsWith('/spring-security-aspects') }.each { node -> if(node.children().size() == 0) { def attrs = new Node(node,'attributes') def adjtAttr = new Node(attrs,'attributes',[name: 'org.eclipse.ajdt.aspectpath', value: 'org.eclipse.ajdt.aspectpath'])