Re: svn commit: r1181633 - in /karaf/trunk/assemblies: ./ apache-karaf-full/ apache-karaf-minimal/ apache-karaf/ apache-karaf/src/main/descriptors/ apache-karaf/src/main/distribution/text/deploy/ apache-karaf/src/main/distribution/text/etc/ apache-karaf/sr...

Sun, 16 Oct 2011 03:41:24 -0700 

Hi JB,
Are you sure you wanna remove all those stuff in apache-karaf folder? At least we omit jetty.xml in our kit when install http feature, do I miss something? 
I can still see
<configfile finalname="/etc/jetty.xml">mvn:org.apache.karaf.assemblies/ apache-karaf/${project.version}/xml/jettyconfig</configfile> 
                <config name="org.ops4j.pax.web">
in standard/src/main/feature/feature.xml
so I assume we still need jetty.xml from somewhere in trunk, right?

Freeman
On 2011-10-11, at 下午2:56, [email protected] wrote:


Author: jbonofre
Date: Tue Oct 11 06:56:49 2011
New Revision: 1181633

URL: http://svn.apache.org/viewvc?rev=1181633&view=rev
Log:
[KARAF-772] Rename the full distribution to use the "normal" name.

Removed:
   karaf/trunk/assemblies/apache-karaf-full/pom.xml
karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix- bin.xml karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix- minimal-bin.xml karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix- src.xml karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows- bin.xml karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows- minimal-bin.xml karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows- src.xml karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/ deploy/README karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/ etc/java.util.logging.properties karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/ etc/org.apache.felix.fileinstall-deploy.cfg karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/ etc/org.apache.karaf.features.obr.cfg karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/ etc/org.apache.karaf.jaas.cfg karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/ etc/org.apache.karaf.log.cfg karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/ etc/org.apache.karaf.management.cfg karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/ etc/org.apache.karaf.shell.cfg karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/ etc/org.ops4j.pax.logging.cfg karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/ etc/org.ops4j.pax.url.mvn.cfg karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/ etc/shell.init.script karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/ etc/system.properties karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/ etc/users.properties karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/ lib/README karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/ lib/endorsed/README karaf/trunk/assemblies/apache-karaf/src/main/distribution/text/ lib/ext/README karaf/trunk/assemblies/apache-karaf/src/main/distribution/unix- shell/bin/karaf karaf/trunk/assemblies/apache-karaf/src/main/distribution/unix- shell/bin/start karaf/trunk/assemblies/apache-karaf/src/main/distribution/unix- shell/bin/stop karaf/trunk/assemblies/apache-karaf/src/main/distribution/windows- text/bin/karaf.bat karaf/trunk/assemblies/apache-karaf/src/main/distribution/windows- text/bin/start.bat karaf/trunk/assemblies/apache-karaf/src/main/distribution/windows- text/bin/stop.bat karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/ bin/admin karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/ bin/admin.bat karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/ bin/client karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/ bin/client.bat karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/ bin/shell karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/ bin/shell.bat karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/ demos/web/README.txt karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/ etc/config.properties karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/ etc/custom.properties karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/ etc/jre.properties karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/ etc/org.apache.karaf.features.cfg karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/ etc/startup.properties karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/ minimal/org.apache.karaf.features.cfg karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/ minimal/startup.properties karaf/trunk/assemblies/apache-karaf/src/main/resources/extra/ jetty.xml 
Modified:
   karaf/trunk/assemblies/apache-karaf-minimal/pom.xml
   karaf/trunk/assemblies/apache-karaf/pom.xml
   karaf/trunk/assemblies/pom.xml

Modified: karaf/trunk/assemblies/apache-karaf-minimal/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf-minimal/pom.xml?rev=1181633&r1=1181632&r2=1181633&view=diff
= = = = = = = = ====================================================================== 
--- karaf/trunk/assemblies/apache-karaf-minimal/pom.xml (original)
+++ karaf/trunk/assemblies/apache-karaf-minimal/pom.xml Tue Oct 11 06:56:49 2011 
@@ -30,7 +30,7 @@

    <artifactId>apache-karaf-minimal</artifactId>
    <packaging>pom</packaging>
-    <name>Apache Karaf :: Assemblies :: Minimal</name>
+    <name>Apache Karaf :: Assemblies :: Minimal Distribution</name>

    <properties>
