You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ge...@apache.org on 2009/06/16 09:05:39 UTC

svn commit: r785091 - in /felix/trunk/karaf: ./ tooling/ tooling/features-maven-plugin/ tooling/features-maven-plugin/src/main/java/org/apache/felix/ tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/ tooling/features-maven-plugin/src/...

Author: gertv
Date: Tue Jun 16 07:05:38 2009
New Revision: 785091

URL: http://svn.apache.org/viewvc?rev=785091&view=rev
Log:
FELIX-1200: Move features-maven-plugin into Karaf

Added:
    felix/trunk/karaf/tooling/   (with props)
    felix/trunk/karaf/tooling/features-maven-plugin/   (props changed)
      - copied from r785077, servicemix/maven-plugins/features-maven-plugin/trunk/
    felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/
    felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/
    felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/   (props changed)
      - copied from r785077, servicemix/maven-plugins/features-maven-plugin/trunk/src/main/java/org/apache/servicemix/tooling/
    felix/trunk/karaf/tooling/features-maven-plugin/src/test/java/org/apache/felix/
    felix/trunk/karaf/tooling/features-maven-plugin/src/test/java/org/apache/felix/karaf/
    felix/trunk/karaf/tooling/features-maven-plugin/src/test/java/org/apache/felix/karaf/tooling/   (props changed)
      - copied from r785077, servicemix/maven-plugins/features-maven-plugin/trunk/src/test/java/org/apache/servicemix/tooling/
    felix/trunk/karaf/tooling/pom.xml   (with props)
Removed:
    felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/servicemix/tooling/
    felix/trunk/karaf/tooling/features-maven-plugin/src/test/java/org/apache/servicemix/tooling/
Modified:
    felix/trunk/karaf/pom.xml
    felix/trunk/karaf/tooling/features-maven-plugin/NOTICE
    felix/trunk/karaf/tooling/features-maven-plugin/pom.xml
    felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/AddFeaturesToRepoMojo.java
    felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesFileMojo.java
    felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesXmlMojo.java
    felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/GraphArtifactCollector.java
    felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/MojoSupport.java
    felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/Node.java
    felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/ResolutionListenerImpl.java
    felix/trunk/karaf/tooling/features-maven-plugin/src/main/resources/config.properties
    felix/trunk/karaf/tooling/features-maven-plugin/src/test/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesFileMojoTest.java
    felix/trunk/karaf/tooling/features-maven-plugin/src/test/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java

Modified: felix/trunk/karaf/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/pom.xml?rev=785091&r1=785090&r2=785091&view=diff
==============================================================================
--- felix/trunk/karaf/pom.xml (original)
+++ felix/trunk/karaf/pom.xml Tue Jun 16 07:05:38 2009
@@ -45,6 +45,7 @@
         <module>assembly</module>
         <module>demos</module>
         <module>itests</module>
+        <module>tooling</module>
     </modules>
 
     <scm>
@@ -95,6 +96,7 @@
         <junit.version>3.8.2_1</junit.version>
         <jline.version>0.9.94_1</jline.version>
         <log4j.version>1.2.14</log4j.version>
+        <maven.version>2.0.9</maven.version>
         <mina.version>2.0.0-M6</mina.version>
         <oro.version>2.0.8_1</oro.version>
         <pax.exam.version>0.5.0</pax.exam.version>
