Author: pieber
Date: Sun Jan 16 04:05:16 2011
New Revision: 1059453
URL: http://svn.apache.org/viewvc?rev=1059453&view=rev
Log:
[KARAF-387] added own submodules for features.xml for standard and enterprise
features
Added:
karaf/trunk/features/assembly/
karaf/trunk/features/assembly/enterprise/
karaf/trunk/features/assembly/enterprise/pom.xml
- copied, changed from r1059412, karaf/trunk/features/enterprise/pom.xml
karaf/trunk/features/assembly/enterprise/src/
karaf/trunk/features/assembly/enterprise/src/main/
karaf/trunk/features/assembly/enterprise/src/main/resources/
karaf/trunk/features/assembly/enterprise/src/main/resources/features.xml
- copied, changed from r1059412,
karaf/trunk/features/enterprise/src/main/resources/features.xml
karaf/trunk/features/assembly/pom.xml
- copied, changed from r1059412, karaf/trunk/features/pom.xml
karaf/trunk/features/assembly/standard/
karaf/trunk/features/assembly/standard/pom.xml
karaf/trunk/features/assembly/standard/src/
karaf/trunk/features/assembly/standard/src/main/
karaf/trunk/features/assembly/standard/src/main/resources/
karaf/trunk/features/assembly/standard/src/main/resources/features.xml
- copied, changed from r1059412,
karaf/trunk/assembly/src/main/filtered-resources/features.xml
Removed:
karaf/trunk/assembly/src/main/filtered-resources/features.xml
karaf/trunk/features/enterprise/pom.xml
karaf/trunk/features/enterprise/src/main/resources/features.xml
Modified:
karaf/trunk/archetypes/itests/src/test/java/org/apache/karaf/archetypes/AbstractArchetypeTest.java
karaf/trunk/assembly/pom.xml
karaf/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
karaf/trunk/features/pom.xml
karaf/trunk/shell/web/pom.xml
Modified:
karaf/trunk/archetypes/itests/src/test/java/org/apache/karaf/archetypes/AbstractArchetypeTest.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/archetypes/itests/src/test/java/org/apache/karaf/archetypes/AbstractArchetypeTest.java?rev=1059453&r1=1059452&r2=1059453&view=diff
==============================================================================
---
karaf/trunk/archetypes/itests/src/test/java/org/apache/karaf/archetypes/AbstractArchetypeTest.java
(original)
+++
karaf/trunk/archetypes/itests/src/test/java/org/apache/karaf/archetypes/AbstractArchetypeTest.java
Sun Jan 16 04:05:16 2011
@@ -49,6 +49,7 @@ public abstract class AbstractArchetypeT
private Properties sysProps = System.getProperties();
private String version;
+ @Override
protected void setUp() throws Exception {
maven = new MavenEmbedder();
maven.setOffline(false);
@@ -73,6 +74,7 @@ public abstract class AbstractArchetypeT
version = project.getVersion();
}
+ @Override
protected void tearDown() throws Exception {
maven.stop();
maven = null;
Modified: karaf/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/assembly/pom.xml?rev=1059453&r1=1059452&r2=1059453&view=diff
==============================================================================
--- karaf/trunk/assembly/pom.xml (original)
+++ karaf/trunk/assembly/pom.xml Sun Jan 16 04:05:16 2011
@@ -485,14 +485,9 @@
<configuration>
<artifacts>
<artifact>
- <file>target/classes/features.xml</file>
- <type>xml</type>
- <classifier>features</classifier>
- </artifact>
- <artifact>
-
<file>src/main/configfiles/jetty.xml</file>
- <type>xml</type>
- <classifier>jettyconfig</classifier>
+ <file>src/main/configfiles/jetty.xml</file>
+ <type>xml</type>
+ <classifier>jettyconfig</classifier>
</artifact>
</artifacts>
</configuration>
@@ -605,20 +600,15 @@
</goals>
<configuration>
<descriptors>
-
<descriptor>file:${basedir}/target/classes/features.xml</descriptor>
+
<descriptor>mvn:org.apache.karaf.features.assembly/standard/${project.version}/xml/features</descriptor>
+
<descriptor>mvn:org.apache.karaf.features.assembly/enterprise/${project.version}/xml/features</descriptor>
</descriptors>
<features>
<feature>config</feature>
<feature>ssh</feature>
<feature>management</feature>
</features>
- <copyFileBasedDescriptors>
- <copyFileBasedDescriptor>
-
<sourceFile>${basedir}/target/classes/features.xml</sourceFile>
-
<targetDirectory>org/apache/karaf/apache-karaf/${project.version}</targetDirectory>
-
<targetFileName>${project.artifactId}-${project.version}-features.xml</targetFileName>
- </copyFileBasedDescriptor>
- </copyFileBasedDescriptors>
+
<includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
<repository>target/features-repo</repository>
</configuration>
</execution>
Modified:
karaf/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL:
http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1059453&r1=1059452&r2=1059453&view=diff
==============================================================================
---
karaf/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
(original)
+++
karaf/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
Sun Jan 16 04:05:16 2011
@@ -20,7 +20,7 @@
#
# Comma separated list of features repositories to register by default
#
-featuresRepositories=mvn:org.apache.karaf/apache-karaf/${project.version}/xml/features
+featuresRepositories=mvn:org.apache.karaf.features.assembly/standard/${project.version}/xml/features,mvn:org.apache.karaf.features.assembly/enterprise/${project.version}/xml/features
#
# Comma separated list of features to install at startup
Copied: karaf/trunk/features/assembly/enterprise/pom.xml (from r1059412,
karaf/trunk/features/enterprise/pom.xml)
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/assembly/enterprise/pom.xml?p2=karaf/trunk/features/assembly/enterprise/pom.xml&p1=karaf/trunk/features/enterprise/pom.xml&r1=1059412&r2=1059453&rev=1059453&view=diff
==============================================================================
--- karaf/trunk/features/enterprise/pom.xml (original)
+++ karaf/trunk/features/assembly/enterprise/pom.xml Sun Jan 16 04:05:16 2011
@@ -21,10 +21,10 @@
-->
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>features</artifactId>
+ <groupId>org.apache.karaf.features.assembly</groupId>
+ <artifactId>assembly</artifactId>
<version>2.1.99-SNAPSHOT</version>
</parent>
@@ -32,7 +32,7 @@
<name>Apache Karaf :: Features :: Enterprise</name>
<properties>
- <features.file>features.xml</features.file>
+
<appendedResourcesDirectory>${basedir}/../../../etc/appended-resources</appendedResourcesDirectory>
</properties>
<dependencies>
@@ -55,43 +55,55 @@
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
</resource>
</resources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4.3</version>
- <executions>
- <execution>
- <id>filter</id>
- <phase>process-resources</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
-
<file>target/classes/${features.file}</file>
- <type>xml</type>
- <classifier>features</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ <delimiters>
+ <delimiter>${*}</delimiter>
+ </delimiters>
+ </configuration>
+ <executions>
+ <execution>
+ <id>filter</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/classes/features.xml</file>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+
+</project>
+
Copied:
karaf/trunk/features/assembly/enterprise/src/main/resources/features.xml (from
r1059412, karaf/trunk/features/enterprise/src/main/resources/features.xml)
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/assembly/enterprise/src/main/resources/features.xml?p2=karaf/trunk/features/assembly/enterprise/src/main/resources/features.xml&p1=karaf/trunk/features/enterprise/src/main/resources/features.xml&r1=1059412&r2=1059453&rev=1059453&view=diff
==============================================================================
--- karaf/trunk/features/enterprise/src/main/resources/features.xml (original)
+++ karaf/trunk/features/assembly/enterprise/src/main/resources/features.xml
Sun Jan 16 04:05:16 2011
@@ -18,7 +18,7 @@
limitations under the License.
-->
-<features>
+<features name="karaf-enterprise-${project.version}"
xmlns="http://karaf.apache.org/xmlns/features/v1.0.0";>
<feature name='transaction' description='OSGi Transaction Manager'
version='${aries.blueprint.version}' resolver='(obr)'>
<details>The Aries JTA</details>
<bundle
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
Copied: karaf/trunk/features/assembly/pom.xml (from r1059412,
karaf/trunk/features/pom.xml)
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/assembly/pom.xml?p2=karaf/trunk/features/assembly/pom.xml&p1=karaf/trunk/features/pom.xml&r1=1059412&r2=1059453&rev=1059453&view=diff
==============================================================================
--- karaf/trunk/features/pom.xml (original)
+++ karaf/trunk/features/assembly/pom.xml Sun Jan 16 04:05:16 2011
@@ -22,21 +22,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf</groupId>
- <artifactId>karaf</artifactId>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>features</artifactId>
<version>2.1.99-SNAPSHOT</version>
</parent>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>features</artifactId>
+ <groupId>org.apache.karaf.features.assembly</groupId>
+ <artifactId>assembly</artifactId>
<packaging>pom</packaging>
- <name>Apache Karaf :: Features</name>
+ <name>Apache Karaf :: Features :: Assembly</name>
<modules>
- <module>core</module>
- <module>command</module>
- <module>management</module>
- <module>obr</module>
+ <module>standard</module>
<module>enterprise</module>
</modules>
Added: karaf/trunk/features/assembly/standard/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/assembly/standard/pom.xml?rev=1059453&view=auto
==============================================================================
--- karaf/trunk/features/assembly/standard/pom.xml (added)
+++ karaf/trunk/features/assembly/standard/pom.xml Sun Jan 16 04:05:16 2011
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.karaf.features.assembly</groupId>
+ <artifactId>assembly</artifactId>
+ <version>2.1.99-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>standard</artifactId>
+ <name>Apache Karaf :: Features :: Standard</name>
+
+ <properties>
+
<appendedResourcesDirectory>${basedir}/../../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ <delimiters>
+ <delimiter>${*}</delimiter>
+ </delimiters>
+ </configuration>
+ <executions>
+ <execution>
+ <id>filter</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/classes/features.xml</file>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
Copied: karaf/trunk/features/assembly/standard/src/main/resources/features.xml
(from r1059412, karaf/trunk/assembly/src/main/filtered-resources/features.xml)
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/assembly/standard/src/main/resources/features.xml?p2=karaf/trunk/features/assembly/standard/src/main/resources/features.xml&p1=karaf/trunk/assembly/src/main/filtered-resources/features.xml&r1=1059412&r2=1059453&rev=1059453&view=diff
==============================================================================
(empty)
Modified: karaf/trunk/features/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/pom.xml?rev=1059453&r1=1059452&r2=1059453&view=diff
==============================================================================
--- karaf/trunk/features/pom.xml (original)
+++ karaf/trunk/features/pom.xml Sun Jan 16 04:05:16 2011
@@ -37,7 +37,7 @@
<module>command</module>
<module>management</module>
<module>obr</module>
- <module>enterprise</module>
+ <module>assembly</module>
</modules>
</project>
Modified: karaf/trunk/shell/web/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/web/pom.xml?rev=1059453&r1=1059452&r2=1059453&view=diff
==============================================================================
--- karaf/trunk/shell/web/pom.xml (original)
+++ karaf/trunk/shell/web/pom.xml Sun Jan 16 04:05:16 2011
@@ -1,22 +1,26 @@
<?xml version="1.0"?>
<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
- xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>shell</artifactId>
- <groupId>org.apache.karaf.shell</groupId>
- <version>2.1.99-SNAPSHOT</version>
- </parent>
- <artifactId>org.apache.karaf.shell.web</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Karaf :: Shell :: web Commands</name>
- <version>2.1.99-SNAPSHOT</version>
- <properties>
-
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
- </properties>
- <description>Provides the web Shell commands.</description>
- <dependencies>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
+ xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>shell</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <version>2.1.99-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.karaf.shell.web</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Karaf :: Shell :: Web Commands</name>
+ <version>2.1.99-SNAPSHOT</version>
+ <description>Provides the web Shell commands.</description>
+
+ <properties>
+
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
+ <dependencies>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
@@ -33,9 +37,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-spi</artifactId>
- <scope>provided</scope>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-spi</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
<build>
