You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2009/12/04 02:42:07 UTC
svn commit: r887029 - in /geronimo/server/trunk/framework/bundles: ./
backport-util-concurrent/ commons-digester/ commons-discovery/
commons-fileupload/ httpcore/ jstl/ woden-impl-dom/
Author: xuhaihong
Date: Fri Dec 4 01:42:05 2009
New Revision: 887029
URL: http://svn.apache.org/viewvc?rev=887029&view=rev
Log:
GERONIMO-4967 Bundlized some third-party components
Added:
geronimo/server/trunk/framework/bundles/backport-util-concurrent/
geronimo/server/trunk/framework/bundles/backport-util-concurrent/pom.xml (with props)
geronimo/server/trunk/framework/bundles/commons-fileupload/
geronimo/server/trunk/framework/bundles/commons-fileupload/pom.xml (with props)
geronimo/server/trunk/framework/bundles/httpcore/
geronimo/server/trunk/framework/bundles/httpcore/pom.xml (with props)
geronimo/server/trunk/framework/bundles/woden-impl-dom/
geronimo/server/trunk/framework/bundles/woden-impl-dom/pom.xml (with props)
Modified:
geronimo/server/trunk/framework/bundles/commons-digester/pom.xml
geronimo/server/trunk/framework/bundles/commons-discovery/pom.xml
geronimo/server/trunk/framework/bundles/jstl/pom.xml
geronimo/server/trunk/framework/bundles/pom.xml
Added: geronimo/server/trunk/framework/bundles/backport-util-concurrent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/backport-util-concurrent/pom.xml?rev=887029&view=auto
==============================================================================
--- geronimo/server/trunk/framework/bundles/backport-util-concurrent/pom.xml (added)
+++ geronimo/server/trunk/framework/bundles/backport-util-concurrent/pom.xml Fri Dec 4 01:42:05 2009
@@ -0,0 +1,71 @@
+<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">
+
+ <!--
+
+ 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.geronimo.framework</groupId>
+ <artifactId>framework</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}_1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+ <description>
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ </description>
+
+ <properties>
+ <pkgGroupId>backport-util-concurrent</pkgGroupId>
+ <pkgArtifactId>backport-util-concurrent</pkgArtifactId>
+ <pkgVersion>2.2</pkgVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <!--<version>2.0.1-SNAPSHOT</version>-->
+ <configuration>
+ <instructions>
+ <Export-Package>*;version=${pkgVersion}</Export-Package>
+ <Import-Package>*</Import-Package>
+ <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: geronimo/server/trunk/framework/bundles/backport-util-concurrent/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/bundles/backport-util-concurrent/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/bundles/backport-util-concurrent/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/server/trunk/framework/bundles/commons-digester/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/commons-digester/pom.xml?rev=887029&r1=887028&r2=887029&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/commons-digester/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/commons-digester/pom.xml Fri Dec 4 01:42:05 2009
@@ -29,8 +29,8 @@
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
<description>
@@ -47,26 +47,14 @@
<groupId>${pkgGroupId}</groupId>
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
+ <optional>true</optional>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
+ <version>1.7.0_4-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
@@ -76,7 +64,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Export-Package>org.apache.commons.digester*;version="1.8"</Export-Package>
+ <Export-Package>org.apache.commons.digester*;version=${pkgVersion}</Export-Package>
<Import-Package>*</Import-Package>
<!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
</instructions>
Modified: geronimo/server/trunk/framework/bundles/commons-discovery/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/commons-discovery/pom.xml?rev=887029&r1=887028&r2=887029&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/commons-discovery/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/commons-discovery/pom.xml Fri Dec 4 01:42:05 2009
@@ -29,8 +29,8 @@
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>commons-discovery</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
<description>
@@ -48,13 +48,7 @@
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
<optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ </dependency>
</dependencies>
<build>
@@ -64,8 +58,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Export-Package>org.apache.commons.discovery*;version="0.4"</Export-Package>
- <!--<Import-Package>com.sun.jdmk.comm;resolution:=optional,javax.jms;resolution:=optional,javax.mail.*;resolution:=optional,org.slf4j.helpers;resolution:=optional,*</Import-Package>-->
+ <Export-Package>org.apache.commons.discovery*;version=${pkgVersion}</Export-Package>
+ <Import-Package>*</Import-Package>
<!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
</instructions>
</configuration>
Added: geronimo/server/trunk/framework/bundles/commons-fileupload/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/commons-fileupload/pom.xml?rev=887029&view=auto
==============================================================================
--- geronimo/server/trunk/framework/bundles/commons-fileupload/pom.xml (added)
+++ geronimo/server/trunk/framework/bundles/commons-fileupload/pom.xml Fri Dec 4 01:42:05 2009
@@ -0,0 +1,77 @@
+<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">
+
+ <!--
+
+ 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.geronimo.framework</groupId>
+ <artifactId>framework</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}_1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+ <description>
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ </description>
+
+ <properties>
+ <pkgGroupId>commons-fileupload</pkgGroupId>
+ <pkgArtifactId>commons-fileupload</pkgArtifactId>
+ <pkgVersion>1.1.1</pkgVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-io</artifactId>
+ <version>1.3.2_4-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <!--<version>2.0.1-SNAPSHOT</version>-->
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.commons.fileupload*;version=${pkgVersion}</Export-Package>
+ <Import-Package>javax.portlet*;resolution:=optional,javax.servlet*;resolution:=optional,*</Import-Package>
+ <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: geronimo/server/trunk/framework/bundles/commons-fileupload/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/bundles/commons-fileupload/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/bundles/commons-fileupload/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/framework/bundles/httpcore/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/httpcore/pom.xml?rev=887029&view=auto
==============================================================================
--- geronimo/server/trunk/framework/bundles/httpcore/pom.xml (added)
+++ geronimo/server/trunk/framework/bundles/httpcore/pom.xml Fri Dec 4 01:42:05 2009
@@ -0,0 +1,71 @@
+<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">
+
+ <!--
+
+ 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.geronimo.framework</groupId>
+ <artifactId>framework</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}_1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+ <description>
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ </description>
+
+ <properties>
+ <pkgGroupId>org.apache.httpcomponents</pkgGroupId>
+ <pkgArtifactId>httpcore</pkgArtifactId>
+ <pkgVersion>4.0.1</pkgVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <!--<version>2.0.1-SNAPSHOT</version>-->
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.http*;version=${pkgVersion}</Export-Package>
+ <Import-Package>*</Import-Package>
+ <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: geronimo/server/trunk/framework/bundles/httpcore/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/bundles/httpcore/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/bundles/httpcore/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/server/trunk/framework/bundles/jstl/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/jstl/pom.xml?rev=887029&r1=887028&r2=887029&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/jstl/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/jstl/pom.xml Fri Dec 4 01:42:05 2009
@@ -29,8 +29,8 @@
</parent>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
<description>
@@ -59,8 +59,8 @@
<!--<version>2.0.1-SNAPSHOT</version>-->
<configuration>
<instructions>
- <Export-Package>javax.servlet.jsp.jstl*;version="1.2",*</Export-Package>
- <Import-Package>com.sun.org.apache*;resolution:=optional,*</Import-Package>
+ <Export-Package>*;version=${pkgVersion}</Export-Package>
+ <Import-Package>com.sun.org.apache*;resolution:=optional,*</Import-Package>
<!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
<Embed-Dependency>*;scope=provided;inline=true</Embed-Dependency>
</instructions>
Modified: geronimo/server/trunk/framework/bundles/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/pom.xml?rev=887029&r1=887028&r2=887029&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/pom.xml Fri Dec 4 01:42:05 2009
@@ -45,6 +45,10 @@
<module>derby-all</module>
<module>dwr</module>
<module>jstl</module>
+ <module>woden-impl-dom</module>
+ <module>backport-util-concurrent</module>
+ <module>commons-fileupload</module>
+ <module>httpcore</module>
<!-- todo remove -->
<module>log4j</module>
<module>sxc-jaxb</module>
Added: geronimo/server/trunk/framework/bundles/woden-impl-dom/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/woden-impl-dom/pom.xml?rev=887029&view=auto
==============================================================================
--- geronimo/server/trunk/framework/bundles/woden-impl-dom/pom.xml (added)
+++ geronimo/server/trunk/framework/bundles/woden-impl-dom/pom.xml Fri Dec 4 01:42:05 2009
@@ -0,0 +1,81 @@
+<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">
+
+ <!--
+
+ 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.geronimo.framework</groupId>
+ <artifactId>framework</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}_1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+ <description>
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ </description>
+
+ <properties>
+ <pkgGroupId>org.apache.woden</pkgGroupId>
+ <pkgArtifactId>woden-impl-dom</pkgArtifactId>
+ <pkgVersion>1.0M8</pkgVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
+ <version>1.6.2_2</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <!--<version>2.0.1-SNAPSHOT</version>-->
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.woden.internal*;version=${pkgVersion},org.apache.woden.tool*;version=${pkgVersion}</Export-Package>
+ <Import-Package>
+ org.apache.xerces.parsers*;resolution:=optional,
+ org.apache.xml.serialize*;resolution:=optional,
+ *
+ </Import-Package>
+ <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: geronimo/server/trunk/framework/bundles/woden-impl-dom/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/bundles/woden-impl-dom/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/bundles/woden-impl-dom/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml