You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gn...@apache.org on 2007/09/21 15:14:28 UTC
svn commit: r578095 - in /geronimo/specs/trunk: ./
geronimo-activation_1.1_spec/ geronimo-annotation_1.0_spec/
geronimo-ejb_3.0_spec/ geronimo-interceptor_3.0_spec/
geronimo-j2ee-management_1.1_spec/ geronimo-jaspi_1.0_spec/
geronimo-javamail_1.4_spec/...
Author: gnodet
Date: Fri Sep 21 06:14:26 2007
New Revision: 578095
URL: http://svn.apache.org/viewvc?rev=578095&view=rev
Log:
GERONIMO-3482: OSGifying spec jars
Added:
geronimo/specs/trunk/geronimo-activation_1.1_spec/
- copied from r578073, geronimo/specs/tags/geronimo-activation_1.1_spec-1.0/
geronimo/specs/trunk/geronimo-annotation_1.0_spec/
- copied from r578075, geronimo/specs/tags/geronimo-annotation_1.0_spec-1.1.0/
geronimo/specs/trunk/geronimo-ejb_3.0_spec/
- copied from r578077, geronimo/specs/tags/geronimo-ejb_3.0_spec-1.0/
geronimo/specs/trunk/geronimo-interceptor_3.0_spec/
- copied from r578077, geronimo/specs/tags/geronimo-interceptor_3.0_spec-1.0/
geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/
- copied from r578083, geronimo/specs/tags/geronimo-j2ee-management_1.1_spec-1.0/
geronimo/specs/trunk/geronimo-jms_1.1_spec/
- copied from r578073, geronimo/specs/tags/geronimo-jms_1.1_spec-1.1/
geronimo/specs/trunk/geronimo-jta_1.1_spec/
- copied from r578074, geronimo/specs/tags/geronimo-jta_1.1_spec-1.1.0/
geronimo/specs/trunk/geronimo-stax-api_1.0_spec/
- copied from r578088, geronimo/specs/tags/geronimo-stax-api_1.0_spec-1.0/
Modified:
geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml
geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml
geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml
geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jaspi_1.0_spec/pom.xml
geronimo/specs/trunk/geronimo-javamail_1.4_spec/pom.xml
geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-stax-api_1.0_spec/pom.xml
geronimo/specs/trunk/pom.xml
Modified: geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml?rev=578095&r1=578073&r2=578095&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml Fri Sep 21 06:14:26 2007
@@ -27,17 +27,23 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.2</version>
+ <version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-activation_1.1_spec</artifactId>
+ <packaging>bundle</packaging>
<name>Activation 1.1</name>
- <version>1.0</version>
+ <version>1.0.1-SNAPSHOT</version>
+
+ <properties>
+ <geronimo.osgi.export.pkg>javax.activation*</geronimo.osgi.export.pkg>
+ <geronimo.osgi.export.version>1.1</geronimo.osgi.export.version>
+ </properties>
<scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-activation_1.1_spec-1.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-activation_1.1_spec-1.0</developerConnection>
- <url>https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-activation_1.1_spec-1.0</url>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-activation_1.1_spec</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-activation_1.1_spec</developerConnection>
+ <url>https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-activation_1.1_spec</url>
</scm>
</project>
Modified: geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml?rev=578095&r1=578075&r2=578095&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml Fri Sep 21 06:14:26 2007
@@ -27,13 +27,19 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.2</version>
+ <version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <packaging>bundle</packaging>
<name>Annotation 1.0</name>
- <version>1.1</version>
+ <version>1.1.1-SNAPSHOT</version>
+
+ <properties>
+ <geronimo.osgi.export.pkg>javax.annotation*</geronimo.osgi.export.pkg>
+ <geronimo.osgi.export.version>1.0</geronimo.osgi.export.version>
+ </properties>
<build>
<plugins>
Modified: geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml?rev=578095&r1=578077&r2=578095&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml Fri Sep 21 06:14:26 2007
@@ -27,33 +27,39 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.2</version>
+ <version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <packaging>bundle</packaging>
<name>EJB 3.0</name>
- <version>1.0</version>
+ <version>1.0.1-SNAPSHOT</version>
+
+ <properties>
+ <geronimo.osgi.export.pkg>javax.ejb*,javax.xml.rpc.handler*</geronimo.osgi.export.pkg>
+ <geronimo.osgi.export.version>3.0</geronimo.osgi.export.version>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_3.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml?rev=578095&r1=578077&r2=578095&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml Fri Sep 21 06:14:26 2007
@@ -27,13 +27,18 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.2</version>
+ <version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-interceptor_3.0_spec</artifactId>
+ <packaging>bundle</packaging>
<name>Interceptor 3.0</name>
- <version>1.0</version>
+ <version>1.0.1-SNAPSHOT</version>
+
+ <properties>
+ <geronimo.osgi.export.version>3.0</geronimo.osgi.export.version>
+ </properties>
<build>
<plugins>
Modified: geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/pom.xml?rev=578095&r1=578083&r2=578095&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/pom.xml Fri Sep 21 06:14:26 2007
@@ -27,25 +27,32 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.2</version>
+ <version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ <packaging>bundle</packaging>
<name>J2EE Management 1.1</name>
- <version>1.0</version>
+ <version>1.0.1-SNAPSHOT</version>
+
+ <properties>
+ <geronimo.osgi.export.pkg>javax.management.j2ee*</geronimo.osgi.export.pkg>
+ <geronimo.osgi.export.version>1.1</geronimo.osgi.export.version>
+ <geronimo.osgi.import.pkg>javax.ejb*;resolution:=optional,*</geronimo.osgi.import.pkg>
+ </properties>
<scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-j2ee-management_1.1_spec-1.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-j2ee-management_1.1_spec-1.0</developerConnection>
- <url>https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-j2ee-management_1.1_spec-1.0</url>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec</developerConnection>
+ <url>https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec</url>
</scm>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/specs/trunk/geronimo-jaspi_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaspi_1.0_spec/pom.xml?rev=578095&r1=578094&r2=578095&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaspi_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaspi_1.0_spec/pom.xml Fri Sep 21 06:14:26 2007
@@ -1,18 +1,50 @@
-<project>
- <parent>
- <artifactId>specs</artifactId>
- <groupId>org.apache.geronimo.specs</groupId>
- <version>1.2</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>geronimo-jaspi_1.0_spec</artifactId>
- <name>Java Authentication Service Provider Interface for Containers</name>
- <version>1.0-SNAPSHOT</version>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jaspi_1.0_spec/</connection>
- <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jaspi_1.0_spec/</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jaspi_1.0_spec/</url>
- </scm>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<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/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>specs</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>geronimo-jaspi_1.0_spec</artifactId>
+ <packaging>bundle</packaging>
+ <name>Java Authentication SPI for Containers</name>
+ <version>1.0-SNAPSHOT</version>
+
+ <properties>
+ <geronimo.osgi.export.pkg>javax.security.auth.message*</geronimo.osgi.export.pkg>
+ <geronimo.osgi.export.version>1.0</geronimo.osgi.export.version>
+ </properties>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jaspi_1.0_spec/</connection>
+ <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jaspi_1.0_spec/</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jaspi_1.0_spec/</url>
+ </scm>
</project>
Modified: geronimo/specs/trunk/geronimo-javamail_1.4_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-javamail_1.4_spec/pom.xml?rev=578095&r1=578094&r2=578095&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-javamail_1.4_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-javamail_1.4_spec/pom.xml Fri Sep 21 06:14:26 2007
@@ -7,9 +7,9 @@
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
@@ -27,25 +27,31 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.2</version>
+ <version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <packaging>bundle</packaging>
<name>JavaMail 1.4</name>
<version>1.2-SNAPSHOT</version>
+ <properties>
+ <geronimo.osgi.export.pkg>javax.mail*</geronimo.osgi.export.pkg>
+ <geronimo.osgi.export.version>1.4</geronimo.osgi.export.version>
+ </properties>
+
<scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-javamail_1.4_spec-1.1</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-javamail_1.4_spec-1.1</developerConnection>
- <url>https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-javamail_1.4_spec-1.1</url>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-javamail_1.4_spec</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-javamail_1.4_spec</developerConnection>
+ <url>https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-javamail_1.4_spec</url>
</scm>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml?rev=578095&r1=578073&r2=578095&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml Fri Sep 21 06:14:26 2007
@@ -27,13 +27,19 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.2</version>
+ <version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-jms_1.1_spec</artifactId>
+ <packaging>bundle</packaging>
<name>JMS 1.1</name>
- <version>1.1</version>
+ <version>1.1.1-SNAPSHOT</version>
+
+ <properties>
+ <geronimo.osgi.export.pkg>javax.jms*</geronimo.osgi.export.pkg>
+ <geronimo.osgi.export.version>1.1</geronimo.osgi.export.version>
+ </properties>
<dependencies>
<dependency>
@@ -51,10 +57,9 @@
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jms_1.1_spec-1.1</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jms_1.1_spec-1.1</developerConnection>
- <url>https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jms_1.1_spec-1.1</url>
- </scm>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jms_1.1_spec</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jms_1.1_spec</developerConnection>
+ <url>https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jms_1.1_spec</url>
+ </scm>
</project>
Modified: geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml?rev=578095&r1=578074&r2=578095&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml Fri Sep 21 06:14:26 2007
@@ -27,11 +27,18 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.2</version>
+ <version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-jta_1.1_spec</artifactId>
+ <packaging>bundle</packaging>
<name>JTA 1.1</name>
- <version>1.1</version>
+ <version>1.1.1-SNAPSHOT</version>
+
+ <properties>
+ <geronimo.osgi.export.pkg>javax.transaction*</geronimo.osgi.export.pkg>
+ <geronimo.osgi.export.version>1.1</geronimo.osgi.export.version>
+ </properties>
+
</project>
Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/pom.xml?rev=578095&r1=578088&r2=578095&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/pom.xml Fri Sep 21 06:14:26 2007
@@ -29,18 +29,24 @@
<parent>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <version>1.2</version>
+ <version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <packaging>bundle</packaging>
<name>Streaming API for XML (STAX API 1.0)</name>
- <version>1.0</version>
+ <version>1.0.1-SNAPSHOT</version>
+
+ <properties>
+ <geronimo.osgi.export.pkg>javax.xml.stream*</geronimo.osgi.export.pkg>
+ <geronimo.osgi.export.version>1.0</geronimo.osgi.export.version>
+ </properties>
<scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-stax-api_1.0_spec-1.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-stax-api_1.0_spec-1.0</developerConnection>
- <url>https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-stax-api_1.0_spec-1.0</url>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-stax-api_1.0_spec</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/tags/geronimo-stax-api_1.0_spec</developerConnection>
+ <url>https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-stax-api_1.0_spec</url>
</scm>
</project>
Modified: geronimo/specs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/pom.xml?rev=578095&r1=578094&r2=578095&view=diff
==============================================================================
--- geronimo/specs/trunk/pom.xml (original)
+++ geronimo/specs/trunk/pom.xml Fri Sep 21 06:14:26 2007
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
+<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/maven-v4_0_0.xsd">
-<!-- $Rev$ $Date$ -->
+ <!--
+ 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.
+ -->
-<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/maven-v4_0_0.xsd">
+ <!-- $Rev$ $Date$ -->
<modelVersion>4.0.0</modelVersion>
@@ -32,10 +32,9 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>specs</artifactId>
- <name>Geronimo Specifications</name>
<packaging>pom</packaging>
-
- <version>1.2</version>
+ <name>Geronimo Specifications</name>
+ <version>1.2-SNAPSHOT</version>
<description>
Provides open-source implementations of Sun specifications.
@@ -56,6 +55,23 @@
</dependency>
</dependencies>
+ <properties>
+ <!--
+ |
+ | Geronimo OSGi properties
+ |
+ | Note: when modules can override these properties.
+ |
+ -->
+ <geronimo.osgi.import.pkg>*</geronimo.osgi.import.pkg>
+ <geronimo.osgi.export.pkg>*</geronimo.osgi.export.pkg>
+ <geronimo.osgi.private.pkg></geronimo.osgi.private.pkg>
+ <geronimo.osgi.export>!META-INF*,${geronimo.osgi.export.pkg}*;version=${geronimo.osgi.export.version}</geronimo.osgi.export>
+ <geronimo.osgi.export.version>${project.version}</geronimo.osgi.export.version>
+ <geronimo.osgi.import>!META-INF*,${geronimo.osgi.import.pkg}</geronimo.osgi.import>
+ <geronimo.osgi.symbolic.name>${groupId}.${artifactId}</geronimo.osgi.symbolic.name>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -97,14 +113,37 @@
<tagBase>https://svn.apache.org/repos/asf/geronimo/specs/tags/</tagBase>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.0.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Name>${artifactId}</Bundle-Name>
+ <Bundle-SymbolicName>${geronimo.osgi.symbolic.name}</Bundle-SymbolicName>
+ <Export-Package>${geronimo.osgi.export}</Export-Package>
+ <Import-Package>${geronimo.osgi.import}</Import-Package>
+ <Private-Package>${geronimo.osgi.private.pkg}</Private-Package>
+ <Implementation-Title>Apache Geronimo</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ </instructions>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
<modules>
<module>geronimo-activation_1.1_spec</module>
<module>geronimo-commonj_1.1_spec</module>
+ <module>geronimo-jaspi_1.0_spec</module>
<module>geronimo-javamail_1.4_spec</module>
- <module>geronimo-servlet_2.5_spec</module>
+ <module>geronimo-j2ee-management_1.1_spec</module>
+ <module>geronimo-jms_1.1_spec</module>
+ <module>geronimo-jta_1.1_spec</module>
+ <module>geronimo-stax-api_1.0_spec</module>
</modules>
<profiles>
@@ -120,11 +159,9 @@
</activation>
<modules>
- <module>geronimo-el_1.0_spec</module>
- <module>geronimo-j2ee-management_1.1_spec</module>
- <module>geronimo-jacc_1.1_spec</module>
- <module>geronimo-javaee-deployment_1.1MR3_spec</module>
- <module>geronimo-jsp_2.1_spec</module>
+ <module>geronimo-annotation_1.0_spec</module>
+ <module>geronimo-ejb_3.0_spec</module>
+ <module>geronimo-interceptor_3.0_spec</module>
</modules>
</profile>
</profiles>