<appendedResourcesDirectory>${basedir}/../etc/appended- resources</appendedResourcesDirectory> 

Modified: karaf/trunk/assemblies/apache-karaf/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/pom.xml?rev=1181633&r1=1181632&r2=1181633&view=diff
= = = = = = = = ====================================================================== 
--- karaf/trunk/assemblies/apache-karaf/pom.xml (original)
+++ karaf/trunk/assemblies/apache-karaf/pom.xml Tue Oct 11 06:56:49 2011 
@@ -30,399 +30,54 @@

    <artifactId>apache-karaf</artifactId>
    <packaging>pom</packaging>
-    <name>Apache Karaf :: Assemblies :: Distributions</name>
+    <name>Apache Karaf :: Assemblies :: Default Distribution</name>

    <properties>
<appendedResourcesDirectory>${basedir}/../etc/appended- resources</appendedResourcesDirectory> 
    </properties>

    <dependencies>
-         <dependency>
-            <groupId>org.apache.karaf</groupId>
-            <artifactId>org.apache.karaf.main</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf</groupId>
-            <artifactId>org.apache.karaf.exception</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf</groupId>
-            <artifactId>org.apache.karaf.client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.deployer</groupId>
-            <artifactId>org.apache.karaf.deployer.spring</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.deployer</groupId>
- <artifactId>org.apache.karaf.deployer.blueprint</ artifactId> 
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.deployer</groupId>
- <artifactId>org.apache.karaf.deployer.features</ artifactId> 
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.deployer</groupId>
-            <artifactId>org.apache.karaf.deployer.kar</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.deployer</groupId>
-            <artifactId>org.apache.karaf.deployer.wrap</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.features</groupId>
-            <artifactId>org.apache.karaf.features.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.features</groupId>
- <artifactId>org.apache.karaf.features.command</ artifactId> 
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.features</groupId>
- <artifactId>org.apache.karaf.features.management</ artifactId> 
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.features</groupId>
-            <artifactId>org.apache.karaf.features.obr</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.diagnostic</groupId>
-            <artifactId>org.apache.karaf.diagnostic.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.diagnostic</groupId>
- <artifactId>org.apache.karaf.diagnostic.common</ artifactId> 
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.diagnostic</groupId>
- <artifactId>org.apache.karaf.diagnostic.command</ artifactId> 
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.diagnostic</groupId>
- <artifactId>org.apache.karaf.diagnostic.management</ artifactId> 
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.admin</groupId>
-            <artifactId>org.apache.karaf.admin.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.admin</groupId>
-            <artifactId>org.apache.karaf.admin.command</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.admin</groupId>
- <artifactId>org.apache.karaf.admin.management</ artifactId> 
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.console</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.obr</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.bundles</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.log</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.packages</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.commands</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.ssh</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.dev</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.services</artifactId>
-        </dependency>
        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.system</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.jaas</groupId>
-            <artifactId>org.apache.karaf.jaas.boot</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.jaas</groupId>
-            <artifactId>org.apache.karaf.jaas.config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.jaas</groupId>
-            <artifactId>org.apache.karaf.jaas.modules</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.jaas</groupId>
-            <artifactId>org.apache.karaf.jaas.command</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf</groupId>
-            <artifactId>org.apache.karaf.management</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.webconsole</groupId>
- <artifactId>org.apache.karaf.webconsole.admin</ artifactId> 
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.webconsole</groupId>
- <artifactId>org.apache.karaf.webconsole.branding</ artifactId> 
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.webconsole</groupId>
- <artifactId>org.apache.karaf.webconsole.console</ artifactId> 
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.webconsole</groupId>
- <artifactId>org.apache.karaf.webconsole.features</ artifactId> 
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.webconsole</groupId>
-            <artifactId>org.apache.karaf.webconsole.gogo</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.osgi</groupId>
-            <artifactId>spring-osgi-extender</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.osgi</groupId>
-            <artifactId>spring-osgi-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.osgi</groupId>
-            <artifactId>spring-osgi-io</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.osgi</groupId>
-            <artifactId>spring-osgi-annotation</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</ artifactId> 
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.fileinstall</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.configadmin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.eventadmin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.metatype</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.webconsole</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-service</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.url</groupId>
-            <artifactId>pax-url-aether</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.url</groupId>
-            <artifactId>pax-url-wrap</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sshd</groupId>
-            <artifactId>sshd-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.framework</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.proxy</groupId>
-            <artifactId>org.apache.aries.proxy</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries</groupId>
-            <artifactId>org.apache.aries.util</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.jmx</groupId>
-            <artifactId>org.apache.aries.jmx</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.jmx</groupId>
-            <artifactId>org.apache.aries.jmx.blueprint</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-util</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-io</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-http</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-continuation</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-xml</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.asm</ artifactId> 
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-api</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-spi</artifactId>
-            <optional>true</optional>
-        </dependency>
-       <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-runtime</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-jetty</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-jsp</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-extender-war</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-extender-whiteboard</artifactId>
-            <optional>true</optional>
-        </dependency>
-         <dependency>
-            <groupId>org.ops4j.pax.web</groupId>
-            <artifactId>pax-web-deployer</artifactId>
-            <optional>true</optional>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+ <artifactId>org.apache.karaf.features.framework</ artifactId> 
+            <type>kar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+ <artifactId>org.apache.karaf.features.standard</ artifactId> 
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.assemblies.features</groupId>
+ <artifactId>org.apache.karaf.features.enterprise</ artifactId> 
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
        </dependency>
    </dependencies>

    <build>
        <resources>
            <resource>
