You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2008/10/20 11:58:35 UTC
svn commit: r706179 - in /labs/magma/trunk/maven-magma-plugin: ./
src/main/java/org/apache/magma/tools/maven/
Author: simoneg
Date: Mon Oct 20 02:58:34 2008
New Revision: 706179
URL: http://svn.apache.org/viewvc?rev=706179&view=rev
Log:
Minor tweaks to the maven plugin
Modified:
labs/magma/trunk/maven-magma-plugin/pom.xml
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/JettyWeavingURLClassLoader.java
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaAjcCompileMojo.java
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRun.java
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java
Modified: labs/magma/trunk/maven-magma-plugin/pom.xml
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/pom.xml?rev=706179&r1=706178&r2=706179&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/pom.xml (original)
+++ labs/magma/trunk/maven-magma-plugin/pom.xml Mon Oct 20 02:58:34 2008
@@ -23,7 +23,7 @@
<groupId>org.apache.magma.tools</groupId>
<artifactId>maven-magma-plugin</artifactId>
<name>Magma Extension Mojo</name>
- <version>0.0.1</version>
+ <version>0.0.2-r2</version>
<description>
Extends the AspectJ compiler plugin, surefire test plugin and
jetty plugin to better suite magma components.
@@ -33,6 +33,12 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
Modified: labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/JettyWeavingURLClassLoader.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/JettyWeavingURLClassLoader.java?rev=706179&r1=706178&r2=706179&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/JettyWeavingURLClassLoader.java (original)
+++ labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/JettyWeavingURLClassLoader.java Mon Oct 20 02:58:34 2008
@@ -142,7 +142,7 @@
}
catch (AbortException ex) {
trace.error("defineClass",ex);
- throw ex;
+ //throw ex;
}
catch (Throwable th) {
trace.error("defineClass",th);
Modified: labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaAjcCompileMojo.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaAjcCompileMojo.java?rev=706179&r1=706178&r2=706179&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaAjcCompileMojo.java (original)
+++ labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaAjcCompileMojo.java Mon Oct 20 02:58:34 2008
@@ -49,6 +49,8 @@
if (!this.ajcOptions.contains("-source")) {
super.setSource("1.5");
}
+ //this.ajcOptions.add("-XterminateAfterCompilation");
+ //this.ajcOptions.add("-Xset:pipelineCompilation=false");
super.execute();
}
Modified: labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRun.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRun.java?rev=706179&r1=706178&r2=706179&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRun.java (original)
+++ labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRun.java Mon Oct 20 02:58:34 2008
@@ -178,8 +178,10 @@
SelectChannelConnector connector = new SelectChannelConnector();
String portnum = System.getProperty(PORT_SYSPROPERTY, null);
int port = ((portnum==null||portnum.equals(""))?DEFAULT_PORT:Integer.parseInt(portnum.trim()));
+ connector.setAcceptors(50);
connector.setPort(port);
connector.setMaxIdleTime(DEFAULT_MAX_IDLE_TIME);
+
server.addConnector(connector);
try {
Modified: labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java?rev=706179&r1=706178&r2=706179&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java (original)
+++ labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java Mon Oct 20 02:58:34 2008
@@ -853,7 +853,7 @@
String key = ArtifactUtils.versionlessKey( "org.apache.openjpa", "openjpa");
Artifact art = (Artifact) projectArtifactMap.get(key);
if (art != null) {
- art = artifactFactory.createPluginArtifact("org.apache.magma.tools", "maven-magma-plugin", VersionRange.createFromVersion("0.0.1"));
+ art = artifactFactory.createPluginArtifact("org.apache.magma.tools", "maven-magma-plugin", VersionRange.createFromVersion("0.0.2-r2"));
try {
artifactResolver.resolve(art, Collections.EMPTY_LIST, localRepository);
} catch (ArtifactResolutionException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org