svn commit: r1180166 - in /sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport: AbstractLaunchpadStartingMojo.java AbstractUsingBundleListMojo.java

[justin]

Author: justin
Date: Fri Oct  7 19:14:15 2011
New Revision: 1180166

URL: http://svn.apache.org/viewvc?rev=1180166&view=rev
Log:
SLING-2241 - AbstractLaunchpadStartingMojo uses protected fields from parent 
class

Modified:
    
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java
    
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java

Modified: 
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java?rev=1180166&r1=1180165&r2=1180166&view=diff
==============================================================================
--- 
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java
 (original)
+++ 
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java
 Fri Oct  7 19:14:15 2011
@@ -36,9 +36,7 @@ import java.util.Set;
 
 import org.apache.felix.framework.Logger;
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.shared.filtering.MavenFileFilter;
 import org.apache.maven.shared.filtering.MavenFilteringException;
 import org.apache.maven.shared.filtering.PropertyUtils;
 import org.apache.sling.launchpad.api.LaunchpadContentProvider;
@@ -105,18 +103,6 @@ public abstract class AbstractLaunchpadS
      */
     private File resourceProviderRoot;
 
-    /**
-     * @component
-     */
-    private MavenFileFilter mavenFileFilter;
-
-    /**
-     * @parameter expression="${session}"
-     * @required
-     * @readonly
-     */
-    private MavenSession mavenSession;
-
     private LaunchpadContentProvider resourceProvider = new 
LaunchpadContentProvider() {
 
         public Iterator<String> getChildren(String path) {

Modified: 
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java?rev=1180166&r1=1180165&r2=1180166&view=diff
==============================================================================
--- 
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java
 (original)
+++ 
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractUsingBundleListMojo.java
 Fri Oct  7 19:14:15 2011
@@ -175,7 +175,7 @@ public abstract class AbstractUsingBundl
     /**
      * @component
      */
-    private MavenFileFilter mavenFileFilter;
+    protected MavenFileFilter mavenFileFilter;
 
     /**
      * The zip unarchiver.