Author: sgoeschl
Date: Fri Jun 4 11:25:04 2010
New Revision: 951374
URL: http://svn.apache.org/viewvc?rev=951374&view=rev
Log:
Preparing the next release ...
Modified:
turbine/fulcrum/trunk/pbe/NOTICE.txt
turbine/fulcrum/trunk/pbe/pom.xml
turbine/fulcrum/trunk/pbe/src/java/org/apache/fulcrum/pbe/PBEService.java
turbine/fulcrum/trunk/pbe/src/test/TestComponentConfig.xml
turbine/fulcrum/trunk/pbe/src/test/org/apache/fulcrum/pbe/PBEServiceTest.java
Modified: turbine/fulcrum/trunk/pbe/NOTICE.txt
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pbe/NOTICE.txt?rev=951374&r1=951373&r2=951374&view=diff
==============================================================================
--- turbine/fulcrum/trunk/pbe/NOTICE.txt (original)
+++ turbine/fulcrum/trunk/pbe/NOTICE.txt Fri Jun 4 11:25:04 2010
@@ -1,5 +1,5 @@
Turbine Fulcrum ServiceManager
-Copyright 2002-2007 The Apache Software Foundation.
+Copyright 2002-2010 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: turbine/fulcrum/trunk/pbe/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pbe/pom.xml?rev=951374&r1=951373&r2=951374&view=diff
==============================================================================
--- turbine/fulcrum/trunk/pbe/pom.xml (original)
+++ turbine/fulcrum/trunk/pbe/pom.xml Fri Jun 4 11:25:04 2010
@@ -87,5 +87,25 @@
<sourceDirectory>${basedir}/src/java</sourceDirectory>
<testSourceDirectory>${basedir}/src/test</testSourceDirectory>
</build>
-
+
+ <profiles>
+ <profile>
+ <id>rc</id>
+ <distributionManagement>
+ <!-- Cannot define in parent ATM, see COMMONSSITE-26 -->
+ <site>
+ <id>apache.website</id>
+ <name>Apache Fulcrum Release Candidate Staging Site</name>
+
<url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/fulcrum/${fulcrum.componentid}/${fulcrum.release.version}/${fulcrum.rc.version}/site</url>
+ </site>
+ </distributionManagement>
+ </profile>
+ </profiles>
+
+ <properties>
+ <!-- This bits are used for the staging directory -->
+ <fulcrum.release.version>1.0.1</fulcrum.release.version>
+ <fulcrum.rc.version>RC1</fulcrum.rc.version>
+ </properties>
+
</project>
Modified:
turbine/fulcrum/trunk/pbe/src/java/org/apache/fulcrum/pbe/PBEService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pbe/src/java/org/apache/fulcrum/pbe/PBEService.java?rev=951374&r1=951373&r2=951374&view=diff
==============================================================================
--- turbine/fulcrum/trunk/pbe/src/java/org/apache/fulcrum/pbe/PBEService.java
(original)
+++ turbine/fulcrum/trunk/pbe/src/java/org/apache/fulcrum/pbe/PBEService.java
Fri Jun 4 11:25:04 2010
@@ -45,6 +45,7 @@ public interface PBEService
* Create a password based on the pre-defined seed.
*
* @return the password
+ * @throws Exception the password creation failed
*/
char[] createPassword()
throws Exception;
Modified: turbine/fulcrum/trunk/pbe/src/test/TestComponentConfig.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pbe/src/test/TestComponentConfig.xml?rev=951374&r1=951373&r2=951374&view=diff
==============================================================================
--- turbine/fulcrum/trunk/pbe/src/test/TestComponentConfig.xml (original)
+++ turbine/fulcrum/trunk/pbe/src/test/TestComponentConfig.xml Fri Jun 4
11:25:04 2010
@@ -19,6 +19,15 @@
-->
<componentConfig>
+
+ <!--
+
+ PBEService
+
+ cryptoSalt := the hex-encoded salt for PBE
+ cyrptoCount := the iteration for PBEParameterSpec for encryption/decryption
+ passwordCount := defines the number of SHA-1 invocations to create the
password
+ -->
<PBEService>
<cryptoSalt>4463657541544141</cryptoSalt>
<cyrptoCount>20</cyrptoCount>
Modified:
turbine/fulcrum/trunk/pbe/src/test/org/apache/fulcrum/pbe/PBEServiceTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pbe/src/test/org/apache/fulcrum/pbe/PBEServiceTest.java?rev=951374&r1=951373&r2=951374&view=diff
==============================================================================
---
turbine/fulcrum/trunk/pbe/src/test/org/apache/fulcrum/pbe/PBEServiceTest.java
(original)
+++
turbine/fulcrum/trunk/pbe/src/test/org/apache/fulcrum/pbe/PBEServiceTest.java
Fri Jun 4 11:25:04 2010
@@ -22,7 +22,6 @@ package org.apache.fulcrum.pbe;
import java.io.*;
import org.apache.fulcrum.testcontainer.BaseUnitTest;
-import org.apache.fulcrum.jce.crypto.CryptoUtil;
import org.apache.fulcrum.jce.crypto.StreamUtil;
/**
@@ -78,7 +77,7 @@ public class PBEServiceTest extends Base
/////////////////////////////////////////////////////////////////////////
/**
- * Create the default password do be used
+ * Create the default password do be used.
*/
public void testCreateDefaultPassword() throws Exception
{
@@ -129,8 +128,8 @@ public class PBEServiceTest extends Base
*/
public void testBinaryEncryptDecrypt() throws Exception
{
+ byte[] result;
byte[] source = new byte[256];
- byte[] result = null;
for( int i=0; i<source.length; i++ )
{
@@ -155,11 +154,14 @@ public class PBEServiceTest extends Base
}
}
+ /**
+ * Test encryption/decryption based on streams.
+ */
public void testStreamCiphers() throws Exception
{
+ byte[] cipherText;
+ String plainText;
String source = "Nobody knows the troubles I have seen ...";
- byte[] cipherText = null;
- String plainText = null;
char[] password = this.getPassword();
// encrypt using a CipherOutputStream
@@ -180,6 +182,9 @@ public class PBEServiceTest extends Base
assertEquals( source, plainText );
}
+ /**
+ * Test a few of the convinience methods.
+ */
public void testConvinienceEncryption() throws Exception
{
String plainText = "Nobody knows the troubles I have seen ...";
