Revision: 48
http://mvn-infix.svn.sourceforge.net/mvn-infix/?rev=48&view=rev
Author: bindul
Date: 2010-11-25 10:57:57 +0000 (Thu, 25 Nov 2010)
Log Message:
-----------
welcome Java5 for plexus
Modified Paths:
--------------
infix-parent/trunk/pom.xml
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/actions/CopyResourcesAction.java
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/actions/LoadDefaultsAction.java
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/actions/NsisCompileAction.java
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/actions/ScriptGenerationAction.java
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/io/DefaultProjectFileReader.java
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/resources/PropertyFileNsisDefaults.java
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/velocityutil/NSISResolveTool.java
plugins/maven-nsis-plugin/trunk/src/main/mdo/nsisproj.mdo
plugins/sfnet-mvnrepo-plugin/trunk/pom.xml
shared/infix-plugins-common/trunk/infix-mojo-utils/pom.xml
shared/infix-plugins-common/trunk/infix-velocity-utils/pom.xml
Modified: infix-parent/trunk/pom.xml
===================================================================
--- infix-parent/trunk/pom.xml 2010-11-24 23:31:45 UTC (rev 47)
+++ infix-parent/trunk/pom.xml 2010-11-25 10:57:57 UTC (rev 48)
@@ -372,6 +372,16 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
<version>${plexus.component.version}</version>
+ <!-- Despite what documentation says,
this one does not want to auto-attach! -->
+ <executions>
+ <execution>
+
<id>plexus-component-gen</id>
+
<phase>process-classes</phase>
+ <goals>
+
<goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</pluginManagement>
Modified:
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/actions/CopyResourcesAction.java
===================================================================
---
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/actions/CopyResourcesAction.java
2010-11-24 23:31:45 UTC (rev 47)
+++
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/actions/CopyResourcesAction.java
2010-11-25 10:57:57 UTC (rev 48)
@@ -20,6 +20,9 @@
*/
package com.mindtree.techworks.infix.plugins.nsis.actions;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
+
import com.mindtree.techworks.infix.plugins.nsis.model.v0_1_0.DependencySet;
import com.mindtree.techworks.infix.plugins.nsis.model.v0_1_0.FileItem;
import com.mindtree.techworks.infix.plugins.nsis.model.v0_1_0.FileSet;
@@ -34,28 +37,26 @@
*
* @author Bindul Bhowmik
* @version $Revision$ $Date$
- *
- * @plexus.component
role="com.mindtree.techworks.infix.plugins.nsis.actions.NsisAction"
- * role-hint="copy-resources"
*/
+...@component ( role = NsisAction.class, hint = "copy-resources" )
public class CopyResourcesAction implements NsisAction {
/**
* Resolver used to resolve file sets
- * @plexus.requirement role-hint="file-set"
*/
+ @Requirement ( role = Resolver.class, hint = "file-set" )
private Resolver fileSetResolver;
/**
* Resolver used to resolve files
- * @plexus.requirement role-hint="file"
*/
+ @Requirement ( role = Resolver.class, hint = "file" )
private Resolver fileResolver;
/**
* Resolver used to resolve dependencies
- * @plexus.requirement role-hint="dependency"
*/
+ @Requirement ( role = Resolver.class, hint = "dependency" )
private Resolver dependencyResolver;
/* (non-Javadoc)
Modified:
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/actions/LoadDefaultsAction.java
===================================================================
---
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/actions/LoadDefaultsAction.java
2010-11-24 23:31:45 UTC (rev 47)
+++
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/actions/LoadDefaultsAction.java
2010-11-25 10:57:57 UTC (rev 48)
@@ -23,6 +23,8 @@
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.Pointer;
import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.util.StringUtils;
import
com.mindtree.techworks.infix.plugins.nsis.model.v0_1_0.FinishPageSettings;
@@ -42,10 +44,8 @@
*
* @author Bindul Bhowmik
* @version $Revision$ $Date$
- *
- * @plexus.component
role="com.mindtree.techworks.infix.plugins.nsis.actions.NsisAction"
- * role-hint="load-default"
*/
+...@component ( role = NsisAction.class, hint = "load-default" )
public class LoadDefaultsAction implements NsisAction {
/**
@@ -55,8 +55,8 @@
/**
* The NSIS Defaults
- * @plexus.requirement
*/
+ @Requirement ( role = NsisDefaults.class )
private NsisDefaults nsisDefaults;
/* (non-Javadoc)
Modified:
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/actions/NsisCompileAction.java
===================================================================
---
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/actions/NsisCompileAction.java
2010-11-24 23:31:45 UTC (rev 47)
+++
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/actions/NsisCompileAction.java
2010-11-25 10:57:57 UTC (rev 48)
@@ -24,6 +24,7 @@
import java.io.IOException;
import org.apache.maven.plugin.logging.Log;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
@@ -36,10 +37,8 @@
*
* @author Bindul Bhowmik
* @version $Revision$ $Date$
- *
- * @plexus.component
role="com.mindtree.techworks.infix.plugins.nsis.actions.NsisAction"
- * role-hint="compile"
*/
+...@component ( role = NsisAction.class, hint = "compile" )
public class NsisCompileAction implements NsisAction, NsisScriptConstants {
/**
Modified:
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/actions/ScriptGenerationAction.java
===================================================================
---
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/actions/ScriptGenerationAction.java
2010-11-24 23:31:45 UTC (rev 47)
+++
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/actions/ScriptGenerationAction.java
2010-11-25 10:57:57 UTC (rev 48)
@@ -34,20 +34,21 @@
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
import org.apache.velocity.runtime.resource.loader.FileResourceLoader;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
-import
com.mindtree.techworks.infix.plugins.nsis.velocityutil.MavenVelocityLogChute;
-import
com.mindtree.techworks.infix.plugins.nsis.velocityutil.RenderStringWithNewLine;
-import com.mindtree.techworks.infix.plugins.nsis.velocityutil.VelocityTool;
+import
com.mindtree.techworks.infix.pluginscommon.velocity.MavenVelocityLogChute;
+import
com.mindtree.techworks.infix.pluginscommon.velocity.RenderStringWithNewLine;
+import com.mindtree.techworks.infix.pluginscommon.velocity.tools.VelocityTool;
+
/**
* Uses Velocity to generate the NSIS scripts
*
* @author Bindul Bhowmik
* @version $Revision$ $Date$
- *
- * @plexus.component
role="com.mindtree.techworks.infix.plugins.nsis.actions.NsisAction"
- * role-hint="script-generate"
*/
+...@component ( role = NsisAction.class, hint = "script-generate" )
public class ScriptGenerationAction implements NsisAction, NsisScriptConstants
{
/**
@@ -57,20 +58,20 @@
/**
* The null tool used for null checking in velocity templates
- * @plexus.requirement role-hint="null-tool"
*/
+ @Requirement ( role = VelocityTool.class, hint = "null-tool")
private VelocityTool nullTool;
/**
* The path resolve tool
- * @plexus.requirement role-hint="path-resolve-tool"
*/
+ @Requirement ( role = VelocityTool.class, hint = "path-resolve-tool")
private VelocityTool pathResolveTool;
/**
* The velocity tool to resolve the filesets, files and dependencies
- * @plexus.requirement role-hint="resolve-tool"
*/
+ @Requirement ( role = VelocityTool.class, hint = "resolve-tool-nsis")
private VelocityTool resolveTool;
/* (non-Javadoc)
Modified:
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/io/DefaultProjectFileReader.java
===================================================================
---
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/io/DefaultProjectFileReader.java
2010-11-24 23:31:45 UTC (rev 47)
+++
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/io/DefaultProjectFileReader.java
2010-11-25 10:57:57 UTC (rev 48)
@@ -24,6 +24,7 @@
import java.io.FileReader;
import java.io.IOException;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import com.mindtree.techworks.infix.plugins.nsis.model.v0_1_0.NsisProject;
@@ -35,9 +36,8 @@
*
* @author Bindul Bhowmik
* @version $Revision$ $Date$
- *
- * @plexus.component
role="com.mindtree.techworks.infix.plugins.nsis.io.ProjectFileReader"
role-hint="default"
*/
+...@component ( role = ProjectFileReader.class, hint = "default")
public class DefaultProjectFileReader implements ProjectFileReader {
/* (non-Javadoc)
Modified:
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/resources/PropertyFileNsisDefaults.java
===================================================================
---
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/resources/PropertyFileNsisDefaults.java
2010-11-24 23:31:45 UTC (rev 47)
+++
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/resources/PropertyFileNsisDefaults.java
2010-11-25 10:57:57 UTC (rev 48)
@@ -23,16 +23,16 @@
import java.io.IOException;
import java.util.Properties;
+import org.codehaus.plexus.component.annotations.Component;
+
/**
* Loads the Nsis Default values from property files.
*
* @author Bindul Bhowmik
* @version $Revision$ $Date$
- *
- * @plexus.component
role="com.mindtree.techworks.infix.plugins.nsis.resources.NsisDefaults"
- * role-hint="default"
*/
+...@component ( role = NsisDefaults.class, hint = "default")
public class PropertyFileNsisDefaults implements NsisDefaults {
/**
Modified:
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/velocityutil/NSISResolveTool.java
===================================================================
---
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/velocityutil/NSISResolveTool.java
2010-11-24 23:31:45 UTC (rev 47)
+++
plugins/maven-nsis-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/nsis/velocityutil/NSISResolveTool.java
2010-11-25 10:57:57 UTC (rev 48)
@@ -32,6 +32,7 @@
import com.mindtree.techworks.infix.plugins.nsis.model.v0_1_0.Section;
import
com.mindtree.techworks.infix.pluginscommon.mojo.locationbase.LocationBase;
+import com.mindtree.techworks.infix.pluginscommon.velocity.tools.ResolveTool;
import com.mindtree.techworks.infix.pluginscommon.velocity.tools.VelocityTool;
/**
Modified: plugins/maven-nsis-plugin/trunk/src/main/mdo/nsisproj.mdo
===================================================================
--- plugins/maven-nsis-plugin/trunk/src/main/mdo/nsisproj.mdo 2010-11-24
23:31:45 UTC (rev 47)
+++ plugins/maven-nsis-plugin/trunk/src/main/mdo/nsisproj.mdo 2010-11-25
10:57:57 UTC (rev 48)
@@ -20,7 +20,7 @@
|
| $Id$
-->
-<model xmlns="http://modello.codehaus.org/MODELLO/1.4.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.4.0
http://modello.codehaus.org/xsd/modello-1.4.0.xsd";
xml.namespace="http://mindtree.com/techworks/infix/plugins/nsis-plugin/${version}";
xml.schemaLocation="http://mvn-infix.sourceforge.net/maven-nsis-plugin/xsds/nsis-config-${version}.xsd";
java.suppressAllWarnings="false">
+<model xmlns="http://modello.codehaus.org/MODELLO/1.4.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.4.0
http://modello.codehaus.org/xsd/modello-1.4.0.xsd";
xml.namespace="http://mindtree.com/techworks/infix/plugins/nsis-plugin/${version}";
xml.schemaLocation="http://mvn-infix.sourceforge.net/maven-nsis-plugin/xsds/nsis-config-${version}.xsd";
java.suppressAllWarnings="true">
<id>NsisProject</id>
<name>NsisProject</name>
<description>
Modified: plugins/sfnet-mvnrepo-plugin/trunk/pom.xml
===================================================================
--- plugins/sfnet-mvnrepo-plugin/trunk/pom.xml 2010-11-24 23:31:45 UTC (rev 47)
+++ plugins/sfnet-mvnrepo-plugin/trunk/pom.xml 2010-11-25 10:57:57 UTC (rev 48)
@@ -39,10 +39,13 @@
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
- <groupId>com.mindtree.techworks.infix.shared</groupId>
- <artifactId>infix-velocity-util</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+
<groupId>com.mindtree.techworks.infix.plugins-common</groupId>
+ <artifactId>infix-mojo-utils</artifactId>
</dependency>
+ <dependency>
+
<groupId>com.mindtree.techworks.infix.plugins-common</groupId>
+ <artifactId>infix-velocity-utils</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: shared/infix-plugins-common/trunk/infix-mojo-utils/pom.xml
===================================================================
--- shared/infix-plugins-common/trunk/infix-mojo-utils/pom.xml 2010-11-24
23:31:45 UTC (rev 47)
+++ shared/infix-plugins-common/trunk/infix-mojo-utils/pom.xml 2010-11-25
10:57:57 UTC (rev 48)
@@ -15,7 +15,6 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
- <!-- Should auto attach, if not will have to
put in an execution -->
</plugin>
</plugins>
</build>
Modified: shared/infix-plugins-common/trunk/infix-velocity-utils/pom.xml
===================================================================
--- shared/infix-plugins-common/trunk/infix-velocity-utils/pom.xml
2010-11-24 23:31:45 UTC (rev 47)
+++ shared/infix-plugins-common/trunk/infix-velocity-utils/pom.xml
2010-11-25 10:57:57 UTC (rev 48)
@@ -15,7 +15,6 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
- <!-- Should auto attach, if not will have to
put in an execution -->
</plugin>
</plugins>
</build>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
mvn-Infix-commits mailing list
mvn-Infix-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mvn-infix-commits
