You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by tv...@apache.org on 2007/05/05 08:58:51 UTC
svn commit: r535465 [5/49] - in /jakarta/turbine/fulcrum/trunk: ./ bsf/
bsf/src/java/org/apache/fulcrum/bsf/ bsf/src/test/ bsf/xdocs/ cache/
cache/src/java/org/apache/fulcrum/cache/
cache/src/java/org/apache/fulcrum/cache/impl/ cache/src/test/ cache/sr...
Modified: jakarta/turbine/fulcrum/trunk/crypto/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/crypto/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/crypto/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/crypto/project.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project>
@@ -15,25 +33,25 @@
</version>
</versions>
<dependencies>
-
+
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.3.3</version>
<url>http://java.sun.com/products/javamail/</url>
</dependency>
-
+
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.3</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>cryptix</groupId>
<artifactId>cryptix</artifactId>
<version>3.2.0</version>
- </dependency>
+ </dependency>
<!-- Needed only for testing -->
<dependency>
@@ -41,7 +59,7 @@
<artifactId>fulcrum-testcontainer</artifactId>
<version>1.0.5</version>
</dependency>
-
+
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
Modified: jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/CryptoAlgorithm.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/CryptoAlgorithm.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/CryptoAlgorithm.java (original)
+++ jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/CryptoAlgorithm.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -46,13 +49,13 @@
void setSeed(String salt);
/**
- * Performs the actual encryption.
+ * Performs the actual encryption.
*
* @param value The value to be encrypted
*
* @return The encrypted value
*
- * @throws Exception various errors from the underlying ciphers.
+ * @throws Exception various errors from the underlying ciphers.
* The caller should catch them and report accordingly.
*
*/
@@ -64,7 +67,7 @@
* Algorithms that perform multiple ciphers get told
* with setCipher, which cipher to use. This should be
* called before any other method call.
- *
+ *
* If called after any call to encrypt or setSeed, the
* CryptoAlgorithm may choose to ignore this or to reset
* and use the new cipher.
Modified: jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/CryptoService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/CryptoService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/CryptoService.java (original)
+++ jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/CryptoService.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
Modified: jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/DefaultCryptoService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/DefaultCryptoService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/DefaultCryptoService.java (original)
+++ jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/DefaultCryptoService.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.crypto;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.security.NoSuchAlgorithmException;
@@ -51,7 +54,7 @@
/** Default Key */
private static final String DEFAULT_KEY = "default";
/** Default Encryption Class */
- private static final String DEFAULT_CLASS =
+ private static final String DEFAULT_CLASS =
"org.apache.fulcrum.crypto.provider.JavaCrypt";
private boolean disposed = false;
/** Names of the registered algorithms and the wanted classes */
@@ -68,7 +71,7 @@
* @throws NoSuchAlgorithmException Requested algorithm is not available
*
*/
- public CryptoAlgorithm getCryptoAlgorithm( String algo )
+ public CryptoAlgorithm getCryptoAlgorithm( String algo )
throws NoSuchAlgorithmException
{
String cryptoClass = (String) algos.get(algo);
@@ -84,7 +87,7 @@
}
try
{
- //@todo should be created via factory service.
+ //@todo should be created via factory service.
//Just trying to get something to work.
//ca = (CryptoAlgorithm) factoryService.getInstance(cryptoClass);
ca = (CryptoAlgorithm) Class.forName(cryptoClass).newInstance();
@@ -92,7 +95,7 @@
catch (Exception e)
{
throw new NoSuchAlgorithmException(
- "TurbineCryptoService: Error instantiating "
+ "TurbineCryptoService: Error instantiating "
+ cryptoClass + " for " + algo);
}
ca.setCipher(algo);
@@ -118,22 +121,22 @@
{
String key = nameVal[i].getName();
String val = nameVal[i].getValue();
- // getLogger.debug("Registered " + val
+ // getLogger.debug("Registered " + val
// + " for Crypto Algorithm " + key);
algos.put(key, val);
}
}
}
-
+
/**
* @see org.apache.avalon.framework.activity.Initializable#initialize()
*/
public void initialize()
throws Exception
{
- getLogger().debug("initialize()");
+ getLogger().debug("initialize()");
}
-
+
/**
* Avalon component lifecycle method
*/
@@ -141,5 +144,5 @@
{
disposed = true;
}
-
+
}
Modified: jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/package.html
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/package.html?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/package.html (original)
+++ jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/package.html Fri May 4 23:58:06 2007
@@ -1,3 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<html>
<head>
<!-- head part is ignored -->
Modified: jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/ClearCrypt.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/ClearCrypt.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/ClearCrypt.java (original)
+++ jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/ClearCrypt.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -23,16 +26,16 @@
/**
* This is a dummy for "cleartext" encryption. It goes through
* the notions of the CryptoAlgorithm interface but actually does
- * nothing. It can be used as a replacement for the "encrypt = no"
+ * nothing. It can be used as a replacement for the "encrypt = no"
* setting in TurbineResources.
*
- * Can be used as the default crypto algorithm
+ * Can be used as the default crypto algorithm
*
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @version $Id$
*/
-public class ClearCrypt
+public class ClearCrypt
implements CryptoAlgorithm
{
/**
@@ -83,7 +86,7 @@
throws Exception
{
/*
- * Ultra-clever implementation. ;-)
+ * Ultra-clever implementation. ;-)
*/
return value;
Modified: jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/JavaCrypt.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/JavaCrypt.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/JavaCrypt.java (original)
+++ jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/JavaCrypt.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -26,15 +29,15 @@
/**
* Implements the normal java.security.MessageDigest stream cipers.
- * Base64 strings returned by this provider are correctly padded to
+ * Base64 strings returned by this provider are correctly padded to
* multiples of four bytes. If you run into interoperability problems
- * with other languages, especially perl and the Digest::MD5 module,
+ * with other languages, especially perl and the Digest::MD5 module,
* note that the md5_base64 function from this package incorrectly drops
* the pad bytes. Use the MIME::Base64 package instead.
*
* If you upgrade from Turbine 2.1 and suddently your old stored passwords
- * no longer work, please take a look at the OldJavaCrypt provider for
- * bug-to-bug compatibility.
+ * no longer work, please take a look at the OldJavaCrypt provider for
+ * bug-to-bug compatibility.
*
* This provider can be used as the default crypto algorithm provider.
*
@@ -42,7 +45,7 @@
* @version $Id$
*/
-public class JavaCrypt
+public class JavaCrypt
implements CryptoAlgorithm
{
@@ -117,4 +120,4 @@
return (encodedDigest == null ? null :
new String(encodedDigest));
}
-}
+}
Modified: jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/OldJavaCrypt.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/OldJavaCrypt.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/OldJavaCrypt.java (original)
+++ jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/OldJavaCrypt.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -36,14 +39,14 @@
* your databases, use this provider. It is bug-compatible.
*
* DO NOT USE THIS PROVIDER FOR ANY NEW APPLICATION!
- *
+ *
* Nevertheless it can be used as the default crypto algorithm .
*
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @version $Id$
*/
-public class OldJavaCrypt
+public class OldJavaCrypt
implements CryptoAlgorithm
{
@@ -113,7 +116,7 @@
// default encoding. Thanks to SGawin for spotting this.
byte[] digest = md.digest(value.getBytes("UTF-8"));
- ByteArrayOutputStream bas =
+ ByteArrayOutputStream bas =
new ByteArrayOutputStream(digest.length + digest.length / 3 + 1);
OutputStream encodedStream = MimeUtility.encode(bas, "base64");
encodedStream.write(digest);
Modified: jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/UnixCrypt.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/UnixCrypt.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/UnixCrypt.java (original)
+++ jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/UnixCrypt.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -52,7 +55,7 @@
/**
* This class never uses anything but
* UnixCrypt, so it is just a dummy
- * (Fixme: Should we throw an exception if
+ * (Fixme: Should we throw an exception if
* something is requested that we don't support?
*
* @param cipher Cipher (ignored)
@@ -95,9 +98,9 @@
int numSaltChars = SALT_CHARS.length;
seed = (new StringBuffer())
- .append(SALT_CHARS[Math.abs(randomGenerator.nextInt())
+ .append(SALT_CHARS[Math.abs(randomGenerator.nextInt())
% numSaltChars])
- .append(SALT_CHARS[Math.abs(randomGenerator.nextInt())
+ .append(SALT_CHARS[Math.abs(randomGenerator.nextInt())
% numSaltChars])
.toString();
}
Modified: jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/package.html
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/package.html?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/package.html (original)
+++ jakarta/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/package.html Fri May 4 23:58:06 2007
@@ -1,3 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<html>
<head>
<!-- head part is ignored -->
Modified: jakarta/turbine/fulcrum/trunk/crypto/src/test/TestComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/crypto/src/test/TestComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/crypto/src/test/TestComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/crypto/src/test/TestComponentConfig.xml Fri May 4 23:58:06 2007
@@ -1,10 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<componentConfig>
<crypto>
<algorithm>
<unix>org.apache.fulcrum.crypto.provider.UnixCrypt</unix>
<clear>org.apache.fulcrum.crypto.provider.ClearCrypt</clear>
- <java>org.apache.fulcrum.crypto.provider.JavaCrypt</java>
- <oldjava>org.apache.fulcrum.crypto.provider.OldJavaCrypt</oldjava>
+ <java>org.apache.fulcrum.crypto.provider.JavaCrypt</java>
+ <oldjava>org.apache.fulcrum.crypto.provider.OldJavaCrypt</oldjava>
</algorithm>
</crypto>
-</componentConfig>
\ No newline at end of file
+</componentConfig>
Modified: jakarta/turbine/fulcrum/trunk/crypto/src/test/TestRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/crypto/src/test/TestRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/crypto/src/test/TestRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/crypto/src/test/TestRoleConfig.xml Fri May 4 23:58:06 2007
@@ -1,7 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!-- This configuration file for Avalon components is used for testing the TestComponent -->
<role-list>
<role
name="org.apache.fulcrum.crypto.CryptoService"
shorthand="crypto"
default-class="org.apache.fulcrum.crypto.DefaultCryptoService"/>
-</role-list>
\ No newline at end of file
+</role-list>
Modified: jakarta/turbine/fulcrum/trunk/crypto/src/test/org/apache/fulcrum/crypto/CryptoServiceTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/crypto/src/test/org/apache/fulcrum/crypto/CryptoServiceTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/crypto/src/test/org/apache/fulcrum/crypto/CryptoServiceTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/crypto/src/test/org/apache/fulcrum/crypto/CryptoServiceTest.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.crypto;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -46,64 +49,64 @@
{
super.setUp();
sc = (CryptoService) this.lookup( CryptoService.ROLE );
-
+
}
public void testUnixCrypt() throws Exception
{
String preDefinedSeed = "z5";
String preDefinedResult = "z5EQaXpuu059c";
-
+
CryptoAlgorithm ca = sc.getCryptoAlgorithm("unix");
/*
- * Test predefined Seed
- */
+ * Test predefined Seed
+ */
ca.setSeed(preDefinedSeed);
String output = ca.encrypt(preDefinedInput);
assertEquals("Encryption failed ", preDefinedResult, output);
/*
- * Test random Seed
- *
- */
+ * Test random Seed
+ *
+ */
ca.setSeed(null);
String result = ca.encrypt(preDefinedInput);
ca.setSeed(result);
output = ca.encrypt(preDefinedInput);
assertEquals("Encryption failed ", output, result);
-
-
-
+
+
+
}
public void testClearCrypt() throws Exception
{
String preDefinedResult = "Oeltanks";
-
+
CryptoAlgorithm ca = sc.getCryptoAlgorithm("clear");
String output = ca.encrypt(preDefinedInput);
assertEquals("Encryption failed ", preDefinedResult, output);
-
+
}
public void testOldJavaCryptMd5() throws Exception
{
String preDefinedResult = "XSop0mncK19Ii2r2CUe2";
-
+
CryptoAlgorithm ca = sc.getCryptoAlgorithm("oldjava");
ca.setCipher("MD5");
String output = ca.encrypt(preDefinedInput);
assertEquals("MD5 Encryption failed ", preDefinedResult, output);
-
+
}
public void testOldJavaCryptSha1() throws Exception
{
String preDefinedResult = "uVDiJHaavRYX8oWt5ctkaa7j";
-
+
CryptoAlgorithm ca = sc.getCryptoAlgorithm("oldjava");
ca.setCipher("SHA1");
String output = ca.encrypt(preDefinedInput);
assertEquals("SHA1 Encryption failed ", preDefinedResult, output);
-
+
}
public void testJavaCryptMd5() throws Exception
{
Modified: jakarta/turbine/fulcrum/trunk/crypto/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/crypto/xdocs/changes.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/crypto/xdocs/changes.xml (original)
+++ jakarta/turbine/fulcrum/trunk/crypto/xdocs/changes.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<document>
<properties>
<title>Fulcrum Crypto</title>
@@ -9,27 +27,27 @@
<release version="1.0.6-dev" date="as in SVN">
<action dev="sgoeschl" type="update">
Upgrading to javamail-1.3.2
- </action>
- </release>
+ </action>
+ </release>
<release version="1.0.5" date="2004-11-24">
<action dev="epugh" type="update" due-to="Kostyantyn Shchekotykhin">
Merge api and impl jars into one project.
- </action>
+ </action>
<action dev="epugh" type="update">
Add ECM based tests.
- </action>
+ </action>
<action dev="epugh" type="update" due-to="Youngho Cho">
Update to use commons-codec-1.3
- </action>
- </release>
+ </action>
+ </release>
<release version="1.0.4" date="">
<action dev="epugh" type="update">
Update to use Merlin 3.3.0
- </action>
+ </action>
<action dev="epugh" type="add">
Implementing the merlinized code.
</action>
- </release>
+ </release>
<release version="1.0-alpha-3" date="11-18-2003">
<action dev="epugh" type="add">
Integrated howto documentation on main page.
Modified: jakarta/turbine/fulcrum/trunk/crypto/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/crypto/xdocs/index.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/crypto/xdocs/index.xml (original)
+++ jakarta/turbine/fulcrum/trunk/crypto/xdocs/index.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<document>
@@ -15,13 +33,13 @@
algorithms provided by the normal Java crypto providers and 3rd party
providers such as <a href="http://www.cryptix.org/">Cryptix</a>.
</p>
-
+
<p>
- It is written for use in Turbine but it can be used in any container compatible
+ It is written for use in Turbine but it can be used in any container compatible
with Avalon's ECM container.
- </p>
+ </p>
</section>
-
+
<section name="Configuration">
<p>
@@ -48,16 +66,16 @@
<algorithm>
<unix>org.apache.fulcrum.crypto.provider.UnixCrypt</unix>
<clear>org.apache.fulcrum.crypto.provider.ClearCrypt</clear>
- <java>org.apache.fulcrum.crypto.provider.JavaCrypt</java>
- <oldjava>org.apache.fulcrum.crypto.provider.OldJavaCrypt</oldjava>
-
+ <java>org.apache.fulcrum.crypto.provider.JavaCrypt</java>
+ <oldjava>org.apache.fulcrum.crypto.provider.OldJavaCrypt</oldjava>
+
</algorithm>
</crypto>
]]>
</source>
</section>
-
+
<section name="Usage">
<p>
@@ -84,7 +102,7 @@
]]></source>
<p>
-To see an example, look at the test case
+To see an example, look at the test case
<a href="xref-test/org/apache/fulcrum/crypto/CryptoServiceTest.html">CryptoServiceTest</a>.
</p>
@@ -109,7 +127,7 @@
don't set the Cipher of this class explicitly, then SHA is used.
</p>
- </section>
+ </section>
<section name="Included Providers">
<p>The following algorithm providers are included in the Cryptoservice:</p>
@@ -130,7 +148,7 @@
href="http://www.cryptix.org/">Cryptix</a>.
</li>
<li>
- <b>JavaCrypt</b> (org.apache.fulcrum.crypto.provider.JavaCrypt). This is the
+ <b>JavaCrypt</b> (org.apache.fulcrum.crypto.provider.JavaCrypt). This is the
default crypto provider. It implements the normal Java MessageDigest ciphers
You need not to have this, it is the default if no algorithms are given. The default
provider gives you all the Java MessageDigest Ciphers including MD5, and SHA1.
Modified: jakarta/turbine/fulcrum/trunk/crypto/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/crypto/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/crypto/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/crypto/xdocs/navigation.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project
name="Crypto"
href="http://jakarta.apache.org/turbine/fulcrum/crypto/">
@@ -15,4 +33,4 @@
<item name="Main" href="/index.html"/>
</menu>
</body>
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/turbine/fulcrum/trunk/dvsl/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/dvsl/maven.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/dvsl/maven.xml (original)
+++ jakarta/turbine/fulcrum/trunk/dvsl/maven.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/turbine/fulcrum/trunk/dvsl/project.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/dvsl/project.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/dvsl/project.properties (original)
+++ jakarta/turbine/fulcrum/trunk/dvsl/project.properties Fri May 4 23:58:06 2007
@@ -1,2 +1,18 @@
-#Help debug failing tests.
-maven.junit.usefile=false
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# Help debug failing tests.
+maven.junit.usefile=false
Modified: jakarta/turbine/fulcrum/trunk/dvsl/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/dvsl/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/dvsl/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/dvsl/project.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project>
@@ -22,7 +40,7 @@
<version>3.1</version>
<url>http://jakarta.apache.org/commons/collections.html</url>
</dependency>
-
+
<dependency>
<groupId>dom4j</groupId>
@@ -33,46 +51,46 @@
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.1-beta-6</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.4</version>
</dependency>
-
+
<dependency>
<groupId>velocity-dvsl</groupId>
<artifactId>velocity-dvsl</artifactId>
<version>0.45</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.8</version>
<url>http://jakarta.apache.org/log4j/</url>
- </dependency>
-
+ </dependency>
+
<!-- Needed only for testing -->
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
<version>1.0.5</version>
</dependency>
-
+
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.4</version>
</dependency>
-
+
<!-- Needed for Gump -->
<dependency>
<groupId>avalon-logkit</groupId>
<artifactId>avalon-logkit</artifactId>
<version>2.1</version>
<url>http://avalon.apache.org</url>
- </dependency>
+ </dependency>
</dependencies>
Modified: jakarta/turbine/fulcrum/trunk/dvsl/src/java/org/apache/fulcrum/dvsl/DefaultDvslService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/dvsl/src/java/org/apache/fulcrum/dvsl/DefaultDvslService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/dvsl/src/java/org/apache/fulcrum/dvsl/DefaultDvslService.java (original)
+++ jakarta/turbine/fulcrum/trunk/dvsl/src/java/org/apache/fulcrum/dvsl/DefaultDvslService.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.io.Reader;
@@ -78,7 +81,7 @@
{
servicePool.remove( styleName );
}
-
+
/**
* Execute an DVSLT
*/
@@ -97,7 +100,7 @@
*/
public void initialize()
{
-
+
}
}
Modified: jakarta/turbine/fulcrum/trunk/dvsl/src/java/org/apache/fulcrum/dvsl/DvslService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/dvsl/src/java/org/apache/fulcrum/dvsl/DvslService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/dvsl/src/java/org/apache/fulcrum/dvsl/DvslService.java (original)
+++ jakarta/turbine/fulcrum/trunk/dvsl/src/java/org/apache/fulcrum/dvsl/DvslService.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -25,7 +28,7 @@
/**
* The Fulcrum DVSL Service is used to transform XML with a DVSL stylesheet.
- * The service makes use of the DVSL engine available from the
+ * The service makes use of the DVSL engine available from the
* Jakarta Velocity project.
*
* @author <a href="mailto:geirm@apache.org">Geir Magnusson Jr.</a>
@@ -40,13 +43,13 @@
/**
* Registers a stylesheet by name
*/
- public void register( String styleName, Reader stylesheet, Properties toolbox)
+ public void register( String styleName, Reader stylesheet, Properties toolbox)
throws Exception;
/**
* Unregisters a stylesheet by name
*/
- public void unregister( String styleName )
+ public void unregister( String styleName )
throws Exception;
/**
@@ -57,6 +60,6 @@
* @param in The reader that passes the xml to be transformed
* @param out The writer for the transformed output
*/
- public void transform ( String styleName, Reader in, Writer out)
+ public void transform ( String styleName, Reader in, Writer out)
throws Exception;
}
Modified: jakarta/turbine/fulcrum/trunk/dvsl/src/test/TestComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/dvsl/src/test/TestComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/dvsl/src/test/TestComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/dvsl/src/test/TestComponentConfig.xml Fri May 4 23:58:06 2007
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<componentConfig>
<dvsl/>
-</componentConfig>
\ No newline at end of file
+</componentConfig>
Modified: jakarta/turbine/fulcrum/trunk/dvsl/src/test/TestRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/dvsl/src/test/TestRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/dvsl/src/test/TestRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/dvsl/src/test/TestRoleConfig.xml Fri May 4 23:58:06 2007
@@ -1,7 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!-- This configuration file for Avalon components is used for testing the TestComponent -->
<role-list>
<role
name="org.apache.fulcrum.dvsl.DvslService"
shorthand="dvsl"
default-class="org.apache.fulcrum.dvsl.DefaultDvslService"/>
-</role-list>
\ No newline at end of file
+</role-list>
Modified: jakarta/turbine/fulcrum/trunk/dvsl/src/test/org/apache/fulcrum/dvsl/DvslBasicTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/dvsl/src/test/org/apache/fulcrum/dvsl/DvslBasicTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/dvsl/src/test/org/apache/fulcrum/dvsl/DvslBasicTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/dvsl/src/test/org/apache/fulcrum/dvsl/DvslBasicTest.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.dvsl;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -29,7 +32,7 @@
{
private String dvsl = "#match(\"element\")Hello from element! $node.value()#end";
private String input = "<?xml version=\"1.0\"?><document><element>Foo</element></document>";
-
+
private DvslService dvslService = null;
public DvslBasicTest(String name)
{
@@ -45,7 +48,7 @@
}
catch (Throwable e)
{
-
+
fail(e.getMessage());
}
}
@@ -62,6 +65,6 @@
StringWriter sw = new StringWriter();
dvslService.transform("style", new StringReader(input), sw);
assertEquals("Hello from element! Foo",sw.toString());
-
+
}
}
Modified: jakarta/turbine/fulcrum/trunk/dvsl/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/dvsl/xdocs/changes.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/dvsl/xdocs/changes.xml (original)
+++ jakarta/turbine/fulcrum/trunk/dvsl/xdocs/changes.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<document>
<properties>
<title>Fulcrum DVSL</title>
@@ -9,7 +27,7 @@
<release version="1.0.5" date="2004-11-24">
<action dev="epugh" type="update" due-to="Kostyantyn Shchekotykhin">
Merge api and impl jars into one project.
- </action>
+ </action>
<action dev="epugh" type="update">
Update to use Merlin 3.3.0
</action>
Modified: jakarta/turbine/fulcrum/trunk/dvsl/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/dvsl/xdocs/index.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/dvsl/xdocs/index.xml (original)
+++ jakarta/turbine/fulcrum/trunk/dvsl/xdocs/index.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<document>
@@ -11,12 +29,12 @@
<section name="Overview">
<p>
- This component wraps provides XSL using Velocity DVSL of strings. It is written
- for use in Turbine but it can be used in any container compatible
+ This component wraps provides XSL using Velocity DVSL of strings. It is written
+ for use in Turbine but it can be used in any container compatible
with Avalon's ECM container.
- </p>
+ </p>
</section>
-
+
<section name="Configuration">
<p>
Modified: jakarta/turbine/fulcrum/trunk/dvsl/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/dvsl/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/dvsl/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/dvsl/xdocs/navigation.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project
name="localization"
href="http://jakarta.apache.org/turbine/fulcrum/dvsl/">
@@ -15,4 +33,4 @@
<item name="Main" href="/index.html"/>
</menu>
</body>
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/turbine/fulcrum/trunk/factory/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/factory/maven.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/factory/maven.xml (original)
+++ jakarta/turbine/fulcrum/trunk/factory/maven.xml Fri May 4 23:58:06 2007
@@ -1,7 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
<!--preGoal name="java:compile">
<attainGoal name="avalon:meta"/>
</preGoal-->
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/turbine/fulcrum/trunk/factory/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/factory/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/factory/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/factory/project.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project>
<extend>${basedir}/../project.xml</extend>
<id>fulcrum-factory</id>
@@ -12,20 +30,20 @@
</version>
</versions>
<dependencies>
-
+
<!-- Needed only for testing -->
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
<version>1.0.5</version>
</dependency>
-
+
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.4</version>
- </dependency>
-
+ </dependency>
+
</dependencies>
</project>
Modified: jakarta/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/DefaultFactoryService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/DefaultFactoryService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/DefaultFactoryService.java (original)
+++ jakarta/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/DefaultFactoryService.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.factory;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.io.ByteArrayInputStream;
@@ -48,7 +51,7 @@
implements FactoryService, Configurable, Initializable
{
protected boolean initialized = false;
- //private boolean disposed = false;
+ //private boolean disposed = false;
/**
* The property specifying a set of additional class loaders.
*/
Modified: jakarta/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/Factory.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/Factory.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/Factory.java (original)
+++ jakarta/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/Factory.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
Modified: jakarta/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/FactoryException.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/FactoryException.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/FactoryException.java (original)
+++ jakarta/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/FactoryException.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.factory;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
/**
Modified: jakarta/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/FactoryService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/FactoryService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/FactoryService.java (original)
+++ jakarta/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/FactoryService.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
Modified: jakarta/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/utils/ObjectInputStreamForContext.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/utils/ObjectInputStreamForContext.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/utils/ObjectInputStreamForContext.java (original)
+++ jakarta/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/utils/ObjectInputStreamForContext.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
Modified: jakarta/turbine/fulcrum/trunk/factory/src/test/TestComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/factory/src/test/TestComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/factory/src/test/TestComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/factory/src/test/TestComponentConfig.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<componentConfig>
- <factory/>
-</componentConfig>
\ No newline at end of file
+ <factory/>
+</componentConfig>
Modified: jakarta/turbine/fulcrum/trunk/factory/src/test/TestRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/factory/src/test/TestRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/factory/src/test/TestRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/factory/src/test/TestRoleConfig.xml Fri May 4 23:58:06 2007
@@ -1,9 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!-- This configuration file for Avalon components is used for testing the TestComponent -->
<role-list>
<role
name="org.apache.fulcrum.factory.FactoryService"
shorthand="factory"
- default-class="org.apache.fulcrum.factory.DefaultFactoryService"/>
-
-
-</role-list>
\ No newline at end of file
+ default-class="org.apache.fulcrum.factory.DefaultFactoryService"/>
+
+
+</role-list>
Modified: jakarta/turbine/fulcrum/trunk/factory/src/test/org/apache/fulcrum/factory/FactoryServiceTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/factory/src/test/org/apache/fulcrum/factory/FactoryServiceTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/factory/src/test/org/apache/fulcrum/factory/FactoryServiceTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/factory/src/test/org/apache/fulcrum/factory/FactoryServiceTest.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.factory;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -44,7 +47,7 @@
{
super.setUp();
factoryService = (FactoryService) this.resolve( FactoryService.class.getName() );
-
+
}
/*
* Class to test for Object getInstance(String)
@@ -75,7 +78,7 @@
Object object = factoryService.getInstance("java.lang.StringBuffer", params, signature);
assertTrue(object instanceof StringBuffer);
assertEquals(sourceValue, object.toString());
-
+
}
/*
* Class to test for Object getInstance(String, ClassLoader, Object[], String[])
@@ -95,7 +98,7 @@
signature);
assertTrue(object instanceof StringBuffer);
assertEquals(sourceValu, object.toString());
-
+
}
/**
* @todo Need to run a test where the loader is NOT supported.
@@ -104,7 +107,7 @@
public void testIsLoaderSupported() throws Exception
{
assertTrue(factoryService.isLoaderSupported("java.lang.String"));
-
+
}
public void testGetSignature() throws Exception
{
@@ -116,13 +119,13 @@
Class[] results = factoryService.getSignature(StringBuffer.class, params, signature);
assertEquals(1, results.length);
assertTrue(results[0].equals(String.class));
-
+
Integer sourceValueInteger = new Integer(10);
params[0] = sourceValueInteger;
signature[0] = "java.lang.Integer";
results = factoryService.getSignature(ArrayList.class, params, signature);
assertEquals(1, results.length);
assertTrue("Result:" + results[0].getName(),results[0].equals(Integer.class));
-
+
}
}
Modified: jakarta/turbine/fulcrum/trunk/factory/src/test/org/apache/fulcrum/factory/utils/ObjectInputStreamForContextTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/factory/src/test/org/apache/fulcrum/factory/utils/ObjectInputStreamForContextTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/factory/src/test/org/apache/fulcrum/factory/utils/ObjectInputStreamForContextTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/factory/src/test/org/apache/fulcrum/factory/utils/ObjectInputStreamForContextTest.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.factory.utils;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.io.ByteArrayInputStream;
Modified: jakarta/turbine/fulcrum/trunk/factory/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/factory/xdocs/changes.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/factory/xdocs/changes.xml (original)
+++ jakarta/turbine/fulcrum/trunk/factory/xdocs/changes.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<document>
<properties>
<title>Fulcrum Factory</title>
@@ -9,11 +27,11 @@
<release version="1.0.3" date="2004-11-24">
<action dev="epugh" type="update" due-to="Kostyantyn Shchekotykhin">
Merge api and impl jars into one project.
- </action>
+ </action>
<action dev="epugh" type="update">
Clean up dependencies. Use TestContainer.
- </action>
- </release>
+ </action>
+ </release>
<release version="1.0.2" date="">
<action dev="epugh" type="update">
Update to use Merlin 3.3.0
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org