You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/02/19 20:08:45 UTC
svn commit: r1291042 - in /openejb/trunk/maven-plugins: ./
info-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/info/
properties-maven-plugin/
properties-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/properties/
Author: rmannibucau
Date: Sun Feb 19 19:08:44 2012
New Revision: 1291042
URL: http://svn.apache.org/viewvc?rev=1291042&view=rev
Log:
removing properties-maven-plugin
Removed:
openejb/trunk/maven-plugins/properties-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/properties/AbstractPropertiesPlugin.java
Modified:
openejb/trunk/maven-plugins/info-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/info/InfoMojo.java
openejb/trunk/maven-plugins/pom.xml
openejb/trunk/maven-plugins/properties-maven-plugin/pom.xml
openejb/trunk/maven-plugins/properties-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/properties/ProxySettingsPropertiesMojo.java
Modified: openejb/trunk/maven-plugins/info-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/info/InfoMojo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/maven-plugins/info-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/info/InfoMojo.java?rev=1291042&r1=1291041&r2=1291042&view=diff
==============================================================================
--- openejb/trunk/maven-plugins/info-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/info/InfoMojo.java (original)
+++ openejb/trunk/maven-plugins/info-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/info/InfoMojo.java Sun Feb 19 19:08:44 2012
@@ -9,6 +9,7 @@ import org.apache.openejb.OpenEJBExcepti
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.config.AppModule;
import org.apache.openejb.config.ConfigurationFactory;
+import org.apache.openejb.config.PreconfiguredFactory;
import org.apache.openejb.loader.IO;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.LogStream;
@@ -56,10 +57,10 @@ public class InfoMojo extends AbstractMo
info = replaceContainers(info);
final StringWriter writer = new StringWriter();
- ConfigurationFactory.dump(writer, info);
+ PreconfiguredFactory.dump(writer, info);
final String xml = replacePath(path, writer.toString());
- final File output = new File(module, ConfigurationFactory.APP_INFO_XML);
+ final File output = new File(module, PreconfiguredFactory.APP_INFO_XML);
final File parent = output.getParentFile();
if (!parent.exists() && !parent.mkdirs()) {
throw new OpenEJBException("can't create directory " + output.getParent());
@@ -76,7 +77,7 @@ public class InfoMojo extends AbstractMo
}
private String replacePath(final String path, final String s) {
- return s.replace(path, ConfigurationFactory.APP_INFO_XML_PATH);
+ return s.replace(path, PreconfiguredFactory.APP_INFO_XML_PATH);
}
// TODO?
@@ -84,11 +85,6 @@ public class InfoMojo extends AbstractMo
return appInfo;
}
- // TODO?
- private AppInfo replacePath(AppInfo info) {
- return info;
- }
-
public static class MavenLogStreamFactory implements LogStreamFactory {
private static Log logger;
Modified: openejb/trunk/maven-plugins/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/maven-plugins/pom.xml?rev=1291042&r1=1291041&r2=1291042&view=diff
==============================================================================
--- openejb/trunk/maven-plugins/pom.xml (original)
+++ openejb/trunk/maven-plugins/pom.xml Sun Feb 19 19:08:44 2012
@@ -35,7 +35,6 @@
<modules>
<module>tomee-maven-plugin</module>
- <module>properties-maven-plugin</module>
<module>info-maven-plugin</module>
</modules>
@@ -69,7 +68,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>4.0.0-beta-3-SNAPSHOT</version>
+ <version>${openejb.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -77,6 +76,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.version>2.2.1</maven.version>
+ <openejb.version>4.0.0-beta-3-SNAPSHOT</openejb.version>
</properties>
<build>
Modified: openejb/trunk/maven-plugins/properties-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/maven-plugins/properties-maven-plugin/pom.xml?rev=1291042&r1=1291041&r2=1291042&view=diff
==============================================================================
--- openejb/trunk/maven-plugins/properties-maven-plugin/pom.xml (original)
+++ openejb/trunk/maven-plugins/properties-maven-plugin/pom.xml Sun Feb 19 19:08:44 2012
@@ -2,41 +2,57 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>maven-plugins-parent</artifactId>
- <groupId>org.apache.openejb</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>properties-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <name>OpenEJB Maven Plugins :: Properties Maven Plugin</name>
+ <version>3.0.5-SNAPSHOT</version>
+ <name>Maven Plugin :: Properties Maven Plugin</name>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
+ <version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
+ <version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
+ <version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
+ <version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-api</artifactId>
+ <version>1.8</version>
</dependency>
</dependencies>
<properties>
- <maven-plugin.prefix>properties</maven-plugin.prefix>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.version>2.2.1</maven.version>
</properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <goalPrefix>properties</goalPrefix>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: openejb/trunk/maven-plugins/properties-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/properties/ProxySettingsPropertiesMojo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/maven-plugins/properties-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/properties/ProxySettingsPropertiesMojo.java?rev=1291042&r1=1291041&r2=1291042&view=diff
==============================================================================
--- openejb/trunk/maven-plugins/properties-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/properties/ProxySettingsPropertiesMojo.java (original)
+++ openejb/trunk/maven-plugins/properties-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/properties/ProxySettingsPropertiesMojo.java Sun Feb 19 19:08:44 2012
@@ -1,5 +1,7 @@
package org.apache.openejb.maven.plugins.properties;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.settings.Proxy;
@@ -11,7 +13,13 @@ import java.util.Collection;
/**
* @goal copy-settings-proxy
*/
-public class ProxySettingsPropertiesMojo extends AbstractPropertiesPlugin {
+public class ProxySettingsPropertiesMojo extends AbstractMojo {
+ /**
+ * @parameter expression="${session}"
+ * @required
+ */
+ private MavenSession session;
+
/**
* @parameter expression="${settings}"
* @required
@@ -53,7 +61,17 @@ public class ProxySettingsPropertiesMojo
getLog().info("set proxy " + toString(proxy));
}
- private String toString(final Proxy proxy) {
+ protected void setProperty(final String key, final String value) {
+ session.getUserProperties().setProperty(key, value);
+ }
+
+ protected void setPropertyIfNotNull(final String key, final String value) {
+ if (value != null) {
+ setProperty(key, value);
+ }
+ }
+
+ private static String toString(final Proxy proxy) {
return new StringBuilder(proxy.getId())
.append("[")
.append(proxy.getProtocol()).append("://")