svn commit: r1444680 - in /karaf/trunk: manual/src/main/webapp/users-guide/ tooling/karaf-maven-plugin/ tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ tooling/karaf-maven-plugin/src/site/apt/

[jb...@apache.org]

Author: jbonofre
Date: Mon Feb 11 08:43:46 2013
New Revision: 1444680

URL: http://svn.apache.org/r1444680
Log:
[KARAF-2114] Cleanup "old" local-repo references

Modified:
    karaf/trunk/manual/src/main/webapp/users-guide/kar.conf
    karaf/trunk/tooling/karaf-maven-plugin/pom.xml
    karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
    karaf/trunk/tooling/karaf-maven-plugin/src/site/apt/usage.apt

Modified: karaf/trunk/manual/src/main/webapp/users-guide/kar.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/kar.conf?rev=1444680&r1=1444679&r2=1444680&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/users-guide/kar.conf (original)
+++ karaf/trunk/manual/src/main/webapp/users-guide/kar.conf Mon Feb 11 08:43:46 2013
@@ -108,18 +108,12 @@ 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, automatically register features descriptors contained
+in the KAR, and automatically installs all features:
 
 {code}
 karaf@root> feature:list|grep -i my
-[uninstalled] [1.0             ] my                            repo-0
-{code}
-
-Now you can use any commands available on features:
-
-{code}
-karaf@root> feature:install my
+[  installed] [1.0             ] my                            repo-0
 {code}
 
 h2. Kar structure

Modified: karaf/trunk/tooling/karaf-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/pom.xml?rev=1444680&r1=1444679&r2=1444680&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/pom.xml (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/pom.xml Mon Feb 11 08:43:46 2013
@@ -178,7 +178,7 @@
                                 <pomInclude>*/pom.xml</pomInclude>
                             </pomIncludes>
                             <postBuildHookScript>verify</postBuildHookScript>
-                            <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+                            <localRepositoryPath>${project.build.directory}/system</localRepositoryPath>
                             <!--<settingsFile>src/it/settings.xml</settingsFile>-->
                             <mavenOpts>-Djava.io.tmpdir=${project.build.directory}</mavenOpts>
                             <goals>

Modified: karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java?rev=1444680&r1=1444679&r2=1444680&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java Mon Feb 11 08:43:46 2013
@@ -130,14 +130,14 @@ public class InstallKarsMojo extends Moj
     private List<String> startupFeatures;
 
     /**
-     * List of features from runtime-scope features xml and kars to be installed into local-repo and listed in features service boot features.
+     * List of features from runtime-scope features xml and kars to be installed into system repo and listed in features service boot features.
      *
      * @parameter
      */
     private List<String> bootFeatures;
 
     /**
-     * List of features from runtime-scope features xml and kars to be installed into local-repo and not mentioned elsewhere.
+     * List of features from runtime-scope features xml and kars to be installed into system repo and not mentioned elsewhere.
      *
      * @parameter
      */
@@ -286,7 +286,7 @@ public class InstallKarsMojo extends Moj
             }
         }
 
-        // install bundles listed in install features not in system into local-repo
+        // install bundles listed in install features not in system
         for (Feature feature : localRepoFeatures) {
             for (Bundle bundle : feature.getBundle()) {
                 if (!bundle.isDependency()) {

Modified: karaf/trunk/tooling/karaf-maven-plugin/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/site/apt/usage.apt?rev=1444680&r1=1444679&r2=1444680&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/site/apt/usage.apt (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/site/apt/usage.apt Mon Feb 11 08:43:46 2013
@@ -195,8 +195,7 @@ Packagings
 
   - unpacks the resources content from project dependencies that are kars
 
-  - unpacks the system maven-repo-like structure from project dependencies that are kars. If the project dependency is scope compile or provided it is unpacked to system.  If the scope is runtime
-  it is unpacked to local-repo
+  - unpacks the system maven-repo-like structure from project dependencies that are kars. If the project dependency is scope compile or provided it is unpacked to system.
 
   - locates and installs all the bundles mentioned in feature xml descriptors that are project dependencies or located in project dependencies that are kars of scope compile/provided.