You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2011/02/04 20:29:35 UTC
svn commit: r1067265 [2/2] - in /karaf/branches/karaf-2.2.x: ./ assemblies/
assemblies/apache-karaf/ assemblies/apache-karaf/src/
assemblies/apache-karaf/src/main/
assemblies/apache-karaf/src/main/descriptors/
assemblies/apache-karaf/src/main/distribut...
Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg (from r1067262, karaf/branches/karaf-2.2.x/assembly/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?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg&p1=karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/minimal/org.apache.karaf.features.cfg&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
(empty)
Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/minimal/startup.properties)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties&p1=karaf/branches/karaf-2.2.x/assembly/src/main/filtered-resources/minimal/startup.properties&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
(empty)
Copied: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/resources/extra/jetty.xml (from r1067262, karaf/branches/karaf-2.2.x/assembly/src/main/resources/extra/jetty.xml)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/resources/extra/jetty.xml?p2=karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/resources/extra/jetty.xml&p1=karaf/branches/karaf-2.2.x/assembly/src/main/resources/extra/jetty.xml&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
(empty)
Copied: karaf/branches/karaf-2.2.x/assemblies/features/enterprise/pom.xml (from r1067262, karaf/branches/karaf-2.2.x/features/assembly/enterprise/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/features/enterprise/pom.xml?p2=karaf/branches/karaf-2.2.x/assemblies/features/enterprise/pom.xml&p1=karaf/branches/karaf-2.2.x/features/assembly/enterprise/pom.xml&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/features/assembly/enterprise/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/features/enterprise/pom.xml Fri Feb 4 19:29:31 2011
@@ -23,13 +23,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf.features.assembly</groupId>
- <artifactId>assembly</artifactId>
+ <groupId>org.apache.karaf.assemblies.features</groupId>
+ <artifactId>features</artifactId>
<version>2.1.99-SNAPSHOT</version>
</parent>
<artifactId>enterprise</artifactId>
- <name>Apache Karaf :: Features :: Enterprise</name>
+ <name>Apache Karaf :: Assemblies :: Features :: Enterprise</name>
<properties>
<appendedResourcesDirectory>${basedir}/../../../etc/appended-resources</appendedResourcesDirectory>
Copied: karaf/branches/karaf-2.2.x/assemblies/features/enterprise/src/main/resources/features.xml (from r1067262, karaf/branches/karaf-2.2.x/features/assembly/enterprise/src/main/resources/features.xml)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/features/enterprise/src/main/resources/features.xml?p2=karaf/branches/karaf-2.2.x/assemblies/features/enterprise/src/main/resources/features.xml&p1=karaf/branches/karaf-2.2.x/features/assembly/enterprise/src/main/resources/features.xml&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
(empty)
Copied: karaf/branches/karaf-2.2.x/assemblies/features/pom.xml (from r1067262, karaf/branches/karaf-2.2.x/features/assembly/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/features/pom.xml?p2=karaf/branches/karaf-2.2.x/assemblies/features/pom.xml&p1=karaf/branches/karaf-2.2.x/features/assembly/pom.xml&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/features/assembly/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/features/pom.xml Fri Feb 4 19:29:31 2011
@@ -22,28 +22,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>features</artifactId>
+ <groupId>org.apache.karaf.assemblies</groupId>
+ <artifactId>assemblies</artifactId>
<version>2.1.99-SNAPSHOT</version>
</parent>
- <groupId>org.apache.karaf.features.assembly</groupId>
- <artifactId>assembly</artifactId>
+ <groupId>org.apache.karaf.assemblies.features</groupId>
+ <artifactId>features</artifactId>
<packaging>pom</packaging>
- <name>Apache Karaf :: Features :: Assembly</name>
+ <name>Apache Karaf :: Assemblies :: Features</name>
<modules>
<module>standard</module>
<module>enterprise</module>
</modules>
- <profiles>
- <profile>
- <id>full</id>
- <modules>
- <module>framework</module>
- </modules>
- </profile>
- </profiles>
-
</project>
Copied: karaf/branches/karaf-2.2.x/assemblies/features/standard/pom.xml (from r1067262, karaf/branches/karaf-2.2.x/features/assembly/standard/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/features/standard/pom.xml?p2=karaf/branches/karaf-2.2.x/assemblies/features/standard/pom.xml&p1=karaf/branches/karaf-2.2.x/features/assembly/standard/pom.xml&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/features/assembly/standard/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/features/standard/pom.xml Fri Feb 4 19:29:31 2011
@@ -23,13 +23,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf.features.assembly</groupId>
- <artifactId>assembly</artifactId>
+ <groupId>org.apache.karaf.assemblies.features</groupId>
+ <artifactId>features</artifactId>
<version>2.1.99-SNAPSHOT</version>
</parent>
<artifactId>standard</artifactId>
- <name>Apache Karaf :: Features :: Standard</name>
+ <name>Apache Karaf :: Assemblies :: Features :: Standard</name>
<properties>
<appendedResourcesDirectory>${basedir}/../../../etc/appended-resources</appendedResourcesDirectory>
Copied: karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml (from r1067262, karaf/branches/karaf-2.2.x/features/assembly/standard/src/main/resources/features.xml)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml?p2=karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml&p1=karaf/branches/karaf-2.2.x/features/assembly/standard/src/main/resources/features.xml&r1=1067262&r2=1067265&rev=1067265&view=diff
==============================================================================
(empty)
Modified: karaf/branches/karaf-2.2.x/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/pom.xml?rev=1067265&r1=1067264&r2=1067265&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/pom.xml Fri Feb 4 19:29:31 2011
@@ -32,13 +32,9 @@
<packaging>pom</packaging>
<name>Apache Karaf :: Assemblies</name>
- <profiles>
- <profile>
- <id>full</id>
- <modules>
- <module>apache-karaf</module>
- </modules>
- </profile>
- </profiles>
+ <modules>
+ <module>features</module>
+ <module>apache-karaf</module>
+ </modules>
</project>
Modified: karaf/branches/karaf-2.2.x/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/features/pom.xml?rev=1067265&r1=1067264&r2=1067265&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/features/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/features/pom.xml Fri Feb 4 19:29:31 2011
@@ -37,7 +37,6 @@
<module>command</module>
<module>management</module>
<module>obr</module>
- <module>assembly</module>
</modules>
</project>
Modified: karaf/branches/karaf-2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/pom.xml?rev=1067265&r1=1067264&r2=1067265&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/pom.xml Fri Feb 4 19:29:31 2011
@@ -48,7 +48,6 @@
<module>webconsole</module>
<module>exception</module>
<module>assemblies</module>
- <module>assembly</module>
<module>demos</module>
<module>itests</module>
<module>tooling</module>
@@ -1363,7 +1362,7 @@
<profile>
<id>setup.eclipse</id>
<modules>
- <module>assembly</module>
+ <module>assemblies</module>
</modules>
<properties>
<eclipse.workspace.dir>${basedir}/../workspace</eclipse.workspace.dir>