You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by an...@apache.org on 2011/01/11 20:35:31 UTC
svn commit: r1057824 - in /karaf/trunk:
assembly/src/main/filtered-resources/features.xml shell/pom.xml shell/web/
shell/web/pom.xml shell/web/src/
Author: anierbeck
Date: Tue Jan 11 19:35:31 2011
New Revision: 1057824
URL: http://svn.apache.org/viewvc?rev=1057824&view=rev
Log:
[KARAF-211] - osgi:list to other command to display context-path for web applications or a new war command for that
added a web:list command
Added:
karaf/trunk/shell/web/ (with props)
karaf/trunk/shell/web/pom.xml (with props)
karaf/trunk/shell/web/src/
Modified:
karaf/trunk/assembly/src/main/filtered-resources/features.xml
karaf/trunk/shell/pom.xml
Modified: karaf/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/features.xml?rev=1057824&r1=1057823&r2=1057824&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/features.xml Tue Jan 11 19:35:31 2011
@@ -26,10 +26,10 @@
<bundle>mvn:org.springframework/spring-context-support/${spring2.version}</bundle>
</feature>
<feature name="spring-web" version="${spring2.version}" resolver="(obr)">
- <feature version="${spring2.version}">spring</feature>
- <feature version="${project.version}">http</feature>
- <bundle>mvn:org.springframework/spring-web/${spring2.version}</bundle>
- <bundle>mvn:org.springframework/spring-webmvc/${spring2.version}</bundle>
+ <feature version="${spring2.version}">spring</feature>
+ <feature version="${project.version}">http</feature>
+ <bundle>mvn:org.springframework/spring-web/${spring2.version}</bundle>
+ <bundle>mvn:org.springframework/spring-webmvc/${spring2.version}</bundle>
</feature>
<feature name="spring" version="${spring.version}" resolver="(obr)">
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
@@ -42,10 +42,10 @@
<bundle>mvn:org.springframework/spring-context-support/${spring.version}</bundle>
</feature>
<feature name="spring-web" version="${spring.version}" resolver="(obr)">
- <feature version="${spring.version}">spring</feature>
- <feature version="${project.version}">http</feature>
- <bundle>mvn:org.springframework/spring-web/${spring.version}</bundle>
- <bundle>mvn:org.springframework/spring-webmvc/${spring.version}</bundle>
+ <feature version="${spring.version}">spring</feature>
+ <feature version="${project.version}">http</feature>
+ <bundle>mvn:org.springframework/spring-web/${spring.version}</bundle>
+ <bundle>mvn:org.springframework/spring-webmvc/${spring.version}</bundle>
</feature>
<feature name="spring-dm" version="${spring.osgi.version}" resolver="(obr)">
<feature version="[2.5.6,4)">spring</feature>
@@ -57,10 +57,10 @@
<bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
</feature>
<feature name="spring-dm-web" version="${spring.osgi.version}" resolver="(obr)">
- <feature version="${spring.osgi.version}">spring-dm</feature>
- <feature version="[2.5.6,4)">spring-web</feature>
- <feature version="${project.version}">http</feature>
- <bundle>mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
+ <feature version="${spring.osgi.version}">spring-dm</feature>
+ <feature version="[2.5.6,4)">spring-web</feature>
+ <feature version="${project.version}">http</feature>
+ <bundle>mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
</feature>
<feature name="wrapper" version="${project.version}">
<bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.wrapper/${project.version}</bundle>
@@ -73,41 +73,43 @@
<feature name="config" version="${project.version}">
<bundle start-level='30'>mvn:org.apache.karaf.shell/org.apache.karaf.shell.config/${project.version}</bundle>
</feature>
- <feature name="jetty" version="${jetty.version}" resolver="(obr)">
- <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
+ <feature name="jetty" version="${jetty.version}" resolver="(obr)">
+ <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-http/${jetty.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-continuation/${jetty.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-server/${jetty.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-security/${jetty.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-xml/${jetty.version}</bundle>
- </feature>
- <feature name="jetty-jaas" version="${jetty.version}" resolver="(obr)">
- <feature version="[7.0,8.0)">jetty</feature>
- <bundle dependency='true'>mvn:javax.mail/mail/${javax.mail.version}</bundle>
- <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-webapp/${jetty.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-jndi/${jetty.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-plus/${jetty.version}</bundle>
- </feature>
+ <bundle>mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-http/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-continuation/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-server/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-security/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-xml/${jetty.version}</bundle>
+ </feature>
+ <feature name="jetty-jaas" version="${jetty.version}" resolver="(obr)">
+ <feature version="[7.0,8.0)">jetty</feature>
+ <bundle dependency='true'>mvn:javax.mail/mail/${javax.mail.version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-webapp/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-jndi/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-plus/${jetty.version}</bundle>
+ </feature>
<feature name="http" version="${project.version}" resolver="(obr)">
- <configfile finalname="/etc/jetty.xml">mvn:org.apache.karaf/apache-karaf/${project.version}/xml/jettyconfig</configfile>
- <config name="org.ops4j.pax.web">
+ <configfile finalname="/etc/jetty.xml">mvn:org.apache.karaf/apache-karaf/${project.version}/xml/jettyconfig</configfile>
+ <config name="org.ops4j.pax.web">
org.osgi.service.http.port=8181
javax.servlet.context.tempdir=${karaf.data}/pax-web-jsp
org.ops4j.pax.web.config.file=${karaf.base}/etc/jetty.xml
</config>
<feature version="[7.0,8.0)">jetty</feature>
- <bundle>mvn:org.ops4j.pax.web/pax-web-api/${pax.web.version}</bundle>
+ <bundle>mvn:org.ops4j.pax.web/pax-web-api/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-spi/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-runtime/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-jetty/${pax.web.version}</bundle>
</feature>
<feature name="war" version="${project.version}" resolver="(obr)">
<feature>http</feature>
+ <feature>eventadmin</feature>
+ <bundle start-level='30'>mvn:org.apache.karaf.shell/org.apache.karaf.shell.war/${project.version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-extender-war/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}</bundle>
@@ -131,7 +133,7 @@
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.admin/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.features/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.gogo/${project.version}</bundle>
- <bundle>mvn:org.apache.felix/org.apache.felix.webconsole.plugins.event/${felix.eventadmin-plugin.version}</bundle>
+ <bundle>mvn:org.apache.felix/org.apache.felix.webconsole.plugins.event/${felix.eventadmin-plugin.version}</bundle>
</feature>
<feature name="ssh" version="${project.version}">
<config name="org.apache.karaf.shell">
@@ -150,7 +152,7 @@
<bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}</bundle>
</feature>
<feature name="eventadmin" version="${project.version}">
- <bundle>mvn:org.apache.felix/org.apache.felix.eventadmin/${felix.eventadmin.version}</bundle>
+ <bundle start-level='30'>mvn:org.apache.felix/org.apache.felix.eventadmin/${felix.eventadmin.version}</bundle>
</feature>
<feature name="jasypt-encryption" version="${project.version}" resolver="(obr)">
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.bundle.version}</bundle>
Modified: karaf/trunk/shell/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/pom.xml?rev=1057824&r1=1057823&r2=1057824&view=diff
==============================================================================
--- karaf/trunk/shell/pom.xml (original)
+++ karaf/trunk/shell/pom.xml Tue Jan 11 19:35:31 2011
@@ -43,6 +43,7 @@
<module>ssh</module>
<module>wrapper</module>
<module>dev</module>
+ <module>web</module>
</modules>
</project>
Propchange: karaf/trunk/shell/web/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan 11 19:35:31 2011
@@ -0,0 +1,7 @@
+.project
+
+.classpath
+
+.settings
+
+target
Added: karaf/trunk/shell/web/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/web/pom.xml?rev=1057824&view=auto
==============================================================================
--- karaf/trunk/shell/web/pom.xml (added)
+++ karaf/trunk/shell/web/pom.xml Tue Jan 11 19:35:31 2011
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>shell</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <version>2.1.99-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.apache.karaf.shell.web</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Karaf :: Shell :: web Commands</name>
+ <version>2.1.99-SNAPSHOT</version>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+ <description>Provides the web Shell commands.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.utils</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
+ <Import-Package>
+ !${project.artifactId}*,
+ org.apache.felix.service.command,
+ org.apache.felix.gogo.commands,
+ org.apache.karaf.shell.console,
+ org.springframework*;resolution:=optional,
+ *
+ </Import-Package>
+ <Private-Package>
+ org.apache.felix.utils.version,
+ org.apache.felix.utils.manifest,
+ !*
+ </Private-Package>
+ <_versionpolicy>${bnd.version.policy}</_versionpolicy>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: karaf/trunk/shell/web/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain