incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1142568 - in /sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport: AbstractBundleListMojo.java AbstractLaunchpadStartingMojo.java DisplayBundleUpdatesMojo.java bundlelist/BaseBundleList.java
Date Mon, 04 Jul 2011 06:54:47 GMT
Author: cziegeler
Date: Mon Jul  4 06:54:47 2011
New Revision: 1142568

URL: http://svn.apache.org/viewvc?rev=1142568&view=rev
Log:
Code  cleanup - remove unused stuff.

Modified:
    sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java
    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/DisplayBundleUpdatesMojo.java
    sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/bundlelist/BaseBundleList.java

Modified: sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java
URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java?rev=1142568&r1=1142567&r2=1142568&view=diff
==============================================================================
--- sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java
(original)
+++ sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractBundleListMojo.java
Mon Jul  4 06:54:47 2011
@@ -45,10 +45,6 @@ public abstract class AbstractBundleList
      */
     protected static final String PARTIAL = "partialbundlelist";
 
-    protected static final String CONFIG_PATH_PREFIX = "resources/config";
-
-    protected static final String BUNDLE_PATH_PREFIX = "resources/bundles";
-
     protected static boolean shouldCopy(File source, File dest) {
         if (!dest.exists()) {
             return true;

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=1142568&r1=1142567&r2=1142568&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
Mon Jul  4 06:54:47 2011
@@ -5,9 +5,9 @@
  * licenses this file to You under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -16,12 +16,10 @@
  */
 package org.apache.sling.maven.projectsupport;
 
-import static org.apache.felix.framework.util.FelixConstants.*;
+import static org.apache.felix.framework.util.FelixConstants.LOG_LEVEL_PROP;
 
 import java.io.File;
 import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -83,7 +81,7 @@ public abstract class AbstractLaunchpadS
     /**
      * The definition of the package to be included to provide web support for
      * JAR-packaged projects (i.e. pax-web).
-     * 
+     *
      * @parameter
      */
     private ArtifactDefinition jarWebSupport;

Modified: sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/DisplayBundleUpdatesMojo.java
URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/DisplayBundleUpdatesMojo.java?rev=1142568&r1=1142567&r2=1142568&view=diff
==============================================================================
--- sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/DisplayBundleUpdatesMojo.java
(original)
+++ sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/DisplayBundleUpdatesMojo.java
Mon Jul  4 06:54:47 2011
@@ -5,9 +5,9 @@
  * licenses this file to You under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -35,7 +35,6 @@ import org.apache.maven.model.Dependency
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.path.PathTranslator;
 import org.apache.maven.settings.Settings;
 import org.apache.sling.maven.projectsupport.bundlelist.v1_0_0.Bundle;
@@ -52,10 +51,10 @@ import org.codehaus.plexus.util.xml.pull
 /**
  * Displays all bundles that have newer versions available. Highly based upon the
  * display-dependency-updates goal from the Versions plugin.
- * 
+ *
  * @since 2.0.8
  * @goal display-bundle-updates
- * 
+ *
  */
 public class DisplayBundleUpdatesMojo extends AbstractMojo {
 
@@ -70,25 +69,8 @@ public class DisplayBundleUpdatesMojo ex
     private org.apache.maven.artifact.factory.ArtifactFactory artifactFactory;
 
     /**
-     * @component
-     */
-    private org.apache.maven.artifact.resolver.ArtifactResolver resolver;
-
-    /**
-     * @component
-     */
-    private MavenProjectBuilder projectBuilder;
-
-    /**
-     * @parameter expression="${reactorProjects}"
-     * @required
-     * @readonly
-     */
-    private List reactorProjects;
-
-    /**
      * The artifact metadata source to use.
-     * 
+     *
      * @component
      * @required
      * @readonly
@@ -127,7 +109,7 @@ public class DisplayBundleUpdatesMojo ex
     /**
      * settings.xml's server id for the URL. This is used when wagon needs extra
      * authentication information.
-     * 
+     *
      * @parameter expression="${maven.version.rules.serverId}"
      *            default-value="serverId";
      */
@@ -136,14 +118,14 @@ public class DisplayBundleUpdatesMojo ex
     /**
      * The Wagon URI of a ruleSet file containing the rules that control how to
      * compare version numbers.
-     * 
+     *
      * @parameter expression="${maven.version.rules}"
      */
     private String rulesUri;
 
     /**
      * The Maven Session.
-     * 
+     *
      * @parameter expression="${session}"
      * @required
      * @readonly
@@ -163,7 +145,7 @@ public class DisplayBundleUpdatesMojo ex
     /**
      * Whether to allow snapshots when searching for the latest version of an
      * artifact.
-     * 
+     *
      * @parameter expression="${allowSnapshots}" default-value="false"
      */
     private boolean allowSnapshots;
@@ -177,9 +159,9 @@ public class DisplayBundleUpdatesMojo ex
     public void execute() throws MojoExecutionException, MojoFailureException {
         try {
             BundleList bundleList = readBundleList(bundleListFile);
-            
+
             Set<Dependency> bundlesAsDependencies = new HashSet<Dependency>();
-            
+
             for (StartLevel startLevel : bundleList.getStartLevels()) {
                 for (Bundle bundle : startLevel.getBundles()) {
                     bundlesAsDependencies.add(asDependency(bundle));
@@ -200,7 +182,7 @@ public class DisplayBundleUpdatesMojo ex
         dep.setClassifier(bundle.getClassifier());
         dep.setVersion(bundle.getVersion());
         dep.setType(bundle.getType());
-        
+
         return dep;
     }
 

Modified: sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/bundlelist/BaseBundleList.java
URL: http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/bundlelist/BaseBundleList.java?rev=1142568&r1=1142567&r2=1142568&view=diff
==============================================================================
--- sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/bundlelist/BaseBundleList.java
(original)
+++ sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/bundlelist/BaseBundleList.java
Mon Jul  4 06:54:47 2011
@@ -48,7 +48,7 @@ public abstract class BaseBundleList {
 
     /**
      * Merge the current bundle list with an additional list.
-     * @see add(Bundle)
+     * @see #add(Bundle)
      *
      * @param bundleList the new bundle list
      */



Mime
View raw message