You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by pi...@apache.org on 2011/02/07 12:57:15 UTC
svn commit: r1067926 - in /karaf/branches/karaf-2.2.x: ./
assemblies/apache-karaf/src/main/filtered-resources/etc/
assemblies/apache-karaf/src/main/filtered-resources/minimal/ demos/web/
itests/kittests/ tooling/testing/ tooling/testing/src/main/java/o...
Author: pieber
Date: Mon Feb 7 11:57:14 2011
New Revision: 1067926
URL: http://svn.apache.org/viewvc?rev=1067926&view=rev
Log:
Fixed wrong references to moved/renamed projects
Signed-off-by: Andreas Pieber <an...@gmail.com>
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg
karaf/branches/karaf-2.2.x/demos/web/pom.xml
karaf/branches/karaf-2.2.x/itests/kittests/pom.xml
karaf/branches/karaf-2.2.x/pom.xml
karaf/branches/karaf-2.2.x/tooling/testing/pom.xml
karaf/branches/karaf-2.2.x/tooling/testing/src/main/java/org/apache/karaf/testing/Helper.java
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1067926&r1=1067925&r2=1067926&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Mon Feb 7 11:57:14 2011
@@ -20,7 +20,7 @@
#
# Comma separated list of features repositories to register by default
#
-featuresRepositories=mvn:org.apache.karaf.features.assembly/standard/${project.version}/xml/features,mvn:org.apache.karaf.features.assembly/enterprise/${project.version}/xml/features
+featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${project.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${project.version}/xml/features
#
# Comma separated list of features to install at startup
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg?rev=1067926&r1=1067925&r2=1067926&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg Mon Feb 7 11:57:14 2011
@@ -21,7 +21,7 @@
# Comma separated list of features repositories to register by default
#
#
-featuresRepositories=mvn:org.apache.karaf.features.assembly/standard/${project.version}/xml/features,mvn:org.apache.karaf.features.assembly/enterprise/${project.version}/xml/features
+featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${project.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${project.version}/xml/features
#
# Comma separated list of features to install at startup
Modified: karaf/branches/karaf-2.2.x/demos/web/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/demos/web/pom.xml?rev=1067926&r1=1067925&r2=1067926&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/demos/web/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/demos/web/pom.xml Mon Feb 7 11:57:14 2011
@@ -49,7 +49,7 @@
<artifactId>org.apache.karaf.jaas.boot</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.assemblies</groupId>
<artifactId>apache-karaf</artifactId>
<type>zip</type>
<scope>provided</scope>
@@ -120,7 +120,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.assemblies</groupId>
<artifactId>apache-karaf</artifactId>
<type>zip</type>
<overWrite>true</overWrite>
Modified: karaf/branches/karaf-2.2.x/itests/kittests/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/itests/kittests/pom.xml?rev=1067926&r1=1067925&r2=1067926&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/itests/kittests/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/itests/kittests/pom.xml Mon Feb 7 11:57:14 2011
@@ -44,14 +44,14 @@
<!-- This is required to be first so that pax-exam classloader is not messed up with a newer version of felix
which would lead to java.lang.RuntimeException: Could not create [service.obr] -->
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.assemblies</groupId>
<artifactId>apache-karaf</artifactId>
<type>tar.gz</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.assemblies</groupId>
<artifactId>apache-karaf</artifactId>
<type>zip</type>
<scope>test</scope>
@@ -109,7 +109,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.assemblies</groupId>
<artifactId>apache-karaf</artifactId>
<type>tar.gz</type>
<outputDirectory>target/distributions</outputDirectory>
@@ -127,7 +127,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.assemblies</groupId>
<artifactId>apache-karaf</artifactId>
<type>zip</type>
<outputDirectory>target/distributions</outputDirectory>
Modified: karaf/branches/karaf-2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/pom.xml?rev=1067926&r1=1067925&r2=1067926&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/pom.xml Mon Feb 7 11:57:14 2011
@@ -457,32 +457,32 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.assemblies</groupId>
<artifactId>apache-karaf</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.assemblies</groupId>
<artifactId>apache-karaf</artifactId>
<type>tar.gz</type>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.assemblies</groupId>
<artifactId>apache-karaf</artifactId>
<type>zip</type>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf.features.assembly</groupId>
+ <groupId>org.apache.karaf.assemblies.features</groupId>
<artifactId>standard</artifactId>
<type>xml</type>
<classifier>features</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf.features.assembly</groupId>
+ <groupId>org.apache.karaf.assemblies.features</groupId>
<artifactId>enterprise</artifactId>
<type>xml</type>
<classifier>features</classifier>
Modified: karaf/branches/karaf-2.2.x/tooling/testing/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/tooling/testing/pom.xml?rev=1067926&r1=1067925&r2=1067926&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/tooling/testing/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/tooling/testing/pom.xml Mon Feb 7 11:57:14 2011
@@ -42,19 +42,19 @@
<dependencies>
<!-- The assembly and all the dependencies -->
<dependency>
- <groupId>org.apache.karaf</groupId>
+ <groupId>org.apache.karaf.assemblies</groupId>
<artifactId>apache-karaf</artifactId>
<type>pom</type>
</dependency>
<!-- Feature Files -->
<dependency>
- <groupId>org.apache.karaf.features.assembly</groupId>
+ <groupId>org.apache.karaf.assemblies.features</groupId>
<artifactId>standard</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
- <groupId>org.apache.karaf.features.assembly</groupId>
+ <groupId>org.apache.karaf.assemblies.features</groupId>
<artifactId>enterprise</artifactId>
<type>xml</type>
<classifier>features</classifier>
@@ -111,7 +111,7 @@
<outputDirectory>${basedir}/target/classes/</outputDirectory>
<resources>
<resource>
- <directory>../../assembly/src/main/filtered-resources/etc</directory>
+ <directory>../../assemblies/apache-karaf/src/main/filtered-resources/etc</directory>
<filtering>true</filtering>
<includes>
<include>config.properties</include>
Modified: karaf/branches/karaf-2.2.x/tooling/testing/src/main/java/org/apache/karaf/testing/Helper.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/tooling/testing/src/main/java/org/apache/karaf/testing/Helper.java?rev=1067926&r1=1067925&r2=1067926&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/tooling/testing/src/main/java/org/apache/karaf/testing/Helper.java (original)
+++ karaf/branches/karaf-2.2.x/tooling/testing/src/main/java/org/apache/karaf/testing/Helper.java Mon Feb 7 11:57:14 2011
@@ -361,7 +361,7 @@ public final class Helper {
*/
public static FeaturesScannerProvisionOption loadKarafStandardFeatures(String... features) {
return scanFeatures(
- maven().groupId("org.apache.karaf.features.assembly").artifactId("standard").type("xml")
+ maven().groupId("org.apache.karaf.assemblies.features").artifactId("standard").type("xml")
.classifier("features").versionAsInProject(), features);
}
@@ -373,7 +373,7 @@ public final class Helper {
*/
public static FeaturesScannerProvisionOption loadKarafEnterpriseFeatures(String... features) {
return scanFeatures(
- maven().groupId("org.apache.karaf.features.assembly").artifactId("enterprise").type("xml")
+ maven().groupId("org.apache.karaf.assemblies.features").artifactId("enterprise").type("xml")
.classifier("features").versionAsInProject(), features);
}