You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by dj...@apache.org on 2011/12/05 05:09:29 UTC

svn commit: r1210326 - in /karaf/trunk/archetypes: ./ assembly/ assembly/src/ assembly/src/main/ assembly/src/main/resources/ assembly/src/main/resources/META-INF/ assembly/src/main/resources/META-INF/maven/ assembly/src/main/resources/archetype-resour...

Author: djencks
Date: Mon Dec  5 04:09:29 2011
New Revision: 1210326

URL: http://svn.apache.org/viewvc?rev=1210326&view=rev
Log:
KARAF-1088 assembly archetype

Added:
    karaf/trunk/archetypes/assembly/
    karaf/trunk/archetypes/assembly/NOTICE
    karaf/trunk/archetypes/assembly/pom.xml
      - copied, changed from r1210293, karaf/trunk/archetypes/pom.xml
    karaf/trunk/archetypes/assembly/src/
    karaf/trunk/archetypes/assembly/src/main/
    karaf/trunk/archetypes/assembly/src/main/resources/
    karaf/trunk/archetypes/assembly/src/main/resources/META-INF/
    karaf/trunk/archetypes/assembly/src/main/resources/META-INF/maven/
    karaf/trunk/archetypes/assembly/src/main/resources/META-INF/maven/archetype-metadata.xml   (with props)
    karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/
    karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml   (with props)
    karaf/trunk/archetypes/assembly/src/test/
    karaf/trunk/archetypes/assembly/src/test/resources/
    karaf/trunk/archetypes/assembly/src/test/resources/projects/
    karaf/trunk/archetypes/assembly/src/test/resources/projects/basic/
    karaf/trunk/archetypes/assembly/src/test/resources/projects/basic/archetype.properties   (with props)
    karaf/trunk/archetypes/assembly/src/test/resources/projects/basic/goal.txt   (with props)
Modified:
    karaf/trunk/archetypes/pom.xml

Added: karaf/trunk/archetypes/assembly/NOTICE
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/assembly/NOTICE?rev=1210326&view=auto
==============================================================================
--- karaf/trunk/archetypes/assembly/NOTICE (added)
+++ karaf/trunk/archetypes/assembly/NOTICE Mon Dec  5 04:09:29 2011
@@ -0,0 +1,48 @@
+Apache Karaf
+Copyright 2010 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0

