You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/02/11 09:22:31 UTC
svn commit: r1444679 - in /karaf/branches/karaf-2.3.x:
assemblies/apache-karaf/src/main/distribution/text/etc/
assemblies/apache-karaf/src/main/filtered-resources/demos/deployer/kar/
deployer/kar/src/main/java/org/apache/karaf/deployer/kar/ deployer/ka...
Author: jbonofre
Date: Mon Feb 11 08:22:31 2013
New Revision: 1444679
URL: http://svn.apache.org/r1444679
Log:
[KARAF-2114] Remove reference to "old" kar local-repo folder (now use directly system repo)
Modified:
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/demos/deployer/kar/README.txt
karaf/branches/karaf-2.3.x/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java
karaf/branches/karaf-2.3.x/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java
karaf/branches/karaf-2.3.x/manual/src/main/webapp/users-guide/kar.conf
karaf/branches/karaf-2.3.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
Modified: karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg?rev=1444679&r1=1444678&r2=1444679&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg Mon Feb 11 08:22:31 2013
@@ -73,8 +73,7 @@ org.ops4j.pax.url.mvn.disableAether=true
#
# The following property value will add the system folder as a repo.
#
-org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/${karaf.default.repository}@snapshots@id=karaf.${karaf.default.repository},\
- file:${karaf.home}/local-repo@snapshots@id=karaf.local-repo
+org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/${karaf.default.repository}@snapshots@id=karaf.${karaf.default.repository}
#
# Comma separated list of repositories scanned when resolving an artifact.
Modified: karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/demos/deployer/kar/README.txt
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/demos/deployer/kar/README.txt?rev=1444679&r1=1444678&r2=1444679&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/demos/deployer/kar/README.txt (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/demos/deployer/kar/README.txt Mon Feb 11 08:22:31 2013
@@ -51,8 +51,8 @@ To deploy a kar, simply drop the kar int
The KAR Deployer will deploy all the kar content starting from
the features descriptor.
-The KAR Deployer creates a repository dedicated to your kar
-(in the $/local-repo) and register the features descriptor.
+The KAR Deployer uncompress the KAR archive in the system
+repository and register the features descriptor.
You can now see your feature available for installation:
karaf@root> feature:list | grep -i my-kar
Modified: karaf/branches/karaf-2.3.x/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java?rev=1444679&r1=1444678&r2=1444679&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java (original)
+++ karaf/branches/karaf-2.3.x/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java Mon Feb 11 08:22:31 2013
@@ -52,7 +52,7 @@ public class KarArtifactInstaller implem
private static final String ZIP_SUFFIX = ".zip";
private String base = "./";
- private String localRepoPath = "./target/local-repo";
+ private String localRepoPath = "./target/system";
private String timestampPath;
Modified: karaf/branches/karaf-2.3.x/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java?rev=1444679&r1=1444678&r2=1444679&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java (original)
+++ karaf/branches/karaf-2.3.x/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java Mon Feb 11 08:22:31 2013
@@ -51,7 +51,7 @@ public class KarArtifactInstallerTest {
karArtifactInstaller.setFeaturesService(featuresService);
karArtifactInstaller.setBasePath("./target");
- karArtifactInstaller.setLocalRepoPath("./target/local-repo");
+ karArtifactInstaller.setLocalRepoPath("./target/system");
karArtifactInstaller.init();
Modified: karaf/branches/karaf-2.3.x/manual/src/main/webapp/users-guide/kar.conf
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/manual/src/main/webapp/users-guide/kar.conf?rev=1444679&r1=1444678&r2=1444679&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/manual/src/main/webapp/users-guide/kar.conf (original)
+++ karaf/branches/karaf-2.3.x/manual/src/main/webapp/users-guide/kar.conf Mon Feb 11 08:22:31 2013
@@ -97,16 +97,11 @@ It's a core deployer (you don't need to
To deploy a kar, simply drop the kar into the deploy directory. The KAR Deployer will deploy all the kar content starting
from the features descriptor.
-The KAR Deployer creates a repository dedicated to your kar (in the ${KARAF_HOME}/local-repo) and register the features
-descriptor. You can now see your feature available for installation:
+The KAR Deployer uncompress KAR archives in the system repository and register the features descriptor.
+All features contained in a KAR archive will be automatically installed at deployment time.
+You can now see your features installed:
{code}
karaf@root> features:list|grep -i my
-[uninstalled] [1.0 ] my repo-0
-{code}
-
-Now you can use any commands available on features:
-
-{code}
-karaf@root> features:install my
+[ installed] [1.0 ] my repo-0
{code}
Modified: karaf/branches/karaf-2.3.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java?rev=1444679&r1=1444678&r2=1444679&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java Mon Feb 11 08:22:31 2013
@@ -36,8 +36,6 @@ import org.apache.maven.artifact.Artifac
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import javax.swing.text.html.Option;
-
/**
* Installs kar dependencies into a server-under-construction in target/assembly
*
@@ -69,15 +67,15 @@ public class InstallKarsMojo extends Moj
/**
* Directory that resources are copied to during the build.
*
- * @parameter expression="${project.build.directory}/assembly/local-repo"
+ * @parameter expression="${project.build.directory}/assembly/system"
* @required
*/
- protected String localRepoDirectory;
+ protected String systemRepoDirectory;
public void execute() throws MojoExecutionException, MojoFailureException {
KarArtifactInstaller installer = new KarArtifactInstaller();
installer.setBasePath(workDirectory);
- installer.setLocalRepoPath(localRepoDirectory);
+ installer.setLocalRepoPath(systemRepoDirectory);
FeaturesService featuresService = new OfflineFeaturesService();
installer.setFeaturesService(featuresService);
installer.init();