karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject karaf git commit: KARAF-4187 - Define threadSafe behavior on MOJOs
Date Thu, 28 Jan 2016 10:33:54 GMT
Repository: karaf
Updated Branches:
  refs/heads/master 1a4ab197c -> 90fc01875


KARAF-4187 - Define threadSafe behavior on MOJOs


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/90fc0187
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/90fc0187
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/90fc0187

Branch: refs/heads/master
Commit: 90fc01875718f81d847377772a74519fe4c74e86
Parents: 1a4ab19
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Thu Jan 28 11:31:15 2016 +0100
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Thu Jan 28 11:31:15 2016 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/karaf/tooling/ArchiveMojo.java        | 2 +-
 .../src/main/java/org/apache/karaf/tooling/AssemblyMojo.java       | 2 +-
 .../src/main/java/org/apache/karaf/tooling/KarMojo.java            | 2 +-
 .../src/main/java/org/apache/karaf/tooling/RunMojo.java            | 2 +-
 .../src/main/java/org/apache/karaf/tooling/VerifyMojo.java         | 2 +-
 .../src/main/java/org/apache/karaf/tooling/client/ClientMojo.java  | 2 +-
 .../src/main/java/org/apache/karaf/tooling/client/DeployMojo.java  | 2 +-
 .../java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java   | 2 +-
 .../org/apache/karaf/tooling/features/AddToRepositoryMojo.java     | 2 +-
 .../apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java   | 2 +-
 .../org/apache/karaf/tooling/features/GenerateDescriptorMojo.java  | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/90fc0187/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/ArchiveMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/ArchiveMojo.java
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/ArchiveMojo.java
index b86295c..e5dcbcb 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/ArchiveMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/ArchiveMojo.java
@@ -45,7 +45,7 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
 /**
  * Package a server archive from an assembled server
  */
