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 2012/02/10 00:44:35 UTC
svn commit: r1242606 - in /karaf/trunk: ./
assemblies/features/standard/src/main/feature/
demos/web/src/main/resources/resources/demos/web/ management/mbeans/http/
shell/http/ web/commands/
web/commands/src/main/java/org/apache/karaf/web/commands/ webc...
Author: anierbeck
Date: Thu Feb 9 23:44:35 2012
New Revision: 1242606
URL: http://svn.apache.org/viewvc?rev=1242606&view=rev
Log:
[KARAF-1192] - Upgrade to pax-web 2.0.0-SNAPSHOT
[KARAF-1193] - Upgrade to pax-url 1.4.0.RC1
Modified:
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/demos/web/src/main/resources/resources/demos/web/pom.xml
karaf/trunk/management/mbeans/http/pom.xml
karaf/trunk/pom.xml
karaf/trunk/shell/http/pom.xml
karaf/trunk/web/commands/pom.xml
karaf/trunk/web/commands/src/main/java/org/apache/karaf/web/commands/List.java
karaf/trunk/web/commands/src/main/java/org/apache/karaf/web/commands/Stop.java
karaf/trunk/webconsole/admin/pom.xml
karaf/trunk/webconsole/console/pom.xml
karaf/trunk/webconsole/features/pom.xml
karaf/trunk/webconsole/gogo/pom.xml
karaf/trunk/webconsole/http/pom.xml
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=1242606&r1=1242605&r2=1242606&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Thu Feb 9 23:44:35 2012
@@ -59,25 +59,27 @@
<feature name="jetty" description="Provide Jetty engine support" version="${jetty.version}" resolver="(obr)">
<bundle dependency="true" start-level="30">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
- <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
- <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
+ <bundle dependency="true" start-level="30">mvn:${servlet.spec.groupId}/${servlet.spec.artifactId}/${servlet.spec.version}</bundle>
<bundle dependency="true" start-level="30">mvn:javax.mail/mail/${javax.mail.version}</bundle>
<bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-io/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-http/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-client/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-continuation/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-jmx/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-server/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-security/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-servlet/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-servlets/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-xml/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-webapp/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-jndi/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-plus/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-websocket/${jetty.version}</bundle>
+ <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo.annotation-spec.version}</bundle>
+ <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/${geronimo.jaspic-spec.version}</bundle>
+<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle> -->
+<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-io/${jetty.version}</bundle> -->
+<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-http/${jetty.version}</bundle> -->
+<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-client/${jetty.version}</bundle> -->
+<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-continuation/${jetty.version}</bundle> -->
+<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-jmx/${jetty.version}</bundle> -->
+<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-server/${jetty.version}</bundle> -->
+<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-security/${jetty.version}</bundle> -->
+<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-servlet/${jetty.version}</bundle> -->
+<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-servlets/${jetty.version}</bundle> -->
+<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-xml/${jetty.version}</bundle> -->
+<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-webapp/${jetty.version}</bundle> -->
+<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-jndi/${jetty.version}</bundle> -->
+<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-plus/${jetty.version}</bundle> -->
+<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-websocket/${jetty.version}</bundle> -->
+ <bundle start-level="30">mvn:org.eclipse.jetty.aggregate/jetty-all-server/${jetty.version}</bundle>
</feature>
<feature name="http" version="${project.version}" resolver="(obr)" description="Implementation of the OSGI HTTP Service">
@@ -88,7 +90,7 @@
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>
+ <feature version="[7.0,9.0)">jetty</feature>
<bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-api/${pax.web.version}</bundle>
<bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-spi/${pax.web.version}</bundle>
<bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-runtime/${pax.web.version}</bundle>
Modified: karaf/trunk/demos/web/src/main/resources/resources/demos/web/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/demos/web/src/main/resources/resources/demos/web/pom.xml?rev=1242606&r1=1242605&r2=1242606&view=diff
==============================================================================
--- karaf/trunk/demos/web/src/main/resources/resources/demos/web/pom.xml (original)
+++ karaf/trunk/demos/web/src/main/resources/resources/demos/web/pom.xml Thu Feb 9 23:44:35 2012
@@ -61,6 +61,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>${geronimo.servlet.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: karaf/trunk/management/mbeans/http/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/http/pom.xml?rev=1242606&r1=1242605&r2=1242606&view=diff
==============================================================================
--- karaf/trunk/management/mbeans/http/pom.xml (original)
+++ karaf/trunk/management/mbeans/http/pom.xml Thu Feb 9 23:44:35 2012
@@ -49,8 +49,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>${servlet.spec.groupId}</groupId>
+ <artifactId>${servlet.spec.artifactId}</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1242606&r1=1242605&r2=1242606&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Thu Feb 9 23:44:35 2012
@@ -122,16 +122,20 @@
<commons-jexl.version>2.0</commons-jexl.version>
<commons-lang.version>2.6</commons-lang.version>
<jasypt.bundle.version>1.8_1</jasypt.bundle.version>
- <jetty.version>7.5.4.v20111024</jetty.version>
+ <jetty.version>8.0.4.v20111024</jetty.version>
+ <servlet.spec.groupId>org.mortbay.jetty</servlet.spec.groupId>
+ <servlet.spec.artifactId>servlet-api</servlet.spec.artifactId>
+ <servlet.spec.version>3.0.20100224</servlet.spec.version>
<junit3.bundle.version>3.8.2_4</junit3.bundle.version>
<junit.bundle.version>4.10_1</junit.bundle.version>
<junit.version>4.10</junit.version>
<injection.bundle.version>1.0</injection.bundle.version>
- <geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<geronimo.jms-spec.version>1.1.1</geronimo.jms-spec.version>
<geronimo.jpa-spec.version>1.1</geronimo.jpa-spec.version>
<geronimo.jta-spec.version>1.1.1</geronimo.jta-spec.version>
+ <geronimo.annotation-spec.version>1.1.1</geronimo.annotation-spec.version>
+ <geronimo.jaspic-spec.version>1.0</geronimo.jaspic-spec.version>
<easymock.version>2.5.2</easymock.version>
<equinox.version>3.7.1.R37x_v20110808-1106</equinox.version>
<bndlib.version>1.50.0</bndlib.version>
@@ -182,11 +186,11 @@
<pax.logging.version>1.6.5-SNAPSHOT</pax.logging.version>
<pax.runner.version>1.7.5</pax.runner.version>
<pax.base.version>1.3.0-SNAPSHOT</pax.base.version>
- <pax.url.version>1.4-SNAPSHOT</pax.url.version>
- <pax.web.version>1.1.2</pax.web.version>
+ <pax.url.version>1.4.0.RC1</pax.url.version>
+ <pax.web.version>2.0.0-SNAPSHOT</pax.web.version>
<pax.swissbox.version>1.5.0-SNAPSHOT</pax.swissbox.version>
<pax.tinybundle.version>1.0.0</pax.tinybundle.version>
- <servlet.api.version>2.5</servlet.api.version>
+ <servlet.api.version>3.0</servlet.api.version>
<slf4j.version>1.6.4</slf4j.version>
<servicemix.specs.version>1.9.0</servicemix.specs.version>
<spring.osgi.version>1.2.1</spring.osgi.version>
@@ -965,44 +969,19 @@
<version>${junit.bundle.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
+ <groupId>org.eclipse.jetty.aggregate</groupId>
+ <artifactId>jetty-all-server</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-io</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-http</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-continuation</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>${jetty.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>${geronimo.annotation-spec.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-xml</artifactId>
- <version>${jetty.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaspic_1.0_spec</artifactId>
+ <version>${geronimo.jaspic-spec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -1155,16 +1134,16 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>${servlet.spec.groupId}</groupId>
+ <artifactId>${servlet.spec.artifactId}</artifactId>
+ <version>${servlet.spec.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
<version>${pax.url.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>${geronimo.servlet.version}</version>
- </dependency>
- <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>${easymock.version}</version>
@@ -1934,5 +1913,4 @@
</build>
</profile>
</profiles>
-
</project>
Modified: karaf/trunk/shell/http/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/http/pom.xml?rev=1242606&r1=1242605&r2=1242606&view=diff
==============================================================================
--- karaf/trunk/shell/http/pom.xml (original)
+++ karaf/trunk/shell/http/pom.xml Thu Feb 9 23:44:35 2012
@@ -59,8 +59,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>${servlet.spec.groupId}</groupId>
+ <artifactId>${servlet.spec.artifactId}</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/web/commands/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/web/commands/pom.xml?rev=1242606&r1=1242605&r2=1242606&view=diff
==============================================================================
--- karaf/trunk/web/commands/pom.xml (original)
+++ karaf/trunk/web/commands/pom.xml Thu Feb 9 23:44:35 2012
@@ -50,6 +50,21 @@
<artifactId>org.apache.karaf.shell.console</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.util</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -84,6 +99,7 @@
org.apache.felix.service.command,
org.apache.karaf.shell.commands,
org.apache.karaf.shell.console,
+ org.osgi.framework,
*
</Import-Package>
</instructions>
Modified: karaf/trunk/web/commands/src/main/java/org/apache/karaf/web/commands/List.java
URL: http://svn.apache.org/viewvc/karaf/trunk/web/commands/src/main/java/org/apache/karaf/web/commands/List.java?rev=1242606&r1=1242605&r2=1242606&view=diff
==============================================================================
--- karaf/trunk/web/commands/src/main/java/org/apache/karaf/web/commands/List.java (original)
+++ karaf/trunk/web/commands/src/main/java/org/apache/karaf/web/commands/List.java Thu Feb 9 23:44:35 2012
@@ -33,7 +33,7 @@ public class List extends OsgiCommandSup
public Object doExecute() throws Exception {
java.util.List<WebBundle> webBundles = webContainerService.list();
if (webBundles != null && !webBundles.isEmpty()) {
- String headers = String.format("%d4 %s6 %s6 %s6 %d4 %s30 %s30", "ID", "State", "Web-State", "Level", "Web-ContextPath", "Name");
+ String headers = String.format("%d4 %s6 %s6 %s6 %s4 %s30 %s30", "ID", "State", "Web-State", "Level", "Web-ContextPath", "Name");
System.out.println(headers);
for (WebBundle webBundle : webBundles) {
String display = String.format("%d4 %s6 %s6 %s6 %d4 %s30 %s30",
Modified: karaf/trunk/web/commands/src/main/java/org/apache/karaf/web/commands/Stop.java
URL: http://svn.apache.org/viewvc/karaf/trunk/web/commands/src/main/java/org/apache/karaf/web/commands/Stop.java?rev=1242606&r1=1242605&r2=1242606&view=diff
==============================================================================
--- karaf/trunk/web/commands/src/main/java/org/apache/karaf/web/commands/Stop.java (original)
+++ karaf/trunk/web/commands/src/main/java/org/apache/karaf/web/commands/Stop.java Thu Feb 9 23:44:35 2012
@@ -20,6 +20,10 @@ import org.apache.karaf.shell.commands.A
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.apache.karaf.web.WebContainerService;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
@Command(scope = "web", name = "stop", description = "Stop the web context of given bundles.")
public class Stop extends OsgiCommandSupport {
@@ -28,6 +32,8 @@ public class Stop extends OsgiCommandSup
java.util.List<Long> ids;
private WebContainerService webContainerService;
+
+
public void setWebContainerService(WebContainerService webContainerService) {
this.webContainerService = webContainerService;
Modified: karaf/trunk/webconsole/admin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/admin/pom.xml?rev=1242606&r1=1242605&r2=1242606&view=diff
==============================================================================
--- karaf/trunk/webconsole/admin/pom.xml (original)
+++ karaf/trunk/webconsole/admin/pom.xml Thu Feb 9 23:44:35 2012
@@ -1,133 +1,127 @@
<?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">
+<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.webconsole</groupId>
- <artifactId>webconsole</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.apache.karaf.webconsole.admin</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Karaf :: Web Console :: Admin Plugin</name>
- <description>This bundle provides Karaf admin support in the Web Console.</description>
-
- <properties>
- <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.main</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.webconsole</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.admin</groupId>
- <artifactId>org.apache.karaf.admin.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20070829</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
-
- <!-- Only needed while running the unit tests -->
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>${commons-fileupload.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>${project.basedir}/src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <directory>${project.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.info</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>
- !${project.artifactId}*,
- org.apache.aries.blueprint,
- org.osgi.service.blueprint.container,
- org.osgi.service.blueprint.reflect,
- *
- </Import-Package>
- <Embed-Dependency>
- <!-- Required for JSON data transfer -->
- <!-- TODO: this needs to be put in a common place for reuse. -->
- json
- </Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <!-- 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.webconsole</groupId>
+ <artifactId>webconsole</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.apache.karaf.webconsole.admin</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Karaf :: Web Console :: Admin Plugin</name>
+ <description>This bundle provides Karaf admin support in the Web Console.</description>
+
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.webconsole</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${servlet.spec.groupId}</groupId>
+ <artifactId>${servlet.spec.artifactId}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.admin</groupId>
+ <artifactId>org.apache.karaf.admin.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20070829</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- Only needed while running the unit tests -->
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>${commons-fileupload.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.info</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Import-Package>
+ !${project.artifactId}*,
+ org.apache.aries.blueprint,
+ org.osgi.service.blueprint.container,
+ org.osgi.service.blueprint.reflect,
+ *
+ </Import-Package>
+ <Embed-Dependency>
+ <!-- Required for JSON data transfer -->
+ <!-- TODO: this needs to be put in a common place for reuse. -->
+ json
+ </Embed-Dependency>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: karaf/trunk/webconsole/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/console/pom.xml?rev=1242606&r1=1242605&r2=1242606&view=diff
==============================================================================
--- karaf/trunk/webconsole/console/pom.xml (original)
+++ karaf/trunk/webconsole/console/pom.xml Thu Feb 9 23:44:35 2012
@@ -39,9 +39,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- </dependency>
+ <groupId>${servlet.spec.groupId}</groupId>
+ <artifactId>${servlet.spec.artifactId}</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.main</artifactId>
Modified: karaf/trunk/webconsole/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/features/pom.xml?rev=1242606&r1=1242605&r2=1242606&view=diff
==============================================================================
--- karaf/trunk/webconsole/features/pom.xml (original)
+++ karaf/trunk/webconsole/features/pom.xml Thu Feb 9 23:44:35 2012
@@ -59,9 +59,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
+ <groupId>${servlet.spec.groupId}</groupId>
+ <artifactId>${servlet.spec.artifactId}</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
Modified: karaf/trunk/webconsole/gogo/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/gogo/pom.xml?rev=1242606&r1=1242605&r2=1242606&view=diff
==============================================================================
--- karaf/trunk/webconsole/gogo/pom.xml (original)
+++ karaf/trunk/webconsole/gogo/pom.xml Thu Feb 9 23:44:35 2012
@@ -59,9 +59,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
+ <groupId>${servlet.spec.groupId}</groupId>
+ <artifactId>${servlet.spec.artifactId}</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
Modified: karaf/trunk/webconsole/http/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/http/pom.xml?rev=1242606&r1=1242605&r2=1242606&view=diff
==============================================================================
--- karaf/trunk/webconsole/http/pom.xml (original)
+++ karaf/trunk/webconsole/http/pom.xml Thu Feb 9 23:44:35 2012
@@ -59,9 +59,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
+ <groupId>${servlet.spec.groupId}</groupId>
+ <artifactId>${servlet.spec.artifactId}</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>