Author: justin
Date: Tue Aug 24 18:07:20 2010
New Revision: 988639
URL: http://svn.apache.org/viewvc?rev=988639&view=rev
Log:
changing classname and adding missing license header
Added:
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java
- copied, changed from r988612,
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingPlugin.java
Removed:
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingPlugin.java
Modified:
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/ControlListener.java
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/RunMojo.java
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/StartMojo.java
Copied:
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java
(from r988612,
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingPlugin.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java?p2=sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java&p1=sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingPlugin.java&r1=988612&r2=988639&rev=988639&view=diff
==============================================================================
---
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingPlugin.java
(original)
+++
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java
Tue Aug 24 18:07:20 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * 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
+ * License for the specific language governing permissions and limitations
under
+ * the License.
+ */
package org.apache.sling.maven.projectsupport;
import static org.apache.felix.framework.util.FelixConstants.*;
@@ -18,7 +34,6 @@ 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.plugin.MojoFailureException;
import org.apache.maven.shared.filtering.MavenFileFilter;
import org.apache.maven.shared.filtering.MavenFilteringException;
import org.apache.maven.shared.filtering.PropertyUtils;
@@ -32,10 +47,10 @@ import org.apache.sling.maven.projectsup
import org.osgi.framework.BundleException;
/**
- * @author justin
+ * Base plugin class for goals which start Sling.
*
*/
-public abstract class AbstractLaunchpadStartingPlugin extends
AbstractBundleListMojo implements Notifiable {
+public abstract class AbstractLaunchpadStartingMojo extends
AbstractBundleListMojo implements Notifiable {
/** Default log level setting if no set on command line (value is "INFO").
*/
private static final int DEFAULT_LOG_LEVEL = Logger.LOG_INFO;
Modified:
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/ControlListener.java
URL:
http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/ControlListener.java?rev=988639&r1=988638&r2=988639&view=diff
==============================================================================
---
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/ControlListener.java
(original)
+++
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/ControlListener.java
Tue Aug 24 18:07:20 2010
@@ -48,7 +48,7 @@ class ControlListener implements Runnabl
private static final int DEFAULT_LISTEN_PORT = 63000;
/** The mojo */
- private AbstractLaunchpadStartingPlugin mojo;
+ private AbstractLaunchpadStartingMojo mojo;
/** The log object */
private final Log log;
@@ -56,7 +56,7 @@ class ControlListener implements Runnabl
/** The socket address used for control communication */
private final SocketAddress socketAddress;
- ControlListener(AbstractLaunchpadStartingPlugin mojo, Log log, String
host, int port) {
+ ControlListener(AbstractLaunchpadStartingMojo mojo, Log log, String host,
int port) {
this.mojo = mojo;
this.log = log;
this.socketAddress = getSocketAddress(host, port);
Modified:
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/RunMojo.java
URL:
http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/RunMojo.java?rev=988639&r1=988638&r2=988639&view=diff
==============================================================================
---
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/RunMojo.java
(original)
+++
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/RunMojo.java
Tue Aug 24 18:07:20 2010
@@ -30,7 +30,7 @@ import org.osgi.framework.BundleExceptio
* @requiresDependencyResolution test
*
*/
-public class RunMojo extends AbstractLaunchpadStartingPlugin {
+public class RunMojo extends AbstractLaunchpadStartingMojo {
Modified:
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/StartMojo.java
URL:
http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/StartMojo.java?rev=988639&r1=988638&r2=988639&view=diff
==============================================================================
---
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/StartMojo.java
(original)
+++
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/StartMojo.java
Tue Aug 24 18:07:20 2010
@@ -30,7 +30,7 @@ import org.osgi.framework.BundleExceptio
* @requiresDependencyResolution test
*
*/
-public class StartMojo extends AbstractLaunchpadStartingPlugin {
+public class StartMojo extends AbstractLaunchpadStartingMojo {
/**
* @parameter expression="${sling.control.port}" default-value="63000"