-@Mojo(name = "archive", defaultPhase = LifecyclePhase.PACKAGE, requiresDependencyResolution
= ResolutionScope.RUNTIME)
+@Mojo(name = "archive", defaultPhase = LifecyclePhase.PACKAGE, requiresDependencyResolution
= ResolutionScope.RUNTIME, threadSafe = true)
 public class ArchiveMojo extends MojoSupport {
 
     /**

http://git-wip-us.apache.org/repos/asf/karaf/blob/90fc0187/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
index e02425f..cee6109 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
@@ -51,7 +51,7 @@ import java.util.List;
  * and then added to the assembly by this goal.
  * <br>
  */
-@Mojo(name = "assembly", defaultPhase = LifecyclePhase.PACKAGE, requiresDependencyResolution
= ResolutionScope.RUNTIME)
+@Mojo(name = "assembly", defaultPhase = LifecyclePhase.PACKAGE, requiresDependencyResolution
= ResolutionScope.RUNTIME, threadSafe = true)
 public class AssemblyMojo extends MojoSupport {
 
     /**

http://git-wip-us.apache.org/repos/asf/karaf/blob/90fc0187/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/KarMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/KarMojo.java
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/KarMojo.java
index 5d712bd..db383eb 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/KarMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/KarMojo.java
@@ -58,7 +58,7 @@ import org.codehaus.plexus.archiver.jar.JarArchiver;
 /**
  * Assemble a kar archive from a features.xml file
  */
-@Mojo(name = "kar", defaultPhase = LifecyclePhase.PACKAGE, requiresDependencyResolution =
ResolutionScope.RUNTIME)
+@Mojo(name = "kar", defaultPhase = LifecyclePhase.PACKAGE, requiresDependencyResolution =
ResolutionScope.RUNTIME, threadSafe = true)
 public class KarMojo extends MojoSupport {
 
     /**

http://git-wip-us.apache.org/repos/asf/karaf/blob/90fc0187/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/RunMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/RunMojo.java
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/RunMojo.java
index 449c854..16023bf 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/RunMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/RunMojo.java
@@ -52,7 +52,7 @@ import java.util.regex.Pattern;
 /**
  * Run a Karaf instance
  */
-@Mojo(name = "run", defaultPhase = LifecyclePhase.PACKAGE, requiresDependencyResolution =
ResolutionScope.RUNTIME)
+@Mojo(name = "run", defaultPhase = LifecyclePhase.PACKAGE, requiresDependencyResolution =
ResolutionScope.RUNTIME, threadSafe = false)
 public class RunMojo extends MojoSupport {
 
     /**

http://git-wip-us.apache.org/repos/asf/karaf/blob/90fc0187/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
index be61268..9e47449 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
@@ -108,7 +108,7 @@ import org.osgi.service.resolver.ResolutionException;
 
 import static java.util.jar.JarFile.MANIFEST_NAME;
 
-@Mojo(name = "verify", requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME)
+@Mojo(name = "verify", requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME,
threadSafe = true)
 public class VerifyMojo extends MojoSupport {
 
     @Parameter(property = "descriptors")

http://git-wip-us.apache.org/repos/asf/karaf/blob/90fc0187/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/ClientMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/ClientMojo.java
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/ClientMojo.java
index ae602c0..f6373d2 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/ClientMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/ClientMojo.java
@@ -58,7 +58,7 @@ import java.util.concurrent.TimeUnit;
 /**
  * Client MOJO to deployWithSsh command on a running Karaf instance
  */
-@Mojo(name = "client", defaultPhase = LifecyclePhase.PACKAGE, requiresDependencyResolution
= ResolutionScope.RUNTIME)
+@Mojo(name = "client", defaultPhase = LifecyclePhase.PACKAGE, requiresDependencyResolution
= ResolutionScope.RUNTIME, threadSafe = true)
 public class ClientMojo extends AbstractMojo {
 
     @Parameter(defaultValue = "8101")

http://git-wip-us.apache.org/repos/asf/karaf/blob/90fc0187/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/DeployMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/DeployMojo.java
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/DeployMojo.java
index 07b516c..308ec0e 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/DeployMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/DeployMojo.java
@@ -68,7 +68,7 @@ import java.util.concurrent.TimeUnit;
 /**
  * Deploy MOJO to deploy an artifact remotely on a running Karaf instance, using ssh or JMX
  */
-@Mojo(name = "deploy", defaultPhase = LifecyclePhase.PACKAGE, requiresDependencyResolution
= ResolutionScope.RUNTIME)
+@Mojo(name = "deploy", defaultPhase = LifecyclePhase.PACKAGE, requiresDependencyResolution
= ResolutionScope.RUNTIME, threadSafe = true)
 public class DeployMojo extends MojoSupport {
 
     @Parameter(defaultValue = "8101")

http://git-wip-us.apache.org/repos/asf/karaf/blob/90fc0187/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java
index bcf180d..c8a19d7 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java
@@ -47,7 +47,7 @@ import org.apache.xbean.finder.ClassFinder;
  * Generates help documentation for Karaf commands
  */
 @Mojo(name = "commands-generate-help", defaultPhase = LifecyclePhase.GENERATE_RESOURCES,
-        requiresDependencyResolution = ResolutionScope.RUNTIME, inheritByDefault = false)
+        requiresDependencyResolution = ResolutionScope.RUNTIME, inheritByDefault = false,
threadSafe = true)
 public class GenerateHelpMojo extends AbstractMojo {
 
     /**

http://git-wip-us.apache.org/repos/asf/karaf/blob/90fc0187/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java
index cee39bb..dfa9447 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java
@@ -38,7 +38,7 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
 /**
  * Add features to a repository directory
  */
-@Mojo(name = "features-add-to-repository", defaultPhase = LifecyclePhase.COMPILE, requiresDependencyResolution
= ResolutionScope.RUNTIME)
+@Mojo(name = "features-add-to-repository", defaultPhase = LifecyclePhase.COMPILE, requiresDependencyResolution
= ResolutionScope.RUNTIME, threadSafe = true)
 public class AddToRepositoryMojo extends AbstractFeatureMojo {
 
     @Parameter(defaultValue = "${project.build.directory}/features-repo")

http://git-wip-us.apache.org/repos/asf/karaf/blob/90fc0187/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java
index bd3bc05..71e8082 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java
@@ -46,7 +46,7 @@ import org.osgi.framework.Version;
 /**
  * Export meta data about features
  */
-@Mojo(name = "features-export-meta-data", defaultPhase = LifecyclePhase.COMPILE, requiresDependencyResolution
= ResolutionScope.RUNTIME)
+@Mojo(name = "features-export-meta-data", defaultPhase = LifecyclePhase.COMPILE, requiresDependencyResolution
= ResolutionScope.RUNTIME, threadSafe = true)
 public class ExportFeatureMetaDataMojo extends AbstractFeatureMojo {
     
     /**

http://git-wip-us.apache.org/repos/asf/karaf/blob/90fc0187/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
index c786e40..a4c9c1c 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
@@ -80,7 +80,7 @@ import static org.apache.karaf.deployer.kar.KarArtifactInstaller.FEATURE_CLASSIF
  * 
  * NB this requires a recent maven-install-plugin such as 2.3.1
  */
-@Mojo(name = "features-generate-descriptor", defaultPhase = LifecyclePhase.COMPILE, requiresDependencyResolution
= ResolutionScope.RUNTIME)
+@Mojo(name = "features-generate-descriptor", defaultPhase = LifecyclePhase.COMPILE, requiresDependencyResolution
= ResolutionScope.RUNTIME, threadSafe = true)
 public class GenerateDescriptorMojo extends MojoSupport {
 
     /**


Mime
View raw message