- <directory>${project.basedir}/src/main/filtered- resources</directory> 
-                <filtering>true</filtering>
+                <directory>${project.basedir}/../..</directory>
+                <filtering>false</filtering>
                <includes>
-                    <include>**/*</include>
+                    <include>README</include>
+                    <include>RELEASE*</include>
+                    <include>LICENSE</include>
+                    <include>NOTICE</include>
                </includes>
            </resource>
-            <resource>
- <directory>${project.basedir}/src/main/resources/ extra</directory> 
-                <filtering>false</filtering>
-                <excludes>
-                    <exclude>**/*</exclude>
-                </excludes>
-            </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>
+                        <id>process-resources</id>
                        <goals>
                            <goal>resources</goal>
                        </goals>
@@ -431,278 +86,42 @@
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
- <groupId>org.apache.karaf</ groupId> - <artifactId>org.apache.karaf.main</artifactId> - <outputDirectory>target/ dependencies/lib</outputDirectory> - <destFileName>karaf.jar</ destFileName> 
-                                </artifactItem>
-                                <artifactItem>
- <groupId>org.apache.karaf</ groupId> - <artifactId>org.apache.karaf.client</artifactId> - <outputDirectory>target/ dependencies/lib/bin</outputDirectory> - <destFileName>karaf-client.jar</ destFileName> 
-                                </artifactItem>
-                                <artifactItem>
- <groupId>org.apache.karaf.jaas</ groupId> - <artifactId>org.apache.karaf.jaas.boot</artifactId> - <outputDirectory>target/ dependencies/lib</outputDirectory> - <destFileName>karaf-jaas- boot.jar</destFileName> 
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                   </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>src/main/resources/extra/ jetty.xml</file> 
-                                  <type>xml</type>
- <classifier>jettyconfig</ classifier> 
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
+ <artifactId>maven-remote-resources-plugin</ artifactId> 
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
            </plugin>
            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+                <version>${project.version}</version>
                <executions>
                    <execution>
-                        <id>make-assembly</id>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>unix-minimal-bin</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
- <descriptor>src/main/descriptors/ unix-minimal-bin.xml</descriptor> 
-                            </descriptors>
- <finalName>${project.artifactId}-$ {project.version}</finalName> 
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>unix-bin</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
- <descriptor>src/main/descriptors/ unix-bin.xml</descriptor> 
-                            </descriptors>
- <finalName>${project.artifactId}-$ {project.version}</finalName> - <appendAssemblyId>false</ appendAssemblyId> 
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>windows-minimal-bin</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
- <descriptor>src/main/descriptors/ windows-minimal-bin.xml</descriptor> 
-                            </descriptors>
- <finalName>${project.artifactId}-$ {project.version}</finalName> 
-                            <appendAssemblyId>true</appendAssemblyId>
-                            <assemblyId />
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>windows-bin</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
- <descriptor>src/main/descriptors/ windows-bin.xml</descriptor> 
-                            </descriptors>
- <finalName>${project.artifactId}-$ {project.version}</finalName> - <appendAssemblyId>false</ appendAssemblyId> - <duplicateBehaviour>skip</ duplicateBehaviour> 
-                            <assemblyId />
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>unix-src</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
- <descriptor>src/main/descriptors/ unix-src.xml</descriptor> 
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>windows-src</id>
-                        <phase>package</phase>
+                        <id>process-resources</id>
+                        <phase>process-resources</phase>
                        <goals>
-                            <goal>single</goal>
+                            <goal>install-kars</goal>
                        </goals>
-                        <configuration>
-                            <descriptors>
- <descriptor>src/main/descriptors/ windows-src.xml</descriptor> 
-                            </descriptors>
-                        </configuration>
                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>karaf-maven-plugin</artifactId>
-                <version>${project.version}</version>
-                <executions>
                    <execution>
-                        <id>add-features-to-repo</id>
-                        <phase>generate-resources</phase>
+                        <id>package</id>
                        <goals>
-                            <goal>features-add-to-repository</goal>
+                            <goal>instance-create-archive</goal>
                        </goals>
-                        <configuration>
-                            <descriptors>
- <descriptor>mvn:org.apache.karaf.assemblies.features/ org.apache.karaf.features.standard/${project.version}/xml/features</ descriptor> - <descriptor>mvn:org.apache.karaf.assemblies.features/ org.apache.karaf.features.enterprise/${project.version}/xml/ features</descriptor> 
-                            </descriptors>
-                            <features>
- <feature>org.apache.karaf.features.standard.config</feature> - <feature>org.apache.karaf.features.standard.ssh</feature> - <feature>org.apache.karaf.features.standard.management</feature> 
-                            </features>
- <includeMvnBasedDescriptors>true</ includeMvnBasedDescriptors> - <repository>target/features-repo</ repository> 
-                        </configuration>
                    </execution>
                </executions>
+                <configuration>
+                    <bootFeatures>
+ <feature>org.apache.karaf.features.standard</feature> + <feature>org.apache.karaf.features.full</ feature> + <feature>org.apache.karaf.features.standard.management</feature> + <feature>org.apache.karaf.features.standard.ssh</feature> + <feature>org.apache.karaf.features.standard.config</feature> 
+                    </bootFeatures>
+                </configuration>
            </plugin>

        </plugins>
    </build>

-    <profiles>
-        <profile>
-            <id>manual</id>
-
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.karaf</groupId>
-                    <artifactId>manual</artifactId>
-                    <type>pdf</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.karaf</groupId>
-                    <artifactId>manual</artifactId>
-                    <type>html</type>
-                </dependency>
-            </dependencies>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</ artifactId> 
-                        <executions>
-                            <execution>
-                                <id>copy-manual</id>
-                                <phase>generate-resources</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
- <groupId>org.apache.karaf</groupId> - <artifactId>manual</ artifactId> 
-                                            <type>pdf</type>
- <outputDirectory>target/ dependencies</outputDirectory> - <destFileName>karaf- manual-${project.version}.pdf</destFileName> 
-                                        </artifactItem>
-                                        <artifactItem>
- <groupId>org.apache.karaf</groupId> - <artifactId>manual</ artifactId> 
-                                            <type>html</type>
- <outputDirectory>target/ dependencies</outputDirectory> - <destFileName>karaf- manual-${project.version}.html</destFileName> 
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>assembly-src</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</ artifactId> 
-                        <executions>
-                            <execution>
-                                <id>unix-src</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attached</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
- <descriptor>src/main/ descriptors/unix-src.xml</descriptor> 
-                                    </descriptors>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>windows-src</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attached</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
- <descriptor>src/main/ descriptors/windows-src.xml</descriptor> 
-                                    </descriptors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
</project>

Modified: karaf/trunk/assemblies/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/trunk/assemblies/pom.xml?rev=1181633&r1=1181632&r2=1181633&view=diff
= = = = = = = = ====================================================================== 
--- karaf/trunk/assemblies/pom.xml (original)
+++ karaf/trunk/assemblies/pom.xml Tue Oct 11 06:56:49 2011
@@ -35,9 +35,8 @@

    <modules>
        <module>features</module>
-        <!--<module>apache-karaf</module>-->
        <module>apache-karaf-minimal</module>
-        <module>apache-karaf-full</module>
+        <module>apache-karaf</module>
    </modules>

</project>




---------------------------------------------
Freeman Fang

FuseSource
Email:[email protected]
Web: fusesource.com
Twitter: freemanfang
Blog: http://freemanfang.blogspot.com

Reply via email to