You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@karaf.apache.org by David Jencks <da...@yahoo.com> on 2011/10/24 18:21:26 UTC
Re: svn commit: r1181815 - in /karaf/trunk: admin/core/ admin/core/src/test/resources/etc/ assemblies/apache-karaf/ assemblies/features/ assemblies/features/framework/ assemblies/features/full/ assemblies/features/full/src/main/filtered-resources/resources...
IIUC -1 as this removes the feature, blueprint, and wrap deployers from the server. (and possibly other stuff).
david jencks
On Oct 11, 2011, at 7:47 AM, jbonofre@apache.org wrote:
> Author: jbonofre
> Date: Tue Oct 11 14:47:44 2011
> New Revision: 1181815
>
> URL: http://svn.apache.org/viewvc?rev=1181815&view=rev
> Log:
> [KARAF-772] Remove the full features (not used) for now, build on top of the framework one now
>
> Added:
> karaf/trunk/admin/core/src/test/resources/etc/startup.properties
> karaf/trunk/itests/tests/src/test/resources/org/
> karaf/trunk/itests/tests/src/test/resources/org/apache/
> karaf/trunk/itests/tests/src/test/resources/org/apache/karaf/
> karaf/trunk/itests/tests/src/test/resources/org/apache/karaf/testing/
> karaf/trunk/itests/tests/src/test/resources/org/apache/karaf/testing/startup.properties
> Removed:
> karaf/trunk/assemblies/features/full/pom.xml
> karaf/trunk/assemblies/features/full/src/main/filtered-resources/resources/demos/web/README.txt
> karaf/trunk/assemblies/features/full/src/main/resources/resources/deploy/README
> karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/java.util.logging.properties
> karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.apache.felix.fileinstall-deploy.cfg
> karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.apache.karaf.jaas.cfg
> karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.apache.karaf.log.cfg
> karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.apache.karaf.management.cfg
> karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.apache.karaf.shell.cfg
> karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
> karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
> karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/shell.init.script
> karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/system.properties
> karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/users.properties
> Modified:
> karaf/trunk/admin/core/pom.xml
> karaf/trunk/assemblies/apache-karaf/pom.xml
> karaf/trunk/assemblies/features/framework/pom.xml
> karaf/trunk/assemblies/features/pom.xml
> karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
> karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
>
> Modified: karaf/trunk/admin/core/pom.xml
> URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/pom.xml?rev=1181815&r1=1181814&r2=1181815&view=diff
> ==============================================================================
> --- karaf/trunk/admin/core/pom.xml (original)
> +++ karaf/trunk/admin/core/pom.xml Tue Oct 11 14:47:44 2011
> @@ -105,7 +105,7 @@
> <outputDirectory>${basedir}/target/classes/org/apache/karaf/admin/etc</outputDirectory>
> <resources>
> <resource>
> - <directory>../../assemblies/apache-karaf/src/main/distribution/text/etc/</directory>
> + <directory>../../assemblies/features/framework/src/main/resources/resources/etc</directory>
> <includes>
> <include>*.properties</include>
> <include>*.cfg</include>
> @@ -116,27 +116,20 @@
> <exclude>system.properties</exclude>
> </excludes>
> </resource>
> - </resources>
> - </configuration>
> - </execution>
> - <execution>
> - <id>copy-filtered</id>
> - <!-- here the phase you need -->
> - <phase>compile</phase>
> - <goals>
> - <goal>copy-resources</goal>
> - </goals>
> - <configuration>
> - <outputDirectory>${basedir}/target/classes/org/apache/karaf/admin/etc</outputDirectory>
> - <resources>
> <resource>
> - <directory>../../assemblies/apache-karaf/src/main/filtered-resources/etc</directory>
> + <directory>../../assemblies/features/framework/src/main/filtered-resources/resources/etc</directory>
> <filtering>true</filtering>
> <includes>
> <include>*.properties</include>
> <include>*.cfg</include>
> </includes>
> </resource>
> + <resource>
> + <directory>${project.basedir}/src/test/resources/etc</directory>
> + <includes>
> + <include>startup.properties</include>
> + </includes>
> + </resource>
> </resources>
> </configuration>
> </execution>
>
> Added: karaf/trunk/admin/core/src/test/resources/etc/startup.properties
> URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/test/resources/etc/startup.properties?rev=1181815&view=auto
> ==============================================================================
> --- karaf/trunk/admin/core/src/test/resources/etc/startup.properties (added)
> +++ karaf/trunk/admin/core/src/test/resources/etc/startup.properties Tue Oct 11 14:47:44 2011
> @@ -0,0 +1 @@
> +# Fake startup.properties for unit tests as the startup properties in generated by the karaf-maven-plugin
> \ No newline at end of file
>
> Modified: karaf/trunk/assemblies/apache-karaf/pom.xml
> URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/pom.xml?rev=1181815&r1=1181814&r2=1181815&view=diff
> ==============================================================================
> --- karaf/trunk/assemblies/apache-karaf/pom.xml (original)
> +++ karaf/trunk/assemblies/apache-karaf/pom.xml Tue Oct 11 14:47:44 2011
> @@ -97,8 +97,8 @@
> <version>${project.version}</version>
> <executions>
> <execution>
> - <id>process-resources</id>
> - <phase>process-resources</phase>
> + <id>install-kar</id>
> + <phase>compile</phase>
> <goals>
> <goal>install-kars</goal>
> </goals>
>
> Modified: karaf/trunk/assemblies/features/framework/pom.xml
> URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/pom.xml?rev=1181815&r1=1181814&r2=1181815&view=diff
> ==============================================================================
> --- karaf/trunk/assemblies/features/framework/pom.xml (original)
> +++ karaf/trunk/assemblies/features/framework/pom.xml Tue Oct 11 14:47:44 2011
> @@ -79,22 +79,18 @@
> <dependency>
> <groupId>org.ops4j.pax.logging</groupId>
> <artifactId>pax-logging-api</artifactId>
> - <scope>runtime</scope>
> </dependency>
> <dependency>
> <groupId>org.ops4j.pax.logging</groupId>
> <artifactId>pax-logging-service</artifactId>
> - <scope>runtime</scope>
> </dependency>
> <dependency>
> <groupId>org.ops4j.pax.url</groupId>
> <artifactId>pax-url-aether</artifactId>
> - <scope>runtime</scope>
> </dependency>
> <dependency>
> <groupId>org.ops4j.pax.url</groupId>
> <artifactId>pax-url-wrap</artifactId>
> - <scope>runtime</scope>
> </dependency>
>
>
>
> Modified: karaf/trunk/assemblies/features/pom.xml
> URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/pom.xml?rev=1181815&r1=1181814&r2=1181815&view=diff
> ==============================================================================
> --- karaf/trunk/assemblies/features/pom.xml (original)
> +++ karaf/trunk/assemblies/features/pom.xml Tue Oct 11 14:47:44 2011
> @@ -35,7 +35,6 @@
>
> <modules>
> <module>framework</module>
> - <module>full</module>
> <module>standard</module>
> <module>enterprise</module>
> </modules>
>
> Modified: karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
> URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml?rev=1181815&r1=1181814&r2=1181815&view=diff
> ==============================================================================
> --- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml (original)
> +++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Tue Oct 11 14:47:44 2011
> @@ -286,9 +286,9 @@
> sshRealm=karaf
> hostKey=${karaf.base}/etc/host.key
> </config>
> - <bundle start-level="30">mvn:org.apache.mina/mina-core/${mina.version}</bundle>
> - <bundle start-level="30">mvn:org.apache.sshd/sshd-core/${sshd.version}</bundle>
> - <bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/${project.version}</bundle>
> + <bundle start="true" start-level="30">mvn:org.apache.mina/mina-core/${mina.version}</bundle>
> + <bundle start="true" start-level="30">mvn:org.apache.sshd/sshd-core/${sshd.version}</bundle>
> + <bundle start="true" start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/${project.version}</bundle>
> </feature>
> <feature name="ssh" description="Alias to org.apache.karaf.features.standard.ssh feature" version="${project.version}">
> <feature version="${project.version}">org.apache.karaf.features.standard.ssh</feature>
>
> Added: karaf/trunk/itests/tests/src/test/resources/org/apache/karaf/testing/startup.properties
> URL: http://svn.apache.org/viewvc/karaf/trunk/itests/tests/src/test/resources/org/apache/karaf/testing/startup.properties?rev=1181815&view=auto
> ==============================================================================
> --- karaf/trunk/itests/tests/src/test/resources/org/apache/karaf/testing/startup.properties (added)
> +++ karaf/trunk/itests/tests/src/test/resources/org/apache/karaf/testing/startup.properties Tue Oct 11 14:47:44 2011
> @@ -0,0 +1 @@
> +# Fake startup.properties for unit tests as the startup.properties is now generated by the karaf-maven-plugin
> \ No newline at end of file
>
> Modified: karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
> URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java?rev=1181815&r1=1181814&r2=1181815&view=diff
> ==============================================================================
> --- karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java (original)
> +++ karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java Tue Oct 11 14:47:44 2011
> @@ -16,8 +16,6 @@
> * specific language governing permissions and limitations
> * under the License.
> */
> -
> -
> package org.apache.karaf.tooling.features;
>
> import java.io.BufferedOutputStream;
>
>