Copied: karaf/trunk/archetypes/assembly/pom.xml (from r1210293, karaf/trunk/archetypes/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/assembly/pom.xml?p2=karaf/trunk/archetypes/assembly/pom.xml&p1=karaf/trunk/archetypes/pom.xml&r1=1210293&r2=1210326&rev=1210326&view=diff
==============================================================================
--- karaf/trunk/archetypes/pom.xml (original)
+++ karaf/trunk/archetypes/assembly/pom.xml Mon Dec  5 04:09:29 2011
@@ -1,63 +1,55 @@
-<?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</groupId>
-        <artifactId>karaf</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>archetypes</artifactId>
-
-    <name>Apache Karaf :: Archetypes</name>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>command</module>
-        <module>feature</module>
-        <module>kar</module>
-    </modules>
-
-    <profiles>
-        <profile>
-            <id>maven-3</id>
-            <activation>
-                <file>
-                    <!--  This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
-                    <exists>${basedir}</exists>
-                </file>
-            </activation>
-        </profile>
-        <profile>
-            <id>maven-2</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>itests</module>
-            </modules>
-        </profile>
-    </profiles>
-
-</project>
+<?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</groupId>
+        <artifactId>archetypes</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.karaf.archetypes</groupId>
+    <artifactId>karaf-assembly-archetype</artifactId>
+    <packaging>maven-archetype</packaging>
+    <name>Apache Karaf :: Archetypes :: Assembly Archetype</name>
+    <description>This archetype sets up an empty karaf assembly project.</description>
+
+    <build>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.archetype</groupId>
+                <artifactId>archetype-packaging</artifactId>
+                <version>2.1</version>
+            </extension>
+        </extensions>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-archetype-plugin</artifactId>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+</project>

Added: karaf/trunk/archetypes/assembly/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/assembly/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1210326&view=auto
==============================================================================
--- karaf/trunk/archetypes/assembly/src/main/resources/META-INF/maven/archetype-metadata.xml (added)
+++ karaf/trunk/archetypes/assembly/src/main/resources/META-INF/maven/archetype-metadata.xml Mon Dec  5 04:09:29 2011
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="org.apache.geronimo.jaxb-support"
+                      xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
+                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+</archetype-descriptor>

Propchange: karaf/trunk/archetypes/assembly/src/main/resources/META-INF/maven/archetype-metadata.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: karaf/trunk/archetypes/assembly/src/main/resources/META-INF/maven/archetype-metadata.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: karaf/trunk/archetypes/assembly/src/main/resources/META-INF/maven/archetype-metadata.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml?rev=1210326&view=auto
==============================================================================
--- karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml (added)
+++ karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml Mon Dec  5 04:09:29 2011
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+--><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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>${groupId}</groupId>
+    <artifactId>${artifactId}</artifactId>
+    <version>${version}</version>
+    <packaging>karaf-assembly</packaging>
+
+    <name>${artifactId}-feature</name>
+    <description>${artifactId} details</description>
+
+    <properties>
+        <karaf.version>3.0.0-SNAPSHOT</karaf.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <version>${project.version}</version>
+            <type>kar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.karaf.tooling</groupId>
+                    <artifactId>karaf-maven-plugin</artifactId>
+                    <version>${karaf.version}</version>
+                    <extensions>true</extensions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+
+                <configuration>
+                    <startupFeatures></startupFeatures>
+                    <bootFeatures>
+                        <feature>standard</feature>
+                        <feature>management</feature>
+                    </bootFeatures>
+                    <installedFeatures></installedFeatures>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: karaf/trunk/archetypes/assembly/src/test/resources/projects/basic/archetype.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/assembly/src/test/resources/projects/basic/archetype.properties?rev=1210326&view=auto
==============================================================================
--- karaf/trunk/archetypes/assembly/src/test/resources/projects/basic/archetype.properties (added)
+++ karaf/trunk/archetypes/assembly/src/test/resources/projects/basic/archetype.properties Mon Dec  5 04:09:29 2011
@@ -0,0 +1,4 @@
+#Sun Apr 10 18:16:59 PDT 2011
+version=0.1-SNAPSHOT
+groupId=archetype.it
+artifactId=basic

Propchange: karaf/trunk/archetypes/assembly/src/test/resources/projects/basic/archetype.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: karaf/trunk/archetypes/assembly/src/test/resources/projects/basic/archetype.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: karaf/trunk/archetypes/assembly/src/test/resources/projects/basic/archetype.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: karaf/trunk/archetypes/assembly/src/test/resources/projects/basic/goal.txt
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/assembly/src/test/resources/projects/basic/goal.txt?rev=1210326&view=auto
==============================================================================
    (empty)

Propchange: karaf/trunk/archetypes/assembly/src/test/resources/projects/basic/goal.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: karaf/trunk/archetypes/assembly/src/test/resources/projects/basic/goal.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: karaf/trunk/archetypes/assembly/src/test/resources/projects/basic/goal.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: karaf/trunk/archetypes/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/pom.xml?rev=1210326&r1=1210325&r2=1210326&view=diff
==============================================================================
--- karaf/trunk/archetypes/pom.xml (original)
+++ karaf/trunk/archetypes/pom.xml Mon Dec  5 04:09:29 2011
@@ -34,6 +34,7 @@
     <packaging>pom</packaging>
 
     <modules>
+        <module>assembly</module>
         <module>command</module>
         <module>feature</module>
         <module>kar</module>