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 01:14:01 UTC
svn commit: r1210291 - in /karaf/trunk/demos/branding: ./ shell/
shell/src/main/resources/org/apache/karaf/branding/ src/ src/main/
src/main/resources/ src/main/resources/resources/
src/main/resources/resources/shell/ src/main/resources/resources/shell...
Author: djencks
Date: Mon Dec 5 00:14:01 2011
New Revision: 1210291
URL: http://svn.apache.org/viewvc?rev=1210291&view=rev
Log:
KARAF-1086 package branding demo as a kar
Added:
karaf/trunk/demos/branding/src/
karaf/trunk/demos/branding/src/main/
karaf/trunk/demos/branding/src/main/resources/
karaf/trunk/demos/branding/src/main/resources/resources/
karaf/trunk/demos/branding/src/main/resources/resources/shell/
karaf/trunk/demos/branding/src/main/resources/resources/shell/NOTICE
- copied, changed from r1210079, karaf/trunk/demos/branding/shell/NOTICE
karaf/trunk/demos/branding/src/main/resources/resources/shell/README.txt (contents, props changed)
- copied, changed from r1210079, karaf/trunk/demos/branding/shell/README.txt
karaf/trunk/demos/branding/src/main/resources/resources/shell/pom.xml (contents, props changed)
- copied, changed from r1210079, karaf/trunk/demos/branding/shell/pom.xml
karaf/trunk/demos/branding/src/main/resources/resources/shell/src/
karaf/trunk/demos/branding/src/main/resources/resources/shell/src/main/
karaf/trunk/demos/branding/src/main/resources/resources/shell/src/main/resources/
karaf/trunk/demos/branding/src/main/resources/resources/shell/src/main/resources/org/
karaf/trunk/demos/branding/src/main/resources/resources/shell/src/main/resources/org/apache/
karaf/trunk/demos/branding/src/main/resources/resources/shell/src/main/resources/org/apache/karaf/
karaf/trunk/demos/branding/src/main/resources/resources/shell/src/main/resources/org/apache/karaf/branding/
karaf/trunk/demos/branding/src/main/resources/resources/shell/src/main/resources/org/apache/karaf/branding/branding.properties (contents, props changed)
- copied, changed from r1210079, karaf/trunk/demos/branding/shell/src/main/resources/org/apache/karaf/branding/branding.properties
Removed:
karaf/trunk/demos/branding/shell/NOTICE
karaf/trunk/demos/branding/shell/README.txt
karaf/trunk/demos/branding/shell/pom.xml
karaf/trunk/demos/branding/shell/src/main/resources/org/apache/karaf/branding/branding.properties
Modified:
karaf/trunk/demos/branding/pom.xml
Modified: karaf/trunk/demos/branding/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/demos/branding/pom.xml?rev=1210291&r1=1210290&r2=1210291&view=diff
==============================================================================
--- karaf/trunk/demos/branding/pom.xml (original)
+++ karaf/trunk/demos/branding/pom.xml Mon Dec 5 00:14:01 2011
@@ -25,7 +25,6 @@
<groupId>org.apache.karaf.demos</groupId>
<artifactId>demos</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.demos.branding</artifactId>
@@ -33,7 +32,64 @@
<name>Apache Karaf :: Demos :: Branding</name>
<modules>
- <module>shell</module>
+ <module>src/main/resources/resources/shell</module>
+ <!--<module>branding-package</module>-->
</modules>
-
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <!--<configuration>-->
+ <!--<resources>-->
+ <!--<resource>src/main/resources</resource>-->
+ <!--</resources>-->
+ <!--</configuration>-->
+ <executions>
+ <execution>
+ <id>process-resources</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <startLevel>60</startLevel>
+ <!--<checkDependencyChange>true</checkDependencyChange>-->
+ <!--<overwriteChangedDependencies>true</overwriteChangedDependencies>-->
+ <!--<warnOnDependencyChange>true</warnOnDependencyChange>-->
+ </configuration>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>features-generate-descriptor</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>package</id>
+ <goals>
+ <goal>features-create-kar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Copied: karaf/trunk/demos/branding/src/main/resources/resources/shell/NOTICE (from r1210079, karaf/trunk/demos/branding/shell/NOTICE)
URL: http://svn.apache.org/viewvc/karaf/trunk/demos/branding/src/main/resources/resources/shell/NOTICE?p2=karaf/trunk/demos/branding/src/main/resources/resources/shell/NOTICE&p1=karaf/trunk/demos/branding/shell/NOTICE&r1=1210079&r2=1210291&rev=1210291&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/demos/branding/src/main/resources/resources/shell/README.txt (from r1210079, karaf/trunk/demos/branding/shell/README.txt)
URL: http://svn.apache.org/viewvc/karaf/trunk/demos/branding/src/main/resources/resources/shell/README.txt?p2=karaf/trunk/demos/branding/src/main/resources/resources/shell/README.txt&p1=karaf/trunk/demos/branding/shell/README.txt&r1=1210079&r2=1210291&rev=1210291&view=diff
==============================================================================
(empty)
Propchange: karaf/trunk/demos/branding/src/main/resources/resources/shell/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: karaf/trunk/demos/branding/src/main/resources/resources/shell/README.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: karaf/trunk/demos/branding/src/main/resources/resources/shell/README.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: karaf/trunk/demos/branding/src/main/resources/resources/shell/pom.xml (from r1210079, karaf/trunk/demos/branding/shell/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/demos/branding/src/main/resources/resources/shell/pom.xml?p2=karaf/trunk/demos/branding/src/main/resources/resources/shell/pom.xml&p1=karaf/trunk/demos/branding/shell/pom.xml&r1=1210079&r2=1210291&rev=1210291&view=diff
==============================================================================
--- karaf/trunk/demos/branding/shell/pom.xml (original)
+++ karaf/trunk/demos/branding/src/main/resources/resources/shell/pom.xml Mon Dec 5 00:14:01 2011
@@ -24,7 +24,7 @@
<groupId>org.apache.karaf.demos</groupId>
<artifactId>org.apache.karaf.demos.branding</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../../../../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.demos.branding.shell</artifactId>
Propchange: karaf/trunk/demos/branding/src/main/resources/resources/shell/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: karaf/trunk/demos/branding/src/main/resources/resources/shell/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: karaf/trunk/demos/branding/src/main/resources/resources/shell/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: karaf/trunk/demos/branding/src/main/resources/resources/shell/src/main/resources/org/apache/karaf/branding/branding.properties (from r1210079, karaf/trunk/demos/branding/shell/src/main/resources/org/apache/karaf/branding/branding.properties)
URL: http://svn.apache.org/viewvc/karaf/trunk/demos/branding/src/main/resources/resources/shell/src/main/resources/org/apache/karaf/branding/branding.properties?p2=karaf/trunk/demos/branding/src/main/resources/resources/shell/src/main/resources/org/apache/karaf/branding/branding.properties&p1=karaf/trunk/demos/branding/shell/src/main/resources/org/apache/karaf/branding/branding.properties&r1=1210079&r2=1210291&rev=1210291&view=diff
==============================================================================
(empty)
Propchange: karaf/trunk/demos/branding/src/main/resources/resources/shell/src/main/resources/org/apache/karaf/branding/branding.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: karaf/trunk/demos/branding/src/main/resources/resources/shell/src/main/resources/org/apache/karaf/branding/branding.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: karaf/trunk/demos/branding/src/main/resources/resources/shell/src/main/resources/org/apache/karaf/branding/branding.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain