Author: bblfish
Date: Wed Nov 10 21:59:50 2010
New Revision: 1033746
URL: http://svn.apache.org/viewvc?rev=1033746&view=rev
Log:
bouncycastle jar was missing due to a number of small errors in pom.
Removed:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ssl.keygen/base/src/main/resources/META-INF/components.txt
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ssl.keygen/base/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ssl.keygen/base/src/test/java/org/apache/clerezza/ssl/keygen/bouncy/CertificateServiceTest.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ssl.keygen/base/src/test/java/org/apache/clerezza/ssl/keygen/bouncy/DefaultRSAPubKeyTest.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ssl.keygen/base/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ssl.keygen/base/pom.xml?rev=1033746&r1=1033745&r2=1033746&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ssl.keygen/base/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ssl.keygen/base/pom.xml
Wed Nov 10 21:59:50 2010
@@ -1,111 +1,93 @@
+
<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.clerezza</groupId>
- <artifactId>org.apache.clerezza.ssl.keygen</artifactId>
- <version>0.5</version>
- </parent>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>org.apache.clerezza.ssl.keygen.base</artifactId>
- <packaging>bundle</packaging>
- <name>FOAF+SSL Keygen :: Base Component</name>
- <build>
- <!--filters>
- <filter>src/main/resources/library.properties</filter>
- </filters>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources-->
- <plugins>
- <plugin>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.ssl.keygen</artifactId>
+ <version>0.5</version>
+ </parent>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.ssl.keygen.base</artifactId>
+ <packaging>bundle</packaging>
+ <name>FOAF+SSL Keygen :: Base Component</name>
+ <build>
+ <plugins>
+ <plugin>
<!-- this plugin is needed because bouncycastle is not
available
as an OSGI module -->
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <version>2.1.0</version>
- <configuration>
- <instructions>
-
<Embed-Dependency>bcprov-jdk16;inline=false</Embed-Dependency>
-
<!--Export-Package>org.bouncycastle.*</Export-Package-->
- <!--Embed-Transitive>true</Embed-Transitive-->
-
<Service-Component>OSGI-INF/serviceComponents.xml</Service-Component>
-
<Import-Package>!junit.framework,!junit.textui,*</Import-Package>
-
<Export-Package>!junit,org.jsslutils.keygen.*</Export-Package>
-
<!--Bundle-SymbolicName>org.apache.clerezza.foafssl</Bundle-SymbolicName-->
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <version>2.1.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-scr-scrdescriptor</id>
- <goals>
- <goal>scr</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+
<Embed-Dependency>bcprov-jdk16;inline=false</Embed-Dependency>
+
<Import-Package>!junit.framework,!junit.textui,*</Import-Package>
+
<Export-Package>!junit,org.apache.clerezza.ssl.keygen.*</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ <executions>
+ <execution>
+
<id>generate-scr-scrdescriptor</id>
+ <goals>
+ <goal>scr</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk16</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>1.4.0</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+
<artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk16</artifactId>
+ <version>1.45</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr</artifactId>
+ <version>1.4.0</version>
+ </dependency>
+ </dependencies>
</project>
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ssl.keygen/base/src/test/java/org/apache/clerezza/ssl/keygen/bouncy/CertificateServiceTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ssl.keygen/base/src/test/java/org/apache/clerezza/ssl/keygen/bouncy/CertificateServiceTest.java?rev=1033746&r1=1033745&r2=1033746&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ssl.keygen/base/src/test/java/org/apache/clerezza/ssl/keygen/bouncy/CertificateServiceTest.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ssl.keygen/base/src/test/java/org/apache/clerezza/ssl/keygen/bouncy/CertificateServiceTest.java
Wed Nov 10 21:59:50 2010
@@ -32,7 +32,6 @@
package org.apache.clerezza.ssl.keygen.bouncy;
-import org.apache.clerezza.ssl.keygen.bouncy.BouncyKeygenService;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.security.cert.CertificateFactory;
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ssl.keygen/base/src/test/java/org/apache/clerezza/ssl/keygen/bouncy/DefaultRSAPubKeyTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ssl.keygen/base/src/test/java/org/apache/clerezza/ssl/keygen/bouncy/DefaultRSAPubKeyTest.java?rev=1033746&r1=1033745&r2=1033746&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ssl.keygen/base/src/test/java/org/apache/clerezza/ssl/keygen/bouncy/DefaultRSAPubKeyTest.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ssl.keygen/base/src/test/java/org/apache/clerezza/ssl/keygen/bouncy/DefaultRSAPubKeyTest.java
Wed Nov 10 21:59:50 2010
@@ -32,7 +32,6 @@
package org.apache.clerezza.ssl.keygen.bouncy;
-import org.apache.clerezza.ssl.keygen.bouncy.DefaultRSAPubKey;
import junit.framework.TestCase;
import java.io.BufferedReader;
