You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@abdera.apache.org by an...@apache.org on 2010/11/27 13:49:42 UTC
svn commit: r1039664 - in /abdera/java/trunk: ./ adapters/couchdb/
adapters/filesystem/ adapters/jcr/ adapters/jdbc/ client/ core/
dependencies/i18n/ extensions/gdata/ extensions/geo/ extensions/html/
extensions/json/ extensions/main/ extensions/media/...
Author: antelder
Date: Sat Nov 27 12:49:41 2010
New Revision: 1039664
URL: http://svn.apache.org/viewvc?rev=1039664&view=rev
Log:
ABDERA-270: Apply patch from Guillaume Nodet for OSGi meta-data is broken
Modified:
abdera/java/trunk/adapters/couchdb/pom.xml
abdera/java/trunk/adapters/filesystem/pom.xml
abdera/java/trunk/adapters/jcr/pom.xml
abdera/java/trunk/adapters/jdbc/pom.xml
abdera/java/trunk/client/pom.xml
abdera/java/trunk/core/pom.xml
abdera/java/trunk/dependencies/i18n/pom.xml
abdera/java/trunk/extensions/gdata/pom.xml
abdera/java/trunk/extensions/geo/pom.xml
abdera/java/trunk/extensions/html/pom.xml
abdera/java/trunk/extensions/json/pom.xml
abdera/java/trunk/extensions/main/pom.xml
abdera/java/trunk/extensions/media/pom.xml
abdera/java/trunk/extensions/oauth/pom.xml
abdera/java/trunk/extensions/opensearch/pom.xml
abdera/java/trunk/extensions/rss/pom.xml
abdera/java/trunk/extensions/serializer/pom.xml
abdera/java/trunk/extensions/sharing/pom.xml
abdera/java/trunk/extensions/wsse/pom.xml
abdera/java/trunk/parser/pom.xml
abdera/java/trunk/pom.xml
abdera/java/trunk/security/pom.xml
abdera/java/trunk/security/src/main/java/org/apache/abdera/security/util/SecurityBase.java
abdera/java/trunk/server/pom.xml
abdera/java/trunk/spring/pom.xml
Modified: abdera/java/trunk/adapters/couchdb/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/adapters/couchdb/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/adapters/couchdb/pom.xml (original)
+++ abdera/java/trunk/adapters/couchdb/pom.xml Sat Nov 27 12:49:41 2010
@@ -28,20 +28,13 @@
<name>Abdera CouchDB Adapter</name>
<version>1.1-SNAPSHOT</version>
- <properties>
- <topDir>${basedir}/../..</topDir>
- </properties>
+ <properties>
+ <topDir>${basedir}/../..</topDir>
+ <abdera.osgi.default.exports>
+ org.apache.abdera.protocol.server.adapters.couchdb.*
+ </abdera.osgi.default.exports>
+ </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>net.sf.json-lib</groupId>
Modified: abdera/java/trunk/adapters/filesystem/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/adapters/filesystem/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/adapters/filesystem/pom.xml (original)
+++ abdera/java/trunk/adapters/filesystem/pom.xml Sat Nov 27 12:49:41 2010
@@ -26,18 +26,11 @@
<name>Abdera Filesystem Adapter</name>
<version>1.1-SNAPSHOT</version>
- <properties>
- <topDir>${basedir}/../..</topDir>
- </properties>
+ <properties>
+ <topDir>${basedir}/../..</topDir>
+ <abdera.osgi.default.exports>
+ org.apache.abdera.protocol.server.adapters.filesystem.*
+ </abdera.osgi.default.exports>
+ </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
-
</project>
Modified: abdera/java/trunk/adapters/jcr/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/adapters/jcr/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/adapters/jcr/pom.xml (original)
+++ abdera/java/trunk/adapters/jcr/pom.xml Sat Nov 27 12:49:41 2010
@@ -29,18 +29,11 @@
<properties>
<topDir>${basedir}/../..</topDir>
+ <abdera.osgi.default.exports>
+ org.apache.abdera.protocol.server.adapters.jcr.*
+ </abdera.osgi.default.exports>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
Modified: abdera/java/trunk/adapters/jdbc/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/adapters/jdbc/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/adapters/jdbc/pom.xml (original)
+++ abdera/java/trunk/adapters/jdbc/pom.xml Sat Nov 27 12:49:41 2010
@@ -12,6 +12,9 @@
<properties>
<topDir>${basedir}/../..</topDir>
+ <abdera.osgi.default.exports>
+ org.apache.abdera.protocol.server.adapters.ibatis.*
+ </abdera.osgi.default.exports>
</properties>
<dependencies>
@@ -23,14 +26,4 @@
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: abdera/java/trunk/client/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/client/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/client/pom.xml (original)
+++ abdera/java/trunk/client/pom.xml Sat Nov 27 12:49:41 2010
@@ -29,23 +29,10 @@
<properties>
<topDir>${basedir}/..</topDir>
+ <abdera.osgi.default.exports>
+ org.apache.abdera.protocol.client.*
+ </abdera.osgi.default.exports>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.abdera.protocol.client.*;version=${pom.version}
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: abdera/java/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/core/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/core/pom.xml (original)
+++ abdera/java/trunk/core/pom.xml Sat Nov 27 12:49:41 2010
@@ -28,30 +28,18 @@
<description>Atom Specification Implementation Core</description>
<properties>
<topDir>${basedir}/..</topDir>
+ <abdera.osgi.default.exports>
+ org.apache.abdera;
+ org.apache.abdera.factory.*;
+ org.apache.abdera.filter.*;
+ org.apache.abdera.model.*;
+ org.apache.abdera.parser.*;
+ org.apache.abdera.protocol.*;
+ org.apache.abdera.util.*;
+ org.apache.abdera.writer.*;
+ org.apache.abdera.xpath.*
+ </abdera.osgi.default.exports>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.abdera.factory.*;version=${pom.version},
- org.apache.abdera.model.*;version=${pom.version},
- org.apache.abdera.writer.*;version=${pom.version},
- org.apache.abdera.xpath.*;version=${pom.version},
- org.apache.abdera.filter.*;version=${pom.version},
- org.apache.abdera.protocol.*;version=${pom.version},
- org.apache.abdera.util.*;version=${pom.version},
- org.apache.abdera;version=${pom.version}
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: abdera/java/trunk/dependencies/i18n/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/dependencies/i18n/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/dependencies/i18n/pom.xml (original)
+++ abdera/java/trunk/dependencies/i18n/pom.xml Sat Nov 27 12:49:41 2010
@@ -12,24 +12,9 @@
<artifactId>abdera</artifactId>
<version>1.1-SNAPSHOT</version>
</parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.abdera.i18n.*;version=${pom.version}
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
<properties>
<topDir>${basedir}/../..</topDir>
+ <abdera.osgi.default.exports>org.apache.abdera.i18n.*</abdera.osgi.default.exports>
</properties>
<dependencies>
<dependency>
Modified: abdera/java/trunk/extensions/gdata/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/extensions/gdata/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/extensions/gdata/pom.xml (original)
+++ abdera/java/trunk/extensions/gdata/pom.xml Sat Nov 27 12:49:41 2010
@@ -24,13 +24,4 @@
<artifactId>junit</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: abdera/java/trunk/extensions/geo/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/extensions/geo/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/extensions/geo/pom.xml (original)
+++ abdera/java/trunk/extensions/geo/pom.xml Sat Nov 27 12:49:41 2010
@@ -13,6 +13,9 @@
<properties>
<topDir>${basedir}/../..</topDir>
+ <abdera.osgi.default.exports>
+ org.apache.abdera.ext.geo.*
+ </abdera.osgi.default.exports>
</properties>
<dependencies>
@@ -26,13 +29,4 @@
<artifactId>junit</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: abdera/java/trunk/extensions/html/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/extensions/html/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/extensions/html/pom.xml (original)
+++ abdera/java/trunk/extensions/html/pom.xml Sat Nov 27 12:49:41 2010
@@ -13,6 +13,9 @@
<properties>
<topDir>${basedir}/../..</topDir>
+ <abdera.osgi.default.exports>
+ org.apache.abdera.ext.html.*
+ </abdera.osgi.default.exports>
</properties>
<dependencies>
@@ -31,13 +34,4 @@
<version>1.0.5</version>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: abdera/java/trunk/extensions/json/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/extensions/json/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/extensions/json/pom.xml (original)
+++ abdera/java/trunk/extensions/json/pom.xml Sat Nov 27 12:49:41 2010
@@ -6,13 +6,16 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>abdera-extensions-json</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Abdera Extensions - JSON</name>
<version>1.1-SNAPSHOT</version>
<description>Atom Specification Extensions - JSON</description>
<properties>
<topDir>${basedir}/../../</topDir>
+ <abdera.osgi.default.exports>
+ org.apache.abdera.ext.json.*
+ </abdera.osgi.default.exports>
</properties>
<dependencies>
Modified: abdera/java/trunk/extensions/main/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/extensions/main/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/extensions/main/pom.xml (original)
+++ abdera/java/trunk/extensions/main/pom.xml Sat Nov 27 12:49:41 2010
@@ -13,18 +13,11 @@
<properties>
<topDir>${basedir}/../..</topDir>
+ <abdera.osgi.default.exports>
+ org.apache.abdera.ext.*
+ </abdera.osgi.default.exports>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.apache.abdera</groupId>
Modified: abdera/java/trunk/extensions/media/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/extensions/media/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/extensions/media/pom.xml (original)
+++ abdera/java/trunk/extensions/media/pom.xml Sat Nov 27 12:49:41 2010
@@ -13,25 +13,11 @@
<properties>
<topDir>${basedir}/../..</topDir>
+ <abdera.osgi.default.exports>
+ org.apache.abdera.ext.media.*
+ </abdera.osgi.default.exports>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.abdera.ext.media.*;version=${pom.version}
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.apache.abdera</groupId>
Modified: abdera/java/trunk/extensions/oauth/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/extensions/oauth/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/extensions/oauth/pom.xml (original)
+++ abdera/java/trunk/extensions/oauth/pom.xml Sat Nov 27 12:49:41 2010
@@ -12,17 +12,11 @@
<description>Atom Specification Extensions - OAuth</description>
<properties>
<topDir>${basedir}/../..</topDir>
+ <abdera.osgi.default.exports>
+ org.apache.abdera.ext.oauth.*
+ </abdera.osgi.default.exports>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-client</artifactId>
Modified: abdera/java/trunk/extensions/opensearch/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/extensions/opensearch/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/extensions/opensearch/pom.xml (original)
+++ abdera/java/trunk/extensions/opensearch/pom.xml Sat Nov 27 12:49:41 2010
@@ -27,24 +27,11 @@
<version>1.1-SNAPSHOT</version>
<description>Atom Specification Extensions - OpenSearch</description>
<properties>
- <topDir>${basedir}/../..</topDir>
+ <topDir>${basedir}/../..</topDir>
+ <abdera.osgi.default.exports>
+ org.apache.abdera.ext.opensearch.*
+ </abdera.osgi.default.exports>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.abdera.ext.opensearch.*;version=${pom.version}
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>org.apache.abdera</groupId>
Modified: abdera/java/trunk/extensions/rss/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/extensions/rss/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/extensions/rss/pom.xml (original)
+++ abdera/java/trunk/extensions/rss/pom.xml Sat Nov 27 12:49:41 2010
@@ -28,6 +28,9 @@
<description>Abdera Specification Extensions - RSS</description>
<properties>
<topDir>${basedir}/../..</topDir>
+ <abdera.osgi.default.exports>
+ org.apache.abdera.ext.rss.*
+ </abdera.osgi.default.exports>
</properties>
<dependencies>
<dependency>
@@ -45,13 +48,4 @@
<artifactId>junit</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: abdera/java/trunk/extensions/serializer/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/extensions/serializer/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/extensions/serializer/pom.xml (original)
+++ abdera/java/trunk/extensions/serializer/pom.xml Sat Nov 27 12:49:41 2010
@@ -13,6 +13,9 @@
<properties>
<topDir>${basedir}/../..</topDir>
+ <abdera.osgi.default.exports>
+ org.apache.abdera.ext.serializer.*
+ </abdera.osgi.default.exports>
</properties>
<dependencies>
@@ -26,13 +29,4 @@
<artifactId>junit</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: abdera/java/trunk/extensions/sharing/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/extensions/sharing/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/extensions/sharing/pom.xml (original)
+++ abdera/java/trunk/extensions/sharing/pom.xml Sat Nov 27 12:49:41 2010
@@ -13,6 +13,9 @@
<properties>
<topDir>${basedir}/../..</topDir>
+ <abdera.osgi.default.exports>
+ org.apache.abdera.ext.sharing.*
+ </abdera.osgi.default.exports>
</properties>
<dependencies>
@@ -27,13 +30,4 @@
<artifactId>junit</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: abdera/java/trunk/extensions/wsse/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/extensions/wsse/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/extensions/wsse/pom.xml (original)
+++ abdera/java/trunk/extensions/wsse/pom.xml Sat Nov 27 12:49:41 2010
@@ -13,6 +13,9 @@
<properties>
<topDir>${basedir}/../..</topDir>
+ <abdera.osgi.default.exports>
+ org.apache.abdera.ext.wsse.*
+ </abdera.osgi.default.exports>
</properties>
<dependencies>
@@ -23,13 +26,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: abdera/java/trunk/parser/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/parser/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/parser/pom.xml (original)
+++ abdera/java/trunk/parser/pom.xml Sat Nov 27 12:49:41 2010
@@ -13,43 +13,27 @@
<properties>
<topDir>${basedir}/..</topDir>
+ <abdera.osgi.default.exports>
+ org.apache.abdera.parser.stax.*
+ </abdera.osgi.default.exports>
+ <abdera.osgi.default.imports>
+ !org.dom4j.*,
+ !org.jdom.*,
+ !nu.xom.*,
+ !junit.framework.*,
+ !com.sun.msv.*,
+ !org.relaxng.datatype.*,
+ !org.apache.axiom*,
+ *
+ </abdera.osgi.default.imports>
+ <abdera.osgi.embed.dependencies>
+ axiom-api,
+ axiom-impl,
+ geronimo-stax-api_1.0_spec,
+ jaxen,
+ wstx-asl
+ </abdera.osgi.embed.dependencies>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.abdera.parser.*;version=${pom.version}
- </Export-Package>
- <Embed-Dependency>
- axiom-api,
- axiom-impl,
- geronimo-stax-api_1.0_spec,
- jaxen,
- wstx-asl
- </Embed-Dependency>
- <Private-Package>
- org.apache.axiom.*,
- </Private-Package>
- <Import-Package>
- !org.dom4j.*;resolution:=optional,
- !org.jdom.*;resolution:=optional,
- !nu.xom.*;resolution:=optional,
- !junit.framework.*;resolution:=optional,
- !com.sun.msv.*;resolution:=optional,
- !org.relaxng.datatype.*;resolution:=optional,
- *
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: abdera/java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/pom.xml (original)
+++ abdera/java/trunk/pom.xml Sat Nov 27 12:49:41 2010
@@ -181,6 +181,32 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.1.0</version>
+ <extensions>true</extensions>
+ <inherited>true</inherited>
+ <configuration>
+ <instructions>
+ <Export-Package>${abdera.osgi.exports}</Export-Package>
+ <Import-Package>${abdera.osgi.imports}</Import-Package>
+ <Embed-Dependency>${abdera.osgi.embed.dependencies}</Embed-Dependency>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+ </instructions>
+ <versions>
+ <abdera.osgi.version.clean>${project.version}</abdera.osgi.version.clean>
+ </versions>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>cleanVersions</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -226,6 +252,8 @@
<failIfMissing>true</failIfMissing>
</configuration>
</plugin>
+
+
</plugins>
</pluginManagement>
</build>
@@ -335,6 +363,12 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>1.2.10</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
<version>1.2.10</version>
@@ -442,6 +476,12 @@
<jetty.version>6.1.24</jetty.version>
<easymock.version>3.0</easymock.version>
<topDir>${basedir}</topDir>
+ <abdera.osgi.imports>${abdera.osgi.abdera.imports},${abdera.osgi.default.imports}</abdera.osgi.imports>
+ <abdera.osgi.exports>${abdera.osgi.default.exports};version=${project.version};-noimport:=true</abdera.osgi.exports>
+ <abdera.osgi.abdera.imports>org.apache.abdera.*;version="[$(version;===;${abdera.osgi.version.clean}),$(version;==+;${abdera.osgi.version.clean}))"</abdera.osgi.abdera.imports>
+ <abdera.osgi.default.imports>*</abdera.osgi.default.imports>
+ <abdera.osgi.default.exports>org.apache.abdera.*</abdera.osgi.default.exports>
+ <abdera.osgi.embed.dependencies></abdera.osgi.embed.dependencies>
</properties>
</project>
Modified: abdera/java/trunk/security/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/security/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/security/pom.xml (original)
+++ abdera/java/trunk/security/pom.xml Sat Nov 27 12:49:41 2010
@@ -13,16 +13,17 @@
<properties>
<topDir>${basedir}/..</topDir>
+ <abdera.osgi.default.imports>
+ org.apache.xml.security*;version="[1.3,2)",
+ *
+ </abdera.osgi.default.imports>
+ <abdera.osgi.default.exports>
+ org.apache.abdera.security.*
+ </abdera.osgi.default.exports>
+ <abdera.osgi.embed.dependencies>
+ axiom-api;inline="org/apache/axiom/om/util/Base64.*"
+ </abdera.osgi.embed.dependencies>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -69,5 +70,10 @@
<artifactId>xalan</artifactId>
<version>2.7.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: abdera/java/trunk/security/src/main/java/org/apache/abdera/security/util/SecurityBase.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/util/SecurityBase.java?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/security/src/main/java/org/apache/abdera/security/util/SecurityBase.java (original)
+++ abdera/java/trunk/security/src/main/java/org/apache/abdera/security/util/SecurityBase.java Sat Nov 27 12:49:41 2010
@@ -22,13 +22,15 @@ import java.io.ByteArrayOutputStream;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
import org.apache.abdera.Abdera;
import org.apache.abdera.model.Document;
import org.apache.abdera.model.Element;
import org.apache.abdera.security.SecurityOptions;
-import org.apache.xml.serialize.Serializer;
-import org.apache.xml.serialize.XMLSerializer;
@SuppressWarnings("unchecked")
public abstract class SecurityBase {
@@ -65,10 +67,10 @@ public abstract class SecurityBase {
Document doc = null;
if (dom != null) {
try {
- Serializer ser = new XMLSerializer();
ByteArrayOutputStream out = new ByteArrayOutputStream();
- ser.setOutputByteStream(out);
- ser.asDOMSerializer().serialize(dom);
+ TransformerFactory tf = TransformerFactory.newInstance();
+ Transformer t = tf.newTransformer();
+ t.transform(new DOMSource(dom), new StreamResult(out));
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
doc = options.getParser().parse(in);
} catch (Exception e) {
@@ -97,10 +99,10 @@ public abstract class SecurityBase {
Element el = null;
if (element != null) {
try {
- Serializer ser = new XMLSerializer();
ByteArrayOutputStream out = new ByteArrayOutputStream();
- ser.setOutputByteStream(out);
- ser.asDOMSerializer().serialize(element);
+ TransformerFactory tf = TransformerFactory.newInstance();
+ Transformer t = tf.newTransformer();
+ t.transform(new DOMSource(element), new StreamResult(out));
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
el = options.getParser().parse(in).getRoot();
} catch (Exception e) {
Modified: abdera/java/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/server/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/server/pom.xml (original)
+++ abdera/java/trunk/server/pom.xml Sat Nov 27 12:49:41 2010
@@ -29,25 +29,11 @@
<properties>
<topDir>${basedir}/..</topDir>
+ <abdera.osgi.default.exports>
+ org.apache.abdera.protocol.server.*
+ </abdera.osgi.default.exports>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.abdera.protocol.server.*;version=${pom.version}
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: abdera/java/trunk/spring/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/spring/pom.xml?rev=1039664&r1=1039663&r2=1039664&view=diff
==============================================================================
--- abdera/java/trunk/spring/pom.xml (original)
+++ abdera/java/trunk/spring/pom.xml Sat Nov 27 12:49:41 2010
@@ -6,13 +6,20 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>abdera-spring</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Abdera Spring Integration</name>
<version>1.1-SNAPSHOT</version>
<description>Spring Integration Code for Abdera</description>
<properties>
<topDir>${basedir}/..</topDir>
+ <abdera.osgi.default.imports>
+ org.springframework*;version="[2,4]",
+ *
+ </abdera.osgi.default.imports>
+ <abdera.osgi.default.exports>
+ org.apache.abdera.spring.*
+ </abdera.osgi.default.exports>
</properties>
<dependencies>