[jboss-cvs] JBossAS SVN: r70761 - in projects/aop/trunk/maven-jbossaop-plugin: src/main/java/org/jboss/maven/plugins and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 12 07:00:29 EDT 2008
Author: stalep
Date: 2008-03-12 07:00:29 -0400 (Wed, 12 Mar 2008)
New Revision: 70761
Modified:
projects/aop/trunk/maven-jbossaop-plugin/pom.xml
projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPCMojo.java
projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPMojo.java
Log:
[JBAOP-529]
- changed back to snapshot untill aop are final.
- added support for jboss.aop.class.path
Modified: projects/aop/trunk/maven-jbossaop-plugin/pom.xml
===================================================================
--- projects/aop/trunk/maven-jbossaop-plugin/pom.xml 2008-03-12 10:27:34 UTC (rev 70760)
+++ projects/aop/trunk/maven-jbossaop-plugin/pom.xml 2008-03-12 11:00:29 UTC (rev 70761)
@@ -9,9 +9,17 @@
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jbossaop-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>1.0.CR1</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>JBoss AOP Maven Plugin</name>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
+ </snapshotRepository>
+ </distributionManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -35,6 +43,20 @@
</dependency>
<dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ <version>1.0-beta-1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
<version>2.0.0.CR3</version>
@@ -147,9 +169,28 @@
<configuration>
<source>${jdkVersion}</source>
<target>${jdkVersion}</target>
+ <!--
+ <projectArtifact implementation="org.apache.maven.plugins.testing.stubs.StubArtifact"/>
+ -->
</configuration>
</plugin>
+<!--
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compileSourceRoots>
+ <compileSourceRoot>${basedir}\target\test-classes\unit\compiler-basic-test\src\main\java</compileSourceRoot>
+ </compileSourceRoots>
+ <compilerId>javac</compilerId>
+ <debug>true</debug>
+ <outputDirectory>${basedir}\target\test\unit\compiler-basic-test\target\classes</outputDirectory>
+ <buildDirectory>${basedir}\target\test\unit\compiler-basic-test\target</buildDirectory>
+ <projectArtifact implementation="org.apache.maven.plugins.testing.stubs.StubArtifact"/>
+ </configuration>
+ </plugin>
+ -->
+
</plugins>
</build>
Modified: projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPCMojo.java
===================================================================
--- projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPCMojo.java 2008-03-12 10:27:34 UTC (rev 70760)
+++ projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPCMojo.java 2008-03-12 11:00:29 UTC (rev 70761)
@@ -103,7 +103,7 @@
*
* @parameter expression="${aopPaths}" default-value={src/main/resources/jboss-aop.xml}
*/
- private String[] aoppaths;
+ private File[] aoppaths;
/**
*
@@ -167,7 +167,6 @@
sb.append(project.getBuild().getOutputDirectory());
-// System.err.println("CLASSPATH: "+sb.toString());
return sb.toString();
}
@@ -191,7 +190,9 @@
if(getAopClassPath() != null && getAopClassPath().length() > 0)
cl.addArguments(new String[] { "-aopclasspath", getAopClassPath()});
- cl.addArguments(new String[] { "-aoppath", getAoppath()});
+ String aoppath = getAoppath();
+ if(aoppath != null && aoppath.length() > 0)
+ cl.addArguments(new String[] { "-aoppath", aoppath});
if(includes != null && includes.length > 0)
{
@@ -243,19 +244,22 @@
private String getAoppath()
{
- if(aoppaths.length > 0)
+ StringBuffer sb = new StringBuffer();
+ if(aoppaths != null)
{
- StringBuffer sb = new StringBuffer();
- for(String aoppath : aoppaths)
+ for(File aoppath : aoppaths)
{
- if(sb.length() > 0)
- sb.append(File.pathSeparator);
- sb.append(aoppath);
+ if(aoppath != null)
+ {
+ if(sb.length() > 0)
+ sb.append(File.pathSeparator);
+ sb.append(aoppath.getAbsolutePath());
+ }
}
return sb.toString();
}
else
- return new File(project.getBasedir(),"src/main/resources/jboss-aop.xml").getAbsolutePath();
+ return null;
}
private void processStream(BufferedReader input, boolean isError)
Modified: projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPMojo.java
===================================================================
--- projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPMojo.java 2008-03-12 10:27:34 UTC (rev 70760)
+++ projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPMojo.java 2008-03-12 11:00:29 UTC (rev 70761)
@@ -66,11 +66,17 @@
*
* @parameter expression="${aopPaths}" default-value={src/main/resources/jboss-aop.xml}
*/
- private String[] aoppaths;
+ private File[] aoppaths;
/**
*
- * @parameter expression="${executable}" default-value=null
+ * @parameter expression="${aopClassPath}" default-value=
+ */
+ private String aopClassPath;
+
+ /**
+ *
+ * @parameter expression="${executable}" default-value=
* @required
*/
private String executable;
@@ -135,8 +141,14 @@
cl.addArguments(new String[] { "-javaagent:"+javaagent});
}
cl.addArguments(new String[] { "-cp", createClassPathList()});
- cl.addArguments(new String[] { "-Djboss.aop.path="+ getAoppath()});
+ String aoppath = getAoppath();
+ if(aoppath != null && aoppath.length() > 0)
+ cl.addArguments(new String[] { "-Djboss.aop.path="+ aoppath});
+
+ if(aopClassPath != null && aopClassPath.length() > 0)
+ cl.addArguments(new String[] { "-Djboss.aop.class.path="+ aopClassPath});
+
cl.addArguments(new String[] { executable});
if(getLog().isDebugEnabled())
@@ -190,20 +202,22 @@
private String getAoppath()
{
- if(aoppaths.length > 0)
+ StringBuffer sb = new StringBuffer();
+ if(aoppaths != null)
{
- StringBuffer sb = new StringBuffer();
- for(String aoppath : aoppaths)
+ for(File aoppath : aoppaths)
{
- if(sb.length() > 0)
- sb.append(File.pathSeparator);
- sb.append(new File(project.getBasedir(), aoppath).getAbsolutePath());
-// sb.append(aoppath);
+ if(aoppath != null)
+ {
+ if(sb.length() > 0)
+ sb.append(File.pathSeparator);
+ sb.append(aoppath.getAbsolutePath());
+ }
}
return sb.toString();
}
else
- return new File(project.getBasedir(),"src/main/resources/jboss-aop.xml").getAbsolutePath();
+ return null;
}
private void processStream(BufferedReader input, boolean isError)
More information about the jboss-cvs-commits
mailing list