minor cleanups
git-svn-id: https://svn.apache.org/repos/asf/geronimo/components/jaspi/trunk@774134 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/geronimo-jaspi-openid/pom.xml b/geronimo-jaspi-openid/pom.xml
index b32180c..16bdcdb 100644
--- a/geronimo-jaspi-openid/pom.xml
+++ b/geronimo-jaspi-openid/pom.xml
@@ -20,42 +20,45 @@
<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>
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-jaspi-parent</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>geronimo-jaspi-openid</artifactId>
- <name>geronimo-jaspi-openid</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaspi_1.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.openid4java</groupId>
- <artifactId>openid4java-consumer</artifactId>
- <version>0.9.5-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <version>1.0-EA-SNAPSHOT</version>
- </dependency>
+ <artifactId>geronimo-jaspi-openid</artifactId>
+ <packaging>bundle</packaging>
+ <name>geronimo-jaspi-openid</name>
+ <description>Geronimo openid JASPI module implementation openid4java.</description>
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-jaspi</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaspi_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java-consumer</artifactId>
+ <version>0.9.5-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <version>1.0-EA-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-jaspi</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/geronimo-jaspi/pom.xml b/geronimo-jaspi/pom.xml
index 4daf175..0d79659 100644
--- a/geronimo-jaspi/pom.xml
+++ b/geronimo-jaspi/pom.xml
@@ -31,18 +31,9 @@
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-jaspi</artifactId>
<version>1.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
<name>Geronimo JASPI implementation</name>
-
-
- <properties>
-
- <!-- OSGi properties -->
- <geronimo.jaspi.osgi.export>${geronimo.jaspi.osgi.export.pkg}*;version=${version}</geronimo.jaspi.osgi.export>
- <geronimo.jaspi.osgi.export.pkg/>
- <geronimo.jaspi.osgi.import.pkg/>
- <geronimo.jaspi.osgi.private.pkg/>
- </properties>
-
+ <description>Geronimo JASPI implementation using jaxb/sxc for simple xml persistence.</description>
<dependencies>
<dependency>
@@ -128,30 +119,6 @@
<!--</executions>-->
<!--</plugin>-->
- <!--
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
- <extensions>true</extensions>
- <executions>
- <execution>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Export-Package>${geronimo.jaspi.osgi.export}</Export-Package>
- <Import-Package>${geronimo.jaspi.osgi.import.pkg}*</Import-Package>
- <Private-Package>${geronimo.jaspi.osgi.private.pkg}</Private-Package>
- </instructions>
- <unpackBundle>true</unpackBundle>
- </configuration>
- </plugin>
- -->
<!--<plugin>-->
<!--<groupId>org.jvnet.jaxb2.maven2</groupId>-->
<!--<artifactId>maven-jaxb2-plugin</artifactId>-->
diff --git a/pom.xml b/pom.xml
index 05a3d98..57cea3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,11 +51,6 @@
-->
<version>1.0-SNAPSHOT</version>
- <!-- OSGi properties -->
- <geronimo.jaspi.osgi.export>${geronimo.jaspi.osgi.export.pkg}*;version=${version}</geronimo.jaspi.osgi.export>
- <geronimo.jaspi.osgi.export.pkg/>
- <geronimo.jaspi.osgi.import.pkg/>
- <geronimo.jaspi.osgi.private.pkg/>
</properties>
<modules>
@@ -210,38 +205,38 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <version>1.0-alpha-1</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
<!--<plugin>-->
- <!--<groupId>com.envoisolutions.sxc</groupId>-->
- <!--<artifactId>sxc-jaxb-maven-plugin</artifactId>-->
- <!--<version>0.8-SNAPSHOT</version>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<configuration>-->
- <!--<classes>-->
- <!--<class>org.apache.geronimo.components.jaspi.model</class>-->
- <!--</classes>-->
- <!--</configuration>-->
- <!--<goals>-->
- <!--<goal>generate</goal>-->
- <!--</goals>-->
- <!--</execution>-->
- <!--</executions>-->
+ <!--<groupId>com.envoisolutions.sxc</groupId>-->
+ <!--<artifactId>sxc-jaxb-maven-plugin</artifactId>-->
+ <!--<version>0.8-SNAPSHOT</version>-->
+ <!--<executions>-->
+ <!--<execution>-->
+ <!--<configuration>-->
+ <!--<classes>-->
+ <!--<class>org.apache.geronimo.components.jaspi.model</class>-->
+ <!--</classes>-->
+ <!--</configuration>-->
+ <!--<goals>-->
+ <!--<goal>generate</goal>-->
+ <!--</goals>-->
+ <!--</execution>-->
+ <!--</executions>-->
<!--</plugin>-->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
@@ -271,47 +266,17 @@
<target>1.5</target>
</configuration>
</plugin>
- <!--
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.0</version>
- <extensions>true</extensions>
- <executions>
- <execution>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Export-Package>${geronimo.jaspi.osgi.export}</Export-Package>
- <Import-Package>${geronimo.jaspi.osgi.import.pkg}*</Import-Package>
- <Private-Package>${geronimo.jaspi.osgi.private.pkg}</Private-Package>
- </instructions>
- <unpackBundle>true</unpackBundle>
- </configuration>
- </plugin>
- -->
- <!--<plugin>-->
- <!--<groupId>org.jvnet.jaxb2.maven2</groupId>-->
- <!--<artifactId>maven-jaxb2-plugin</artifactId>-->
- <!--<version>0.5</version>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<goals>-->
- <!--<goal>generate</goal>-->
- <!--</goals>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--<configuration>-->
- <!--<schemaDirectory>src/main/xsd</schemaDirectory>-->
- <!--<packageName>org.apache.geronimo.components.jaspi.model</packageName>-->
- <!--<extension>true</extension>-->
- <!--</configuration>-->
- <!--</plugin>-->
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.0.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-DocURL>http://geronimo.apache.org</Bundle-DocURL>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
