Author: dkulp
Date: Fri Jun 7 17:03:39 2013
New Revision: 1490728
URL: http://svn.apache.org/r1490728
Log:
Get enough OSGi stuff working to get the bundles to load
(note: requires SANTUARIO-357 to be resolved first)
Modified:
webservices/wss4j/trunk/parent/pom.xml
webservices/wss4j/trunk/policy/pom.xml
webservices/wss4j/trunk/pom.xml
webservices/wss4j/trunk/ws-security-common/pom.xml
webservices/wss4j/trunk/ws-security-dom/pom.xml
Modified: webservices/wss4j/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/parent/pom.xml?rev=1490728&r1=1490727&r2=1490728&view=diff
==============================================================================
--- webservices/wss4j/trunk/parent/pom.xml (original)
+++ webservices/wss4j/trunk/parent/pom.xml Fri Jun 7 17:03:39 2013
@@ -51,6 +51,13 @@
<xml.apis.version>1.3.04</xml.apis.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
<xmlunit.version>1.3</xmlunit.version>
+
+ <!-- OSGi related properties -->
+ <wss4j.osgi.import />
+ <wss4j.osgi.symbolic.name>${project.groupId}.${project.artifactId}</wss4j.osgi.symbolic.name>
+ <wss4j.osgi.export>org.apache.wss4j.*</wss4j.osgi.export>
+ <wss4j.osgi.dynamic.import />
+ <wss4j.manifest.location>${project.build.outputDirectory}/META-INF/MANIFEST.MF</wss4j.manifest.location>
</properties>
<dependencyManagement>
@@ -192,6 +199,75 @@
</includes>
</testResource>
</testResources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${wss4j.manifest.location}</manifestFile>
+ <manifestEntries>
+ <Specification-Title>${project.name}</Specification-Title>
+ <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+ <Implementation-Title>${project.name}</Implementation-Title>
+ <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>versions</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>cleanVersions</goal>
+ </goals>
+ <configuration>
+ <versions>
+ <wss4j.osgi.version.clean>${project.version}</wss4j.osgi.version.clean>
+ </versions>
+ </configuration>
+ </execution>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${wss4j.osgi.symbolic.name}</Bundle-SymbolicName>
+ <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+ <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Version>${wss4j.osgi.version.clean}</Implementation-Version>
+ <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+ <Specification-Version>${wss4j.osgi.version.clean}</Specification-Version>
+ <Bundle-DocURL>http://ws.apache.org/wss4j</Bundle-DocURL>
+ <_failok>true</_failok>
+ <_nouses>true</_nouses>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+ <Export-Package>${wss4j.osgi.export}</Export-Package>
+ <Import-Package>
+ ${wss4j.osgi.import},
+ *
+ </Import-Package>
+ <DynamicImport-Package>
+ ${wss4j.osgi.dynamic.import}
+ </DynamicImport-Package>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: webservices/wss4j/trunk/policy/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/pom.xml?rev=1490728&r1=1490727&r2=1490728&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/pom.xml (original)
+++ webservices/wss4j/trunk/policy/pom.xml Fri Jun 7 17:03:39 2013
@@ -30,7 +30,6 @@
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-policy</artifactId>
<version>2.0-SNAPSHOT</version>
- <packaging>jar</packaging>
<name>Apache WSS4J WS-SecurityPolicy model</name>
<dependencies>
Modified: webservices/wss4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=1490728&r1=1490727&r2=1490728&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Fri Jun 7 17:03:39 2013
@@ -176,6 +176,11 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<dependencies>
Modified: webservices/wss4j/trunk/ws-security-common/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/pom.xml?rev=1490728&r1=1490727&r2=1490728&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-common/pom.xml Fri Jun 7 17:03:39 2013
@@ -29,10 +29,30 @@
</parent>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-common</artifactId>
- <packaging>bundle</packaging>
<name>Apache WSS4J WS-Security Common</name>
<version>2.0-SNAPSHOT</version>
+ <properties>
+ <!--
+ <wss4j.osgi.import>
+ !org.apache.wss4j.common.*,
+ javax.xml.crypto.*,
+ org.slf4j.*;version="[1.7,2)",
+ org.apache.xml.security.*;version="[2.0.0,3)",
+ org.bouncycastle.*;resolution:=optional,
+ org.apache.jcp.xml.dsig.internal.*,
+ org.opensaml.*;resolution:=optional;version="[2.5.0,3)",
+ net.sf.ehcache.*;resolution:=optional;version="2.5, 3.0.0)",
+ *;resolution:=optional
+ </wss4j.osgi.import>
+ <DynamicImport-Package>
+ org.bouncycastle.jce.provider,
+ org.apache.wss4j.components.crypto,
+ org.apache.wss4j.saml
+ </DynamicImport-Package>
+ -->
+ </properties>
+
<build>
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
<testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
@@ -67,43 +87,6 @@
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Implementation-Title>Apache WSS4J WS-Security Common</Implementation-Title>
- <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Specification-Title>Apache WSS4J WS-Security Common</Specification-Title>
- <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
- <Specification-Version>${project.version}</Specification-Version>
-
- <Export-Package>
- org.apache.wss4j.common.*;version="${project.version}"
- </Export-Package>
- <Import-Package>
- !org.apache.wss4j.common.*,
- javax.xml.crypto.*,
- org.slf4j.*;version="[1.7,2)",
- org.apache.xml.security.*;version="[2.0.0,3)",
- org.bouncycastle.*;resolution:=optional,
- org.apache.jcp.xml.dsig.internal.*,
- org.opensaml.*;resolution:=optional;version="[2.5.0,3)",
- net.sf.ehcache.*;resolution:=optional;version="2.5, 3.0.0)",
- *;resolution:=optional
- </Import-Package>
- <DynamicImport-Package>
- org.bouncycastle.jce.provider,
- org.apache.wss4j.components.crypto,
- org.apache.wss4j.saml
- </DynamicImport-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
@@ -224,6 +207,7 @@
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-kerberos-shared</artifactId>
<version>1.5.7</version>
+ <optional>true</optional>
<exclusions>
<exclusion>
<groupId>bouncycastle</groupId>
@@ -291,6 +275,7 @@
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
<scope>compile</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
Modified: webservices/wss4j/trunk/ws-security-dom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/pom.xml?rev=1490728&r1=1490727&r2=1490728&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-dom/pom.xml Fri Jun 7 17:03:39 2013
@@ -29,10 +29,27 @@
</parent>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-dom</artifactId>
- <packaging>bundle</packaging>
<name>Apache WSS4J DOM WS-Security</name>
<version>2.0-SNAPSHOT</version>
+ <properties>
+ <wss4j.osgi.dynamic.import>
+ org.bouncycastle.jce.provider
+ </wss4j.osgi.dynamic.import>
+ <!-- Import-Package>
+ !org.apache.wss4j.dom.*,
+ javax.xml.crypto.*,
+ org.slf4j.*;version="[1.7,2)",
+ org.apache.xml.security.*;version="[2.0.0,3]",
+ org.apache.wss4j.common.*;version="[2.0,3)",
+ org.bouncycastle.*;resolution:=optional,
+ org.apache.jcp.xml.dsig.internal.*,
+ org.opensaml.*;resolution:=optional;version="[2.5.0,3)",
+ *;resolution:=optional
+ </Import-Package-->
+
+ </properties>
+
<build>
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
<testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
@@ -67,41 +84,6 @@
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Implementation-Title>Apache WSS4J DOM WS-Security</Implementation-Title>
- <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Specification-Title>Apache WSS4J DOM WS-Security</Specification-Title>
- <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
- <Specification-Version>${project.version}</Specification-Version>
-
- <Export-Package>
- org.apache.wss4j.dom.*;version="${project.version}"
- </Export-Package>
- <Import-Package>
- !org.apache.wss4j.dom.*,
- javax.xml.crypto.*,
- org.slf4j.*;version="[1.7,2)",
- org.apache.xml.security.*;version="[2.0.0,3]",
- org.apache.wss4j.common.*;version="[2.0,3)",
- org.bouncycastle.*;resolution:=optional,
- org.apache.jcp.xml.dsig.internal.*,
- org.opensaml.*;resolution:=optional;version="[2.5.0,3)",
- *;resolution:=optional
- </Import-Package>
- <DynamicImport-Package>
- org.bouncycastle.jce.provider
- </DynamicImport-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
|