commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bay...@apache.org
Subject svn commit: r438373 [8/9] - in /jakarta/commons/proper/betwixt/trunk: ./ src/java/org/apache/commons/betwixt/ src/java/org/apache/commons/betwixt/digester/ src/java/org/apache/commons/betwixt/expression/ src/java/org/apache/commons/betwixt/io/ src/java...
Date Wed, 30 Aug 2006 05:17:40 GMT
Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/schema/schema.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/schema/schema.xml?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/schema/schema.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/schema/schema.xml Tue Aug 29 22:17:21 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- 
-  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
+ 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
   

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/ABCBean.betwixt
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/ABCBean.betwixt?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/ABCBean.betwixt (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/ABCBean.betwixt Tue Aug 29 22:17:21 2006
@@ -1,10 +1,11 @@
 <?xml version='1.0'?>
 <!-- 
-  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
+ 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
   

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/ABCBean.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/ABCBean.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/ABCBean.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/ABCBean.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * Copyright 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/AlphaBean.betwixt
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/AlphaBean.betwixt?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/AlphaBean.betwixt (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/AlphaBean.betwixt Tue Aug 29 22:17:21 2006
@@ -1,10 +1,11 @@
 <?xml version='1.0'?>
 <!-- 
-  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
+ 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
   

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/AlphaBean.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/AlphaBean.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/AlphaBean.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/AlphaBean.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * Copyright 2005 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/BetaBean.betwixt
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/BetaBean.betwixt?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/BetaBean.betwixt (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/BetaBean.betwixt Tue Aug 29 22:17:21 2006
@@ -1,10 +1,11 @@
 <?xml version='1.0'?>
 <!-- 
-  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
+ 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
   

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/BetaBean.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/BetaBean.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/BetaBean.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/BetaBean.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * Copyright 2005 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/ComposerBean.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/ComposerBean.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/ComposerBean.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/ComposerBean.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * Copyright 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/Element.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/Element.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/Element.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/Element.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/Elements.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/Elements.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/Elements.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/Elements.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/ElementsList.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/ElementsList.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/ElementsList.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/ElementsList.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * Copyright 2005 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestBadCharacterReplacingNMapper.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestBadCharacterReplacingNMapper.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestBadCharacterReplacingNMapper.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestBadCharacterReplacingNMapper.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestBaseMappingStrategy.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestBaseMappingStrategy.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestBaseMappingStrategy.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestBaseMappingStrategy.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * Copyright 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestCapitalizeNameMapper.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestCapitalizeNameMapper.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestCapitalizeNameMapper.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestCapitalizeNameMapper.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestConversionFlavour.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestConversionFlavour.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestConversionFlavour.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestConversionFlavour.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * Copyright 2005 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestDecapitalizeNameMapper.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestDecapitalizeNameMapper.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestDecapitalizeNameMapper.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestDecapitalizeNameMapper.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestDefaultNameMapper.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestDefaultNameMapper.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestDefaultNameMapper.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestDefaultNameMapper.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestDefaultPluralStemmer.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestDefaultPluralStemmer.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestDefaultPluralStemmer.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestDefaultPluralStemmer.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestElementsIO.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestElementsIO.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestElementsIO.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestElementsIO.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestHyphenatedNameMapper.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestHyphenatedNameMapper.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestHyphenatedNameMapper.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestHyphenatedNameMapper.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestIdStorageStrategy.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestIdStorageStrategy.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestIdStorageStrategy.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestIdStorageStrategy.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * Copyright 2005 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestMixedContentEncoding.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestMixedContentEncoding.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestMixedContentEncoding.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestMixedContentEncoding.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * Copyright 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestNamespaces.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestNamespaces.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestNamespaces.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestNamespaces.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * Copyright 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestObjectStringConverters.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestObjectStringConverters.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestObjectStringConverters.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestObjectStringConverters.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestSimpleTypeMapper.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestSimpleTypeMapper.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestSimpleTypeMapper.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestSimpleTypeMapper.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * Copyright 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestValueSuppressionStrategy.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestValueSuppressionStrategy.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestValueSuppressionStrategy.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestValueSuppressionStrategy.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * Copyright 2006 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/Testi18nObjectStringConversion.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/Testi18nObjectStringConversion.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/Testi18nObjectStringConversion.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/Testi18nObjectStringConversion.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TuneBean.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TuneBean.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TuneBean.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TuneBean.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * Copyright 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/Element.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/Element.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/Element.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/Element.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/Elements.betwixt
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/Elements.betwixt?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/Elements.betwixt (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/Elements.betwixt Tue Aug 29 22:17:21 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- 
-  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
+ 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
   

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/Elements.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/Elements.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/Elements.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/Elements.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/TestElementsAlt.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/TestElementsAlt.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/TestElementsAlt.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/alt/TestElementsAlt.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/impl/propertysuppression/TestPackageSuppressor.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/impl/propertysuppression/TestPackageSuppressor.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/impl/propertysuppression/TestPackageSuppressor.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/impl/propertysuppression/TestPackageSuppressor.java Tue Aug 29 22:17:21 2006
@@ -1,9 +1,10 @@
 /*
- * Copyright 2005 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
+ * 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
  * 

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/TestVersioning.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/TestVersioning.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/TestVersioning.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/TestVersioning.java Tue Aug 29 22:17:21 2006
@@ -1,277 +1,278 @@
-/*
- * Copyright 2006 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.
- */
-
-package org.apache.commons.betwixt.versioning;
-
-import java.io.StringWriter;
-
-import org.apache.commons.betwixt.AbstractTestCase;
-import org.apache.commons.betwixt.AttributeDescriptor;
-import org.apache.commons.betwixt.BindingConfiguration;
-import org.apache.commons.betwixt.ElementDescriptor;
-import org.apache.commons.betwixt.Options;
-import org.apache.commons.betwixt.XMLBeanInfo;
-import org.apache.commons.betwixt.XMLIntrospector;
-import org.apache.commons.betwixt.io.BeanWriter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-public class TestVersioning extends AbstractTestCase {
-    public static Log log = LogFactory.getLog(TestVersioning.class);
-
-    public TestVersioning(String testName) {
-        super(testName);
-    }
-
-    private void configure(BindingConfiguration configuration) {
-        configuration.setMapIDs(false);
-    }
-
-    public void testIntrospection() throws Exception {
-        log.info("testIntrospection() started");
-
-        XMLIntrospector introspector = new XMLIntrospector();
-        XMLBeanInfo beanInfo = introspector
-                .introspect(VersioningTestData.class);
-
-        // 2 Element descriptors
-        ElementDescriptor[] elementDescriptors = beanInfo
-                .getElementDescriptor().getElementDescriptors();
-        assertEquals("Need 2 element descriptors", 2, elementDescriptors.length);
-
-        ElementDescriptor element1Descriptor = beanInfo.getElementDescriptor()
-                .getElementDescriptor("element1");
-        log.info("element1Descriptor: " + element1Descriptor);
-        debugOptions(element1Descriptor.getOptions());
-        assertNotNull(element1Descriptor);
-        assertEquals("1", element1Descriptor.getOptions().getValue(
-                "version-from"));
-        assertNull(element1Descriptor.getOptions().getValue("version-until"));
-
-        ElementDescriptor element2Descriptor = beanInfo.getElementDescriptor()
-                .getElementDescriptor("element2");
-        log.info("element2Descriptor: " + element2Descriptor);
-        debugOptions(element2Descriptor.getOptions());
-        assertNotNull(element2Descriptor);
-        assertEquals("2", element2Descriptor.getOptions().getValue(
-                "version-from"));
-        assertNull(element2Descriptor.getOptions().getValue("version-until"));
-
-        // 2 Attribute descriptors
-        AttributeDescriptor[] attributeDescriptors = beanInfo
-                .getElementDescriptor().getAttributeDescriptors();
-        assertEquals("Need 2 attribute descriptors", 2,
-                attributeDescriptors.length);
-
-        AttributeDescriptor attribute1Descriptor = beanInfo
-                .getElementDescriptor().getAttributeDescriptor("attribute1");
-        log.info("attribute1Descriptor: " + attribute1Descriptor);
-        debugOptions(attribute1Descriptor.getOptions());
-        assertNotNull(attribute1Descriptor);
-        assertEquals("2", attribute1Descriptor.getOptions().getValue(
-                "version-from"));
-        assertNull(attribute1Descriptor.getOptions().getValue("version-until"));
-
-        AttributeDescriptor attribute2Descriptor = beanInfo
-                .getElementDescriptor().getAttributeDescriptor("attribute2");
-        log.info("attribute2Descriptor: " + attribute2Descriptor);
-        debugOptions(attribute2Descriptor.getOptions());
-        assertNotNull(attribute2Descriptor);
-        assertEquals("1", attribute2Descriptor.getOptions().getValue(
-                "version-from"));
-        assertEquals("2", attribute2Descriptor.getOptions().getValue(
-                "version-until"));
-
-        log.info("testIntrospection() complete");
-    }
-
-    /**
-     * Simple test case with no version specified: All elements/attributes will
-     * be written.
-     * 
-     * @throws Exception
-     */
-    public void testWrite1() throws Exception {
-        log.info("testWrite1() started");
-
-        final VersioningTestData data = new VersioningTestData();
-        data.setAttribute1("attributevalue1");
-        data.setAttribute2("attributevalue2");
-        data.setElement1("elementvalue1");
-        data.setElement2("elementvalue2");
-
-        StringWriter out = new StringWriter();
-        BeanWriter writer = new BeanWriter(out);
-        configure(writer.getBindingConfiguration());
-        writer.write(data);
-
-        final String written = out.toString();
-        log.info("Written:\n" + written);
-
-        final String expected = "<VersioningTestData attribute1=\"attributevalue1\" attribute2=\"attributevalue2\"><element1>elementvalue1</element1><element2>elementvalue2</element2></VersioningTestData>";
-        xmlAssertIsomorphicContent(parseString(expected), parseString(written),
-                true);
-
-        log.info("testWrite1() complete");
-    }
-
-    /**
-     * Version = 1
-     * 
-     * <ul>
-     * <li>Attribute1 (2-/): Not written
-     * <li>Attribute2 (1-2): Written
-     * <li>Element1 (1-/): Written
-     * <li>Element2 (2-/): Not written
-     * </ul>
-     * 
-     * @throws Exception
-     */
-    public void testWrite2() throws Exception {
-        log.info("testWrite2() started");
-
-        final VersioningTestData data = new VersioningTestData();
-        data.setAttribute1("attributevalue1");
-        data.setAttribute2("attributevalue2");
-        data.setElement1("elementvalue1");
-        data.setElement2("elementvalue2");
-
-        StringWriter out = new StringWriter();
-        BeanWriter writer = new BeanWriter(out);
-
-        final VersioningStrategy versioningStrategy = new VersioningStrategy(
-                "1");
-        writer.getXMLIntrospector().getConfiguration()
-                .setAttributeSuppressionStrategy(versioningStrategy);
-        writer.getXMLIntrospector().getConfiguration()
-                .setElementSuppressionStrategy(versioningStrategy);
-
-        configure(writer.getBindingConfiguration());
-        writer.write(data);
-
-        final String written = out.toString();
-        log.info("Written:\n" + written);
-
-        final String expected = "<VersioningTestData attribute2=\"attributevalue2\"><element1>elementvalue1</element1></VersioningTestData>";
-        xmlAssertIsomorphicContent(parseString(expected), parseString(written),
-                true);
-
-        log.info("testWrite1() complete");
-    }
-
-    private final void debugOptions(final Options options) {
-        final String[] names = options.getNames();
-
-        log.info("Names:");
-
-        for (int ii = 0; ii < names.length; ii++) {
-            final String name = names[ii];
-
-            log.info("  Name " + ii + ": " + name + "="
-                    + options.getValue(name));
-        }
-    }
-
-
-    /**
-     * Version = 2
-     * 
-     * <ul>
-     * <li>Attribute1 (2-/): written
-     * <li>Attribute2 (1-2): Written
-     * <li>Element1 (1-/): Written
-     * <li>Element2 (2-/): written
-     * </ul>
-     * 
-     * @throws Exception
-     */
-    public void testWrite3() throws Exception {
-        log.info("testWrite2() started");
-
-        final VersioningTestData data = new VersioningTestData();
-        data.setAttribute1("attributevalue1");
-        data.setAttribute2("attributevalue2");
-        data.setElement1("elementvalue1");
-        data.setElement2("elementvalue2");
-
-        StringWriter out = new StringWriter();
-        BeanWriter writer = new BeanWriter(out);
-
-        final VersioningStrategy versioningStrategy = new VersioningStrategy(
-                "2");
-        writer.getXMLIntrospector().getConfiguration()
-                .setAttributeSuppressionStrategy(versioningStrategy);
-        writer.getXMLIntrospector().getConfiguration()
-                .setElementSuppressionStrategy(versioningStrategy);
-
-        configure(writer.getBindingConfiguration());
-        writer.write(data);
-
-        final String written = out.toString();
-        log.info("Written:\n" + written);
-
-        final String expected = "<VersioningTestData attribute1=\"attributevalue1\" attribute2=\"attributevalue2\"><element1>elementvalue1</element1><element2>elementvalue2</element2></VersioningTestData>";
-        xmlAssertIsomorphicContent(parseString(expected), parseString(written),
-                true);
-
-        log.info("testWrite1() complete");
-    }
-
-
-    /**
-     * Version = 3
-     * 
-     * <ul>
-     * <li>Attribute1 (2-/): written
-     * <li>Attribute2 (1-2): Not Written
-     * <li>Element1 (1-/): Written
-     * <li>Element2 (2-/): written
-     * </ul>
-     * 
-     * @throws Exception
-     */
-    public void testWrite4() throws Exception {
-        log.info("testWrite2() started");
-
-        final VersioningTestData data = new VersioningTestData();
-        data.setAttribute1("attributevalue1");
-        data.setAttribute2("attributevalue2");
-        data.setElement1("elementvalue1");
-        data.setElement2("elementvalue2");
-
-        StringWriter out = new StringWriter();
-        BeanWriter writer = new BeanWriter(out);
-
-        final VersioningStrategy versioningStrategy = new VersioningStrategy(
-                "3");
-        writer.getXMLIntrospector().getConfiguration()
-                .setAttributeSuppressionStrategy(versioningStrategy);
-        writer.getXMLIntrospector().getConfiguration()
-                .setElementSuppressionStrategy(versioningStrategy);
-
-        configure(writer.getBindingConfiguration());
-        writer.write(data);
-
-        final String written = out.toString();
-        log.info("Written:\n" + written);
-
-        final String expected = "<VersioningTestData attribute1=\"attributevalue1\"><element1>elementvalue1</element1><element2>elementvalue2</element2></VersioningTestData>";
-        xmlAssertIsomorphicContent(parseString(expected), parseString(written),
-                true);
-
-        log.info("testWrite1() complete");
-    }
-}
+/*
+ * 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.
+ */
+
+package org.apache.commons.betwixt.versioning;
+
+import java.io.StringWriter;
+
+import org.apache.commons.betwixt.AbstractTestCase;
+import org.apache.commons.betwixt.AttributeDescriptor;
+import org.apache.commons.betwixt.BindingConfiguration;
+import org.apache.commons.betwixt.ElementDescriptor;
+import org.apache.commons.betwixt.Options;
+import org.apache.commons.betwixt.XMLBeanInfo;
+import org.apache.commons.betwixt.XMLIntrospector;
+import org.apache.commons.betwixt.io.BeanWriter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class TestVersioning extends AbstractTestCase {
+    public static Log log = LogFactory.getLog(TestVersioning.class);
+
+    public TestVersioning(String testName) {
+        super(testName);
+    }
+
+    private void configure(BindingConfiguration configuration) {
+        configuration.setMapIDs(false);
+    }
+
+    public void testIntrospection() throws Exception {
+        log.info("testIntrospection() started");
+
+        XMLIntrospector introspector = new XMLIntrospector();
+        XMLBeanInfo beanInfo = introspector
+                .introspect(VersioningTestData.class);
+
+        // 2 Element descriptors
+        ElementDescriptor[] elementDescriptors = beanInfo
+                .getElementDescriptor().getElementDescriptors();
+        assertEquals("Need 2 element descriptors", 2, elementDescriptors.length);
+
+        ElementDescriptor element1Descriptor = beanInfo.getElementDescriptor()
+                .getElementDescriptor("element1");
+        log.info("element1Descriptor: " + element1Descriptor);
+        debugOptions(element1Descriptor.getOptions());
+        assertNotNull(element1Descriptor);
+        assertEquals("1", element1Descriptor.getOptions().getValue(
+                "version-from"));
+        assertNull(element1Descriptor.getOptions().getValue("version-until"));
+
+        ElementDescriptor element2Descriptor = beanInfo.getElementDescriptor()
+                .getElementDescriptor("element2");
+        log.info("element2Descriptor: " + element2Descriptor);
+        debugOptions(element2Descriptor.getOptions());
+        assertNotNull(element2Descriptor);
+        assertEquals("2", element2Descriptor.getOptions().getValue(
+                "version-from"));
+        assertNull(element2Descriptor.getOptions().getValue("version-until"));
+
+        // 2 Attribute descriptors
+        AttributeDescriptor[] attributeDescriptors = beanInfo
+                .getElementDescriptor().getAttributeDescriptors();
+        assertEquals("Need 2 attribute descriptors", 2,
+                attributeDescriptors.length);
+
+        AttributeDescriptor attribute1Descriptor = beanInfo
+                .getElementDescriptor().getAttributeDescriptor("attribute1");
+        log.info("attribute1Descriptor: " + attribute1Descriptor);
+        debugOptions(attribute1Descriptor.getOptions());
+        assertNotNull(attribute1Descriptor);
+        assertEquals("2", attribute1Descriptor.getOptions().getValue(
+                "version-from"));
+        assertNull(attribute1Descriptor.getOptions().getValue("version-until"));
+
+        AttributeDescriptor attribute2Descriptor = beanInfo
+                .getElementDescriptor().getAttributeDescriptor("attribute2");
+        log.info("attribute2Descriptor: " + attribute2Descriptor);
+        debugOptions(attribute2Descriptor.getOptions());
+        assertNotNull(attribute2Descriptor);
+        assertEquals("1", attribute2Descriptor.getOptions().getValue(
+                "version-from"));
+        assertEquals("2", attribute2Descriptor.getOptions().getValue(
+                "version-until"));
+
+        log.info("testIntrospection() complete");
+    }
+
+    /**
+     * Simple test case with no version specified: All elements/attributes will
+     * be written.
+     * 
+     * @throws Exception
+     */
+    public void testWrite1() throws Exception {
+        log.info("testWrite1() started");
+
+        final VersioningTestData data = new VersioningTestData();
+        data.setAttribute1("attributevalue1");
+        data.setAttribute2("attributevalue2");
+        data.setElement1("elementvalue1");
+        data.setElement2("elementvalue2");
+
+        StringWriter out = new StringWriter();
+        BeanWriter writer = new BeanWriter(out);
+        configure(writer.getBindingConfiguration());
+        writer.write(data);
+
+        final String written = out.toString();
+        log.info("Written:\n" + written);
+
+        final String expected = "<VersioningTestData attribute1=\"attributevalue1\" attribute2=\"attributevalue2\"><element1>elementvalue1</element1><element2>elementvalue2</element2></VersioningTestData>";
+        xmlAssertIsomorphicContent(parseString(expected), parseString(written),
+                true);
+
+        log.info("testWrite1() complete");
+    }
+
+    /**
+     * Version = 1
+     * 
+     * <ul>
+     * <li>Attribute1 (2-/): Not written
+     * <li>Attribute2 (1-2): Written
+     * <li>Element1 (1-/): Written
+     * <li>Element2 (2-/): Not written
+     * </ul>
+     * 
+     * @throws Exception
+     */
+    public void testWrite2() throws Exception {
+        log.info("testWrite2() started");
+
+        final VersioningTestData data = new VersioningTestData();
+        data.setAttribute1("attributevalue1");
+        data.setAttribute2("attributevalue2");
+        data.setElement1("elementvalue1");
+        data.setElement2("elementvalue2");
+
+        StringWriter out = new StringWriter();
+        BeanWriter writer = new BeanWriter(out);
+
+        final VersioningStrategy versioningStrategy = new VersioningStrategy(
+                "1");
+        writer.getXMLIntrospector().getConfiguration()
+                .setAttributeSuppressionStrategy(versioningStrategy);
+        writer.getXMLIntrospector().getConfiguration()
+                .setElementSuppressionStrategy(versioningStrategy);
+
+        configure(writer.getBindingConfiguration());
+        writer.write(data);
+
+        final String written = out.toString();
+        log.info("Written:\n" + written);
+
+        final String expected = "<VersioningTestData attribute2=\"attributevalue2\"><element1>elementvalue1</element1></VersioningTestData>";
+        xmlAssertIsomorphicContent(parseString(expected), parseString(written),
+                true);
+
+        log.info("testWrite1() complete");
+    }
+
+    private final void debugOptions(final Options options) {
+        final String[] names = options.getNames();
+
+        log.info("Names:");
+
+        for (int ii = 0; ii < names.length; ii++) {
+            final String name = names[ii];
+
+            log.info("  Name " + ii + ": " + name + "="
+                    + options.getValue(name));
+        }
+    }
+
+
+    /**
+     * Version = 2
+     * 
+     * <ul>
+     * <li>Attribute1 (2-/): written
+     * <li>Attribute2 (1-2): Written
+     * <li>Element1 (1-/): Written
+     * <li>Element2 (2-/): written
+     * </ul>
+     * 
+     * @throws Exception
+     */
+    public void testWrite3() throws Exception {
+        log.info("testWrite2() started");
+
+        final VersioningTestData data = new VersioningTestData();
+        data.setAttribute1("attributevalue1");
+        data.setAttribute2("attributevalue2");
+        data.setElement1("elementvalue1");
+        data.setElement2("elementvalue2");
+
+        StringWriter out = new StringWriter();
+        BeanWriter writer = new BeanWriter(out);
+
+        final VersioningStrategy versioningStrategy = new VersioningStrategy(
+                "2");
+        writer.getXMLIntrospector().getConfiguration()
+                .setAttributeSuppressionStrategy(versioningStrategy);
+        writer.getXMLIntrospector().getConfiguration()
+                .setElementSuppressionStrategy(versioningStrategy);
+
+        configure(writer.getBindingConfiguration());
+        writer.write(data);
+
+        final String written = out.toString();
+        log.info("Written:\n" + written);
+
+        final String expected = "<VersioningTestData attribute1=\"attributevalue1\" attribute2=\"attributevalue2\"><element1>elementvalue1</element1><element2>elementvalue2</element2></VersioningTestData>";
+        xmlAssertIsomorphicContent(parseString(expected), parseString(written),
+                true);
+
+        log.info("testWrite1() complete");
+    }
+
+
+    /**
+     * Version = 3
+     * 
+     * <ul>
+     * <li>Attribute1 (2-/): written
+     * <li>Attribute2 (1-2): Not Written
+     * <li>Element1 (1-/): Written
+     * <li>Element2 (2-/): written
+     * </ul>
+     * 
+     * @throws Exception
+     */
+    public void testWrite4() throws Exception {
+        log.info("testWrite2() started");
+
+        final VersioningTestData data = new VersioningTestData();
+        data.setAttribute1("attributevalue1");
+        data.setAttribute2("attributevalue2");
+        data.setElement1("elementvalue1");
+        data.setElement2("elementvalue2");
+
+        StringWriter out = new StringWriter();
+        BeanWriter writer = new BeanWriter(out);
+
+        final VersioningStrategy versioningStrategy = new VersioningStrategy(
+                "3");
+        writer.getXMLIntrospector().getConfiguration()
+                .setAttributeSuppressionStrategy(versioningStrategy);
+        writer.getXMLIntrospector().getConfiguration()
+                .setElementSuppressionStrategy(versioningStrategy);
+
+        configure(writer.getBindingConfiguration());
+        writer.write(data);
+
+        final String written = out.toString();
+        log.info("Written:\n" + written);
+
+        final String expected = "<VersioningTestData attribute1=\"attributevalue1\"><element1>elementvalue1</element1><element2>elementvalue2</element2></VersioningTestData>";
+        xmlAssertIsomorphicContent(parseString(expected), parseString(written),
+                true);
+
+        log.info("testWrite1() complete");
+    }
+}

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/TestWrite1.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/TestWrite1.xml?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/TestWrite1.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/TestWrite1.xml Tue Aug 29 22:17:21 2006
@@ -1,21 +1,22 @@
 <?xml version='1.0'?>
 <!-- 
-	Copyright 2006 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.
 -->
 <VersioningTestData attribute1="attributevalue1"
-	attribute2="attributevalue2">
-	<element1>elementvalue1</element1>	
-	<element2>elementvalue2</element2>
-</VersioningTestData>
\ No newline at end of file
+    attribute2="attributevalue2">
+    <element1>elementvalue1</element1>    
+    <element2>elementvalue2</element2>
+</VersioningTestData>

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/TestWrite2.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/TestWrite2.xml?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/TestWrite2.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/TestWrite2.xml Tue Aug 29 22:17:21 2006
@@ -1,10 +1,11 @@
 <?xml version='1.0'?>
 <!-- 
-  Copyright 2006 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
+ 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
   

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/TestWrite3.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/TestWrite3.xml?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/TestWrite3.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/TestWrite3.xml Tue Aug 29 22:17:21 2006
@@ -1,10 +1,11 @@
 <?xml version='1.0'?>
 <!-- 
-  Copyright 2006 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
+ 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
   

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/TestWrite4.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/TestWrite4.xml?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/TestWrite4.xml (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/TestWrite4.xml Tue Aug 29 22:17:21 2006
@@ -1,10 +1,11 @@
 <?xml version='1.0'?>
 <!-- 
-  Copyright 2006 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
+ 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
   

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/VersioningStrategy.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/VersioningStrategy.java?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/VersioningStrategy.java (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/VersioningStrategy.java Tue Aug 29 22:17:21 2006
@@ -1,148 +1,149 @@
-/*
- * Copyright 2006 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.
- */
-package org.apache.commons.betwixt.versioning;
-
-import org.apache.commons.betwixt.AttributeDescriptor;
-import org.apache.commons.betwixt.ElementDescriptor;
-import org.apache.commons.betwixt.Options;
-import org.apache.commons.betwixt.strategy.AttributeSuppressionStrategy;
-import org.apache.commons.betwixt.strategy.ElementSuppressionStrategy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-public class VersioningStrategy implements ElementSuppressionStrategy,
-        AttributeSuppressionStrategy {
-    public static Log log = LogFactory.getLog(VersioningStrategy.class);
-
-    public final static String VERSION_FROM = "version-from";
-
-    public final static String VERSION_UNTIL = "version-until";
-
-    private String version;
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public boolean suppress(ElementDescriptor descr) {
-        log.info("Checking element " + descr.getLocalName() + " (" + descr + ")");
-
-        if (false == checkVersionFrom(descr.getOptions())) {
-            log.info("Suppressing element (invalid version/from)");
-            return true;
-        }
-
-        if (false == checkVersionUntil(descr.getOptions())) {
-            log.info("Suppressing element (invalid version/until)");
-            return true;
-        }
-
-        log.info("Showing element");
-        return false;
-    }
-
-    public boolean suppress(final AttributeDescriptor descr) {
-        log.info("Checking attribute " + descr.getLocalName() + " (" + descr + ")");
-
-        if (false == checkVersionFrom(descr.getOptions())) {
-            log.info("Suppressing attribute (invalid version/from)");
-            return true;
-        }
-
-        if (false == checkVersionUntil(descr.getOptions())) {
-            log.info("Suppressing attribute (invalid version/until)");
-            return true;
-        }
-
-        log.info("Showing attribute");
-        return false;
-    }
-
-    private boolean checkVersionFrom(final Options options) {
-        log.info("Checking version/from");
-
-        if (options == null) {
-            log.info("No options");
-            return true;
-        }
-
-        final String value = options.getValue(VERSION_FROM);
-
-        log.info("value=" + value);
-        log.info("version=" + version);
-        debugOptions(options);
-
-        if (value == null || value.trim().length() == 0) {
-            log.info("No attribute \"Version from\"");
-            return true;
-        }
-
-        final boolean versionOk = value.compareTo(version) <= 0;
-        log.info("versionOk=" + versionOk);
-
-        return versionOk;
-    }
-
-    private boolean checkVersionUntil(final Options options) {
-        log.info("Checking version/until");
-
-        if (options == null) {
-            log.info("No options");
-            return true;
-        }
-
-        final String value = options.getValue(VERSION_UNTIL);
-
-        log.info("value=" + value);
-        log.info("version=" + version);
-        debugOptions(options);
-
-        if (value == null || value.trim().length() == 0) {
-            log.info("No attribute \"Version until\"");
-            return true;
-        }
-
-        final boolean versionOk = value.compareTo(version) >= 0;
-        log.info("versionOk=" + versionOk);
-
-        return versionOk;
-    }
-
-    public VersioningStrategy() {
-        super();
-    }
-
-    public VersioningStrategy(final String version) {
-        super();
-        setVersion(version);
-    }
-
-    private final void debugOptions(final Options options) {
-        final String[] names = options.getNames();
-
-        log.info("Names:");
-
-        for (int ii = 0; ii < names.length; ii++) {
-            final String name = names[ii];
-
-            log.info("  " + ii + ": " + name + "=" + options.getValue(name));
-        }
-    }
-}
+/*
+ * 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.
+ */
+package org.apache.commons.betwixt.versioning;
+
+import org.apache.commons.betwixt.AttributeDescriptor;
+import org.apache.commons.betwixt.ElementDescriptor;
+import org.apache.commons.betwixt.Options;
+import org.apache.commons.betwixt.strategy.AttributeSuppressionStrategy;
+import org.apache.commons.betwixt.strategy.ElementSuppressionStrategy;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class VersioningStrategy implements ElementSuppressionStrategy,
+        AttributeSuppressionStrategy {
+    public static Log log = LogFactory.getLog(VersioningStrategy.class);
+
+    public final static String VERSION_FROM = "version-from";
+
+    public final static String VERSION_UNTIL = "version-until";
+
+    private String version;
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public boolean suppress(ElementDescriptor descr) {
+        log.info("Checking element " + descr.getLocalName() + " (" + descr + ")");
+
+        if (false == checkVersionFrom(descr.getOptions())) {
+            log.info("Suppressing element (invalid version/from)");
+            return true;
+        }
+
+        if (false == checkVersionUntil(descr.getOptions())) {
+            log.info("Suppressing element (invalid version/until)");
+            return true;
+        }
+
+        log.info("Showing element");
+        return false;
+    }
+
+    public boolean suppress(final AttributeDescriptor descr) {
+        log.info("Checking attribute " + descr.getLocalName() + " (" + descr + ")");
+
+        if (false == checkVersionFrom(descr.getOptions())) {
+            log.info("Suppressing attribute (invalid version/from)");
+            return true;
+        }
+
+        if (false == checkVersionUntil(descr.getOptions())) {
+            log.info("Suppressing attribute (invalid version/until)");
+            return true;
+        }
+
+        log.info("Showing attribute");
+        return false;
+    }
+
+    private boolean checkVersionFrom(final Options options) {
+        log.info("Checking version/from");
+
+        if (options == null) {
+            log.info("No options");
+            return true;
+        }
+
+        final String value = options.getValue(VERSION_FROM);
+
+        log.info("value=" + value);
+        log.info("version=" + version);
+        debugOptions(options);
+
+        if (value == null || value.trim().length() == 0) {
+            log.info("No attribute \"Version from\"");
+            return true;
+        }
+
+        final boolean versionOk = value.compareTo(version) <= 0;
+        log.info("versionOk=" + versionOk);
+
+        return versionOk;
+    }
+
+    private boolean checkVersionUntil(final Options options) {
+        log.info("Checking version/until");
+
+        if (options == null) {
+            log.info("No options");
+            return true;
+        }
+
+        final String value = options.getValue(VERSION_UNTIL);
+
+        log.info("value=" + value);
+        log.info("version=" + version);
+        debugOptions(options);
+
+        if (value == null || value.trim().length() == 0) {
+            log.info("No attribute \"Version until\"");
+            return true;
+        }
+
+        final boolean versionOk = value.compareTo(version) >= 0;
+        log.info("versionOk=" + versionOk);
+
+        return versionOk;
+    }
+
+    public VersioningStrategy() {
+        super();
+    }
+
+    public VersioningStrategy(final String version) {
+        super();
+        setVersion(version);
+    }
+
+    private final void debugOptions(final Options options) {
+        final String[] names = options.getNames();
+
+        log.info("Names:");
+
+        for (int ii = 0; ii < names.length; ii++) {
+            final String name = names[ii];
+
+            log.info("  " + ii + ": " + name + "=" + options.getValue(name));
+        }
+    }
+}

Modified: jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/VersioningTestData.betwixt
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/VersioningTestData.betwixt?rev=438373&r1=438372&r2=438373&view=diff
==============================================================================
--- jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/VersioningTestData.betwixt (original)
+++ jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/VersioningTestData.betwixt Tue Aug 29 22:17:21 2006
@@ -1,49 +1,50 @@
-<?xml version='1.0'?>
-<!-- 
-  Copyright 2006 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.
--->
-<info>
-	<element name='VersioningTestData'>
-	    <addDefaults add-properties="false" />
-		<attribute name='attribute1' property='attribute1'>
-			<option>
-				<name>version-from</name>
-				<value>2</value>
-			</option>
-		</attribute>
-		<attribute name='attribute2' property='attribute2'>
-			<option>
-				<name>version-from</name>
-				<value>1</value>
-			</option>
-			<option>
-				<name>version-until</name>
-				<value>2</value>
-			</option>
-		</attribute>
-		<element name='element1' property='element1'>
-			<option>
-				<name>version-from</name>
-				<value>1</value>
-			</option>
-		</element>
-		<element name='element2' property='element2'>
-			<option>
-				<name>version-from</name>
-				<value>2</value>
-			</option>
-		</element>
-	</element>
+<?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.
+-->
+<info>
+	<element name='VersioningTestData'>
+	    <addDefaults add-properties="false" />
+		<attribute name='attribute1' property='attribute1'>
+			<option>
+				<name>version-from</name>
+				<value>2</value>
+			</option>
+		</attribute>
+		<attribute name='attribute2' property='attribute2'>
+			<option>
+				<name>version-from</name>
+				<value>1</value>
+			</option>
+			<option>
+				<name>version-until</name>
+				<value>2</value>
+			</option>
+		</attribute>
+		<element name='element1' property='element1'>
+			<option>
+				<name>version-from</name>
+				<value>1</value>
+			</option>
+		</element>
+		<element name='element2' property='element2'>
+			<option>
+				<name>version-from</name>
+				<value>2</value>
+			</option>
+		</element>
+	</element>
 </info>



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message