@@ -372,6 +374,21 @@
                 <version>${felix.metatype.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>${felix.plugin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-plugin-api</artifactId>
+                <version>${maven.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-project</artifactId>
+                <version>${maven.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-aop</artifactId>
                 <version>${spring.version}</version>

Propchange: felix/trunk/karaf/tooling/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 16 07:05:38 2009
@@ -0,0 +1 @@
+target

Propchange: felix/trunk/karaf/tooling/features-maven-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 16 07:05:38 2009
@@ -0,0 +1,10 @@
+target
+.project
+.classpath
+.settings
+.externalToolBuilders
+eclipse-classes
+*.iml
+*.ipr
+*.iws
+

Modified: felix/trunk/karaf/tooling/features-maven-plugin/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/tooling/features-maven-plugin/NOTICE?rev=785091&r1=785077&r2=785091&view=diff
==============================================================================
--- felix/trunk/karaf/tooling/features-maven-plugin/NOTICE (original)
+++ felix/trunk/karaf/tooling/features-maven-plugin/NOTICE Tue Jun 16 07:05:38 2009
@@ -1,6 +1,6 @@
    =========================================================================
    ==  NOTICE file for use with the Apache License, Version 2.0,          ==
-   ==  in this case for the Apache ServiceMix distribution.               ==
+   ==  in this case for the Apache Felix Karaf distribution.              ==
    =========================================================================
 
    This product contains software developed by

Modified: felix/trunk/karaf/tooling/features-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/tooling/features-maven-plugin/pom.xml?rev=785091&r1=785077&r2=785091&view=diff
==============================================================================
--- felix/trunk/karaf/tooling/features-maven-plugin/pom.xml (original)
+++ felix/trunk/karaf/tooling/features-maven-plugin/pom.xml Tue Jun 16 07:05:38 2009
@@ -1,133 +1,58 @@
 <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/maven-v4_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>
+    <!--
+
+        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.servicemix.tooling</groupId>
-      <artifactId>maven-plugins-pom</artifactId>
-      <version>2</version>
+      <groupId>org.apache.felix.karaf.tooling</groupId>
+      <artifactId>tooling</artifactId>
+      <version>1.2.0-SNAPSHOT</version>
     </parent>
 
-
-    <groupId>org.apache.servicemix.tooling</groupId>
+    <groupId>org.apache.felix.karaf.tooling</groupId>
     <artifactId>features-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <version>1.2-SNAPSHOT</version>
-    <name>ServiceMix :: Maven2 Features plugin</name>
+    <version>1.2.0-SNAPSHOT</version>
+    <name>Apache Felix Karaf :: Maven2 Features plugin</name>
+
+    <description>
+      A Maven 2 plugin for working with feature descriptors
+    </description>
+
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-plugin-api</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-project</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.jmock</groupId>
+        <artifactId>jmock</artifactId>
+        <version>2.5.0</version>
+        <scope>test</scope>
+      </dependency>
+    </dependencies>
 
-    <scm>
-      <connection>scm:svn:http://svn.apache.org/repos/asf/servicemix/maven-plugins/features-maven-plugin/trunk</connection>
-      <developerConnection>scm:svn:https://svn.apache.org/repos/asf/servicemix/maven-plugins/features-maven-plugin/trunk</developerConnection>
-      <url>http://svn.apache.org/viewcvs.cgi/servicemix/maven-plugins/features-maven-plugin/trunk</url>
-    </scm>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-plugin-api</artifactId>
-			<version>2.0.9</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-project</artifactId>
-			<version>2.0.9</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.felix</groupId>
-			<artifactId>maven-bundle-plugin</artifactId>
-			<version>1.4.3</version>
-		</dependency>
-		<dependency>
-		    <groupId>org.jmock</groupId>
-			<artifactId>jmock</artifactId>
-			<version>2.5.0</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-       <profiles>
-      <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <!-- We want to deploy the artifact to a staging location for perusal -->
-                    <plugin>
-                        <inherited>true</inherited>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <version>2.3</version>
-                        <configuration>
-                            <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
-                            <updateReleaseInfo>true</updateReleaseInfo>
-                        </configuration>
-                    </plugin>
-                    <!-- We want to sign the artifact, the POM, and all attached artifacts -->
-                    <plugin>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.0-alpha-4</version>
-                        <configuration>
-                            <passphrase>${gpg.passphrase}</passphrase>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>deploy</id>
-            <build>
-                <defaultGoal>deploy</defaultGoal>
-                 <plugins>
-                   <plugin>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.2</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <source>1.5</source>
-                            <attach>true</attach>
-                        </configuration>
-                   </plugin>
-                   <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>2.0.2</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <attach>true</attach>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-      </profiles>
 </project>

Propchange: felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/AddFeaturesToRepoMojo.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/AddFeaturesToRepoMojo.java?rev=785091&r1=785077&r2=785091&view=diff
==============================================================================
--- felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/AddFeaturesToRepoMojo.java (original)
+++ felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/AddFeaturesToRepoMojo.java Tue Jun 16 07:05:38 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.tooling.features;
+package org.apache.felix.karaf.tooling.features;
 
 import java.util.List;
 import java.util.ArrayList;

Modified: felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesFileMojo.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesFileMojo.java?rev=785091&r1=785077&r2=785091&view=diff
==============================================================================
--- felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesFileMojo.java (original)
+++ felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesFileMojo.java Tue Jun 16 07:05:38 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.tooling.features;
+package org.apache.felix.karaf.tooling.features;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -221,8 +221,8 @@
     		}
     	}
     	
-    	Artifact kernel = factory.createArtifact("org.apache.servicemix.kernel", 
-    			                                 "apache-servicemix-kernel",
+    	Artifact kernel = factory.createArtifact("org.apache.felix.karaf", 
+    			                                 "apache-felix-karaf",
     			                                 kernelVersion, Artifact.SCOPE_PROVIDED, "pom");
     	resolver.resolve(kernel, remoteRepos, localRepo);
     	getLog().info("-- List of bundles provided by ServiceMix Kernel " + kernelVersion + " --");

Modified: felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesXmlMojo.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesXmlMojo.java?rev=785091&r1=785077&r2=785091&view=diff
==============================================================================
--- felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesXmlMojo.java (original)
+++ felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesXmlMojo.java Tue Jun 16 07:05:38 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.tooling.features;
+package org.apache.felix.karaf.tooling.features;
 
 import java.io.BufferedReader;
 import java.io.File;

Modified: felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/GraphArtifactCollector.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/GraphArtifactCollector.java?rev=785091&r1=785077&r2=785091&view=diff
==============================================================================
--- felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/GraphArtifactCollector.java (original)
+++ felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/GraphArtifactCollector.java Tue Jun 16 07:05:38 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.tooling.features;
+package org.apache.felix.karaf.tooling.features;
 
 import java.util.ArrayList;
 import java.util.Collections;

Modified: felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/MojoSupport.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/MojoSupport.java?rev=785091&r1=785077&r2=785091&view=diff
==============================================================================
--- felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/MojoSupport.java (original)
+++ felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/MojoSupport.java Tue Jun 16 07:05:38 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.tooling.features;
+package org.apache.felix.karaf.tooling.features;
 
 
 import java.io.File;

Modified: felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/Node.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/Node.java?rev=785091&r1=785077&r2=785091&view=diff
==============================================================================
--- felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/Node.java (original)
+++ felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/Node.java Tue Jun 16 07:05:38 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.tooling.features;
+package org.apache.felix.karaf.tooling.features;
 
 import java.util.Set;
 import java.util.HashSet;

Modified: felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/ResolutionListenerImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/ResolutionListenerImpl.java?rev=785091&r1=785077&r2=785091&view=diff
==============================================================================
--- felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/ResolutionListenerImpl.java (original)
+++ felix/trunk/karaf/tooling/features-maven-plugin/src/main/java/org/apache/felix/karaf/tooling/features/ResolutionListenerImpl.java Tue Jun 16 07:05:38 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.tooling.features;
+package org.apache.felix.karaf.tooling.features;
 
 import java.util.Collection;
 import java.util.HashMap;

Modified: felix/trunk/karaf/tooling/features-maven-plugin/src/main/resources/config.properties
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/tooling/features-maven-plugin/src/main/resources/config.properties?rev=785091&r1=785077&r2=785091&view=diff
==============================================================================
--- felix/trunk/karaf/tooling/features-maven-plugin/src/main/resources/config.properties (original)
+++ felix/trunk/karaf/tooling/features-maven-plugin/src/main/resources/config.properties Tue Jun 16 07:05:38 2009
@@ -124,4 +124,4 @@
  sun.reflect
  
 osgi= \
- org.osgi.framework;
\ No newline at end of file
+ org.osgi.framework;

Propchange: felix/trunk/karaf/tooling/features-maven-plugin/src/test/java/org/apache/felix/karaf/tooling/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: felix/trunk/karaf/tooling/features-maven-plugin/src/test/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesFileMojoTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/tooling/features-maven-plugin/src/test/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesFileMojoTest.java?rev=785091&r1=785077&r2=785091&view=diff
==============================================================================
--- felix/trunk/karaf/tooling/features-maven-plugin/src/test/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesFileMojoTest.java (original)
+++ felix/trunk/karaf/tooling/features-maven-plugin/src/test/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesFileMojoTest.java Tue Jun 16 07:05:38 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.tooling.features;
+package org.apache.felix.karaf.tooling.features;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: felix/trunk/karaf/tooling/features-maven-plugin/src/test/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/tooling/features-maven-plugin/src/test/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java?rev=785091&r1=785077&r2=785091&view=diff
==============================================================================
--- felix/trunk/karaf/tooling/features-maven-plugin/src/test/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java (original)
+++ felix/trunk/karaf/tooling/features-maven-plugin/src/test/java/org/apache/felix/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java Tue Jun 16 07:05:38 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.tooling.features;
+package org.apache.felix.karaf.tooling.features;
 
 import org.apache.maven.artifact.Artifact;
 import org.jmock.Expectations;

Added: felix/trunk/karaf/tooling/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/tooling/pom.xml?rev=785091&view=auto
==============================================================================
--- felix/trunk/karaf/tooling/pom.xml (added)
+++ felix/trunk/karaf/tooling/pom.xml Tue Jun 16 07:05:38 2009
@@ -0,0 +1,40 @@
+<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/maven-v4_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.felix.karaf</groupId>
+        <artifactId>karaf</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.felix.karaf.tooling</groupId>
+    <artifactId>tooling</artifactId>
+    <packaging>pom</packaging>
+    <version>1.2.0-SNAPSHOT</version>
+    <name>Apache Felix Karaf :: Tooling</name>
+
+    <modules>
+        <module>features-maven-plugin</module>
+    </modules>
+
+</project>

Propchange: felix/trunk/karaf/tooling/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native