directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r664342 [7/7] - in /directory/sandbox/seelmann/testingframework: ./ apacheds-configuration-help/src/main/docbook/ apacheds-configuration-help/src/main/resources/html/images/ apacheds-configuration-help/src/main/resources/html/images/getting...
Date Sat, 07 Jun 2008 14:17:30 GMT
Modified: directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/modifyResponse/ModifyResponseTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/modifyResponse/ModifyResponseTest.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/modifyResponse/ModifyResponseTest.java (original)
+++ directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/modifyResponse/ModifyResponseTest.java Sat Jun  7 07:17:06 2008
@@ -55,8 +55,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( ModifyResponseTest.class.getResource( "response_with_requestID_attribute.xml" )
-                .getFile() );
+            parser.setInput( ModifyResponseTest.class.getResource( "response_with_requestID_attribute.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -69,8 +69,8 @@
 
         assertEquals( 456, modifyResponse.getMessageId() );
     }
-    
-    
+
+
     /**
      * Test parsing of a Response with the (optional) requestID attribute equals 0
      */
@@ -90,7 +90,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( ModifyResponseTest.class.getResource( "response_with_1_control.xml" ).getFile() );
+            parser.setInput( ModifyResponseTest.class.getResource( "response_with_1_control.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -111,7 +112,8 @@
 
         assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
     }
-    
+
+
     /**
      * Test parsing of a response with a (optional) Control element with empty value
      */
@@ -122,7 +124,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( ModifyResponseTest.class.getResource( "response_with_1_control_empty_value.xml" ).getFile() );
+            parser.setInput( ModifyResponseTest.class.getResource( "response_with_1_control_empty_value.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -133,7 +136,7 @@
 
         ModifyResponse modifyResponse = ( ModifyResponse ) parser.getBatchResponse().getCurrentResponse();
         Control control = modifyResponse.getCurrentControl();
-        
+
         assertEquals( 1, modifyResponse.getControls().size() );
         assertTrue( control.getCriticality() );
         assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
@@ -151,7 +154,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( ModifyResponseTest.class.getResource( "response_with_2_controls.xml" ).getFile() );
+            parser.setInput( ModifyResponseTest.class.getResource( "response_with_2_controls.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -184,8 +188,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( ModifyResponseTest.class.getResource( "response_with_3_controls_without_value.xml" )
-                .getFile() );
+            parser.setInput( ModifyResponseTest.class.getResource( "response_with_3_controls_without_value.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -236,7 +240,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( ModifyResponseTest.class.getResource( "response_with_result_code.xml" ).getFile() );
+            parser.setInput( ModifyResponseTest.class.getResource( "response_with_result_code.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -263,7 +268,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( ModifyResponseTest.class.getResource( "response_with_error_message.xml" ).getFile() );
+            parser.setInput( ModifyResponseTest.class.getResource( "response_with_error_message.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -279,7 +285,8 @@
         assertEquals( "Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2", ldapResult
             .getErrorMessage() );
     }
-    
+
+
     /**
      * Test parsing of a response with empty Error Message
      */
@@ -290,7 +297,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( ModifyResponseTest.class.getResource( "response_with_empty_error_message.xml" ).getFile() );
+            parser.setInput( ModifyResponseTest.class.getResource( "response_with_empty_error_message.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -317,7 +325,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( ModifyResponseTest.class.getResource( "response_with_1_referral.xml" ).getFile() );
+            parser.setInput( ModifyResponseTest.class.getResource( "response_with_1_referral.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -345,7 +354,8 @@
             fail();
         }
     }
-    
+
+
     /**
      * Test parsing of a response with an empty Referral
      */
@@ -356,7 +366,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( ModifyResponseTest.class.getResource( "response_with_1_empty_referral.xml" ).getFile() );
+            parser.setInput( ModifyResponseTest.class.getResource( "response_with_1_empty_referral.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -385,7 +396,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( ModifyResponseTest.class.getResource( "response_with_2_referrals.xml" ).getFile() );
+            parser.setInput( ModifyResponseTest.class.getResource( "response_with_2_referrals.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -436,8 +448,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( ModifyResponseTest.class
-                .getResource( "response_with_1_referral_and_error_message.xml" ).getFile() );
+            parser.setInput( ModifyResponseTest.class.getResource( "response_with_1_referral_and_error_message.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -477,8 +489,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( ModifyResponseTest.class.getResource( "response_with_matchedDN_attribute.xml" )
-                .getFile() );
+            parser.setInput( ModifyResponseTest.class.getResource( "response_with_matchedDN_attribute.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }

Modified: directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchRequest/SearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchRequest/SearchRequestTest.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchRequest/SearchRequestTest.java (original)
+++ directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchRequest/SearchRequestTest.java Sat Jun  7 07:17:06 2008
@@ -73,7 +73,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "request_with_dn_attribute.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "request_with_dn_attribute.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -98,8 +99,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "request_with_requestID_attribute.xml" )
-                .getFile() );
+            parser.setInput(
+                SearchRequestTest.class.getResource( "request_with_requestID_attribute.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -133,7 +134,7 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "request_with_1_control.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "request_with_1_control.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -162,8 +163,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "request_with_1_control_base64_value.xml" )
-                .getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "request_with_1_control_base64_value.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -192,8 +193,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "request_with_1_control_empty_value.xml" )
-                .getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "request_with_1_control_empty_value.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -222,7 +223,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "request_with_2_controls.xml" ).getFile() );
+            parser
+                .setInput( SearchRequestTest.class.getResource( "request_with_2_controls.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -251,8 +253,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "request_with_3_controls_without_value.xml" )
-                .getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "request_with_3_controls_without_value.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -300,7 +302,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "request_with_scope_baseObject.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "request_with_scope_baseObject.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -326,7 +329,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "request_with_scope_singleLevel.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "request_with_scope_singleLevel.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -352,8 +356,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser
-                .setInputFile( SearchRequestTest.class.getResource( "request_with_scope_wholeSubtree.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "request_with_scope_wholeSubtree.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -397,8 +401,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "request_with_derefAliases_derefAlways.xml" )
-                .getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "request_with_derefAliases_derefAlways.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -424,8 +428,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "request_with_derefAliases_derefFindingBaseObj.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "request_with_derefAliases_derefFindingBaseObj.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -451,8 +455,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "request_with_derefAliases_derefInSearching.xml" )
-                .getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "request_with_derefAliases_derefInSearching.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -478,8 +482,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class
-                .getResource( "request_with_derefAliases_neverDerefAliases.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "request_with_derefAliases_neverDerefAliases.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -515,8 +519,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "request_with_sizeLimit_attribute.xml" )
-                .getFile() );
+            parser.setInput(
+                SearchRequestTest.class.getResource( "request_with_sizeLimit_attribute.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -552,8 +556,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "request_with_timeLimit_attribute.xml" )
-                .getFile() );
+            parser.setInput(
+                SearchRequestTest.class.getResource( "request_with_timeLimit_attribute.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -588,7 +592,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "request_with_typesOnly_true.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "request_with_typesOnly_true.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -613,7 +618,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "request_with_typesOnly_1.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "request_with_typesOnly_1.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -638,7 +644,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "request_with_typesOnly_false.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "request_with_typesOnly_false.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -663,7 +670,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "request_with_typesOnly_0.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "request_with_typesOnly_0.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -706,8 +714,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "request_with_attributes_but_no_attribute.xml" )
-                .getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "request_with_attributes_but_no_attribute.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -740,8 +748,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "request_with_attributes_1_attribute.xml" )
-                .getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "request_with_attributes_1_attribute.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -775,8 +783,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "request_with_attributes_2_attribute.xml" )
-                .getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "request_with_attributes_2_attribute.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -831,7 +839,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "filters/request_with_and.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "filters/request_with_and.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -858,7 +867,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "filters/request_with_or.xml" ).getFile() );
+            parser
+                .setInput( SearchRequestTest.class.getResource( "filters/request_with_or.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -885,7 +895,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "filters/request_with_not.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "filters/request_with_not.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -921,8 +932,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "filters/request_with_approxMatch.xml" )
-                .getFile() );
+            parser.setInput(
+                SearchRequestTest.class.getResource( "filters/request_with_approxMatch.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -945,7 +956,7 @@
 
         assertEquals( "sn", assertion.getAttributeDesc() );
 
-        assertEquals( "foobar", assertion.getAssertionValue() );
+        assertEquals( "foobar", assertion.getAssertionValue().get() );
     }
 
 
@@ -959,8 +970,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_approxMatch_base64_value.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "filters/request_with_approxMatch_base64_value.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -982,8 +993,8 @@
         AttributeValueAssertion assertion = approxMatchFilter.getAssertion();
 
         assertEquals( "sn", assertion.getAttributeDesc() );
-
-        assertEquals( "DSMLv2.0 rocks!!", new String( ( byte[] ) assertion.getAssertionValue() ) );
+        
+        assertEquals( "DSMLv2.0 rocks!!", new String( ( byte[] ) assertion.getAssertionValue().get() ) );
     }
 
 
@@ -997,8 +1008,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_approxMatch_with_empty_value.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource(
+                "filters/request_with_approxMatch_with_empty_value.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1062,8 +1073,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "filters/request_with_greaterOrEqual.xml" )
-                .getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "filters/request_with_greaterOrEqual.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1086,7 +1097,7 @@
 
         assertEquals( "sn", assertion.getAttributeDesc() );
 
-        assertEquals( "foobar", assertion.getAssertionValue() );
+        assertEquals( "foobar", assertion.getAssertionValue().get() );
     }
 
 
@@ -1100,8 +1111,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_greaterOrEqual_base64_value.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource(
+                "filters/request_with_greaterOrEqual_base64_value.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1124,7 +1135,7 @@
 
         assertEquals( "sn", assertion.getAttributeDesc() );
 
-        assertEquals( "DSMLv2.0 rocks!!", new String( ( byte[] ) assertion.getAssertionValue() ) );
+        assertEquals( "DSMLv2.0 rocks!!", new String( ( byte[] ) assertion.getAssertionValue().get() ) );
     }
 
 
@@ -1138,8 +1149,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_greaterOrEqual_with_empty_value.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource(
+                "filters/request_with_greaterOrEqual_with_empty_value.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1203,8 +1214,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "filters/request_with_lessOrEqual.xml" )
-                .getFile() );
+            parser.setInput(
+                SearchRequestTest.class.getResource( "filters/request_with_lessOrEqual.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1227,7 +1238,7 @@
 
         assertEquals( "sn", assertion.getAttributeDesc() );
 
-        assertEquals( "foobar", assertion.getAssertionValue() );
+        assertEquals( "foobar", assertion.getAssertionValue().get() );
     }
 
 
@@ -1241,8 +1252,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_lessOrEqual_base64_value.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "filters/request_with_lessOrEqual_base64_value.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1265,7 +1276,7 @@
 
         assertEquals( "sn", assertion.getAttributeDesc() );
 
-        assertEquals( "DSMLv2.0 rocks!!", new String( ( byte[] ) assertion.getAssertionValue() ) );
+        assertEquals( "DSMLv2.0 rocks!!", new String( ( byte[] ) assertion.getAssertionValue().get() ) );
     }
 
 
@@ -1279,8 +1290,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_lessOrEqual_with_empty_value.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource(
+                "filters/request_with_lessOrEqual_with_empty_value.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1344,8 +1355,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "filters/request_with_equalityMatch.xml" )
-                .getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "filters/request_with_equalityMatch.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1368,7 +1379,7 @@
 
         assertEquals( "sn", assertion.getAttributeDesc() );
 
-        assertEquals( "foobar", assertion.getAssertionValue() );
+        assertEquals( "foobar", assertion.getAssertionValue().get() );
     }
 
 
@@ -1382,8 +1393,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_equalityMatch_base64_value.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class
+                .getResource( "filters/request_with_equalityMatch_base64_value.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1406,7 +1417,7 @@
 
         assertEquals( "sn", assertion.getAttributeDesc() );
 
-        assertEquals( "DSMLv2.0 rocks!!", new String( ( byte[] ) assertion.getAssertionValue() ) );
+        assertEquals( "DSMLv2.0 rocks!!", new String( ( byte[] ) assertion.getAssertionValue().get() ) );
     }
 
 
@@ -1420,8 +1431,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_equalityMatch_with_empty_value.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource(
+                "filters/request_with_equalityMatch_with_empty_value.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1485,7 +1496,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "filters/request_with_present.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "filters/request_with_present.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -1525,8 +1537,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "filters/request_with_extensibleMatch.xml" )
-                .getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "filters/request_with_extensibleMatch.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1559,8 +1571,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_extensibleMatch_base64_value.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource(
+                "filters/request_with_extensibleMatch_base64_value.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1593,8 +1605,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_extensibleMatch_with_empty_value.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource(
+                "filters/request_with_extensibleMatch_with_empty_value.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1645,8 +1657,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_extensibleMatch_with_dnAttributes_true.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource(
+                "filters/request_with_extensibleMatch_with_dnAttributes_true.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1677,8 +1689,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_extensibleMatch_with_dnAttributes_1.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource(
+                "filters/request_with_extensibleMatch_with_dnAttributes_1.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1709,8 +1721,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_extensibleMatch_with_dnAttributes_false.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource(
+                "filters/request_with_extensibleMatch_with_dnAttributes_false.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1741,8 +1753,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_extensibleMatch_with_dnAttributes_0.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource(
+                "filters/request_with_extensibleMatch_with_dnAttributes_0.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1782,8 +1794,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_extensibleMatch_with_matchingRule.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource(
+                "filters/request_with_extensibleMatch_with_matchingRule.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1814,8 +1826,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_extensibleMatch_with_name.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "filters/request_with_extensibleMatch_with_name.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1846,8 +1858,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser
-                .setInputFile( SearchRequestTest.class.getResource( "filters/request_with_substrings.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "filters/request_with_substrings.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -1887,8 +1899,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "filters/request_with_substrings_1_initial.xml" )
-                .getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "filters/request_with_substrings_1_initial.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1919,8 +1931,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_substrings_1_base64_initial.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource(
+                "filters/request_with_substrings_1_base64_initial.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1951,8 +1963,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_substrings_1_empty_initial.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class
+                .getResource( "filters/request_with_substrings_1_empty_initial.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -1983,8 +1995,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_substrings_1_initial_1_any.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class
+                .getResource( "filters/request_with_substrings_1_initial_1_any.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -2021,8 +2033,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_substrings_1_initial_1_final.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource(
+                "filters/request_with_substrings_1_initial_1_final.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -2055,8 +2067,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "filters/request_with_substrings_1_any.xml" )
-                .getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "filters/request_with_substrings_1_any.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -2090,8 +2102,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_substrings_1_base64_any.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "filters/request_with_substrings_1_base64_any.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -2125,8 +2137,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class
-                .getResource( "filters/request_with_substrings_1_empty_any.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "filters/request_with_substrings_1_empty_any.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -2159,8 +2171,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "filters/request_with_substrings_2_any.xml" )
-                .getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "filters/request_with_substrings_2_any.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -2197,8 +2209,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_substrings_1_any_1_final.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "filters/request_with_substrings_1_any_1_final.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -2235,8 +2247,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource( "filters/request_with_substrings_1_final.xml" )
-                .getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "filters/request_with_substrings_1_final.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -2267,8 +2279,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_substrings_1_base64_final.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "filters/request_with_substrings_1_base64_final.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -2299,8 +2311,8 @@
         {
             parser = new Dsmlv2Parser();
 
-            parser.setInputFile( SearchRequestTest.class.getResource(
-                "filters/request_with_substrings_1_empty_final.xml" ).getFile() );
+            parser.setInput( SearchRequestTest.class.getResource( "filters/request_with_substrings_1_empty_final.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }

Modified: directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/SearchResponseTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/SearchResponseTest.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/SearchResponseTest.java (original)
+++ directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/SearchResponseTest.java Sat Jun  7 07:17:06 2008
@@ -44,8 +44,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResponseTest.class.getResource( "response_with_requestID_attribute.xml" )
-                .getFile() );
+            parser.setInput( SearchResponseTest.class.getResource( "response_with_requestID_attribute.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -58,8 +58,8 @@
 
         assertEquals( 456, searchResponse.getMessageId() );
     }
-    
-    
+
+
     /**
      * Test parsing of a Response with the (optional) requestID attribute equals 0
      */
@@ -79,7 +79,7 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResponseTest.class.getResource( "response_with_1_SRD.xml" ).getFile() );
+            parser.setInput( SearchResponseTest.class.getResource( "response_with_1_SRD.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -104,7 +104,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResponseTest.class.getResource( "response_with_1_SRE_1_SRD.xml" ).getFile() );
+            parser.setInput( SearchResponseTest.class.getResource( "response_with_1_SRE_1_SRD.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -131,7 +132,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResponseTest.class.getResource( "response_with_1_SRR_1_SRD.xml" ).getFile() );
+            parser.setInput( SearchResponseTest.class.getResource( "response_with_1_SRR_1_SRD.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -158,8 +160,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResponseTest.class.getResource( "response_with_1_SRE_1_SRR_1_SRD.xml" )
-                .getFile() );
+            parser.setInput(
+                SearchResponseTest.class.getResource( "response_with_1_SRE_1_SRR_1_SRD.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -188,7 +190,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResponseTest.class.getResource( "response_with_2_SRE_1_SRD.xml" ).getFile() );
+            parser.setInput( SearchResponseTest.class.getResource( "response_with_2_SRE_1_SRD.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -215,7 +218,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResponseTest.class.getResource( "response_with_2_SRR_1_SRD.xml" ).getFile() );
+            parser.setInput( SearchResponseTest.class.getResource( "response_with_2_SRR_1_SRD.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -242,8 +246,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResponseTest.class.getResource( "response_with_2_SRE_2_SRR_1_SRD.xml" )
-                .getFile() );
+            parser.setInput(
+                SearchResponseTest.class.getResource( "response_with_2_SRE_2_SRR_1_SRD.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }

Modified: directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java (original)
+++ directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java Sat Jun  7 07:17:06 2008
@@ -55,7 +55,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultDoneTest.class.getResource( "response_with_1_control.xml" ).getFile() );
+            parser.setInput( SearchResultDoneTest.class.getResource( "response_with_1_control.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -77,7 +78,8 @@
 
         assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
     }
-    
+
+
     /**
      * Test parsing of a response with a (optional) Control element with empty value
      */
@@ -88,7 +90,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultDoneTest.class.getResource( "response_with_1_control_empty_value.xml" ).getFile() );
+            parser.setInput( SearchResultDoneTest.class.getResource( "response_with_1_control_empty_value.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -100,7 +103,7 @@
         SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getSearchResultDone();
         Control control = searchResultDone.getCurrentControl();
-        
+
         assertEquals( 1, searchResultDone.getControls().size() );
         assertTrue( control.getCriticality() );
         assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
@@ -118,7 +121,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultDoneTest.class.getResource( "response_with_2_controls.xml" ).getFile() );
+            parser.setInput( SearchResultDoneTest.class.getResource( "response_with_2_controls.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -152,8 +156,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultDoneTest.class.getResource( "response_with_3_controls_without_value.xml" )
-                .getFile() );
+            parser.setInput( SearchResultDoneTest.class.getResource( "response_with_3_controls_without_value.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -187,8 +191,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultDoneTest.class.getResource( "response_with_requestID_attribute.xml" )
-                .getFile() );
+            parser.setInput( SearchResultDoneTest.class.getResource( "response_with_requestID_attribute.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -202,8 +206,8 @@
 
         assertEquals( 456, searchResultDone.getMessageId() );
     }
-    
-    
+
+
     /**
      * Test parsing of a Response with the (optional) requestID attribute equals 0
      */
@@ -241,7 +245,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultDoneTest.class.getResource( "response_with_result_code.xml" ).getFile() );
+            parser.setInput( SearchResultDoneTest.class.getResource( "response_with_result_code.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -269,7 +274,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultDoneTest.class.getResource( "response_with_error_message.xml" ).getFile() );
+            parser.setInput( SearchResultDoneTest.class.getResource( "response_with_error_message.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -286,7 +292,8 @@
         assertEquals( "Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2", ldapResult
             .getErrorMessage() );
     }
-    
+
+
     /**
      * Test parsing of a response with empty Error Message
      */
@@ -297,7 +304,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultDoneTest.class.getResource( "response_with_empty_error_message.xml" ).getFile() );
+            parser.setInput( SearchResultDoneTest.class.getResource( "response_with_empty_error_message.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -325,7 +333,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultDoneTest.class.getResource( "response_with_1_referral.xml" ).getFile() );
+            parser.setInput( SearchResultDoneTest.class.getResource( "response_with_1_referral.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -354,7 +363,8 @@
             fail();
         }
     }
-    
+
+
     /**
      * Test parsing of a response with an empty Referral
      */
@@ -365,7 +375,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultDoneTest.class.getResource( "response_with_1_empty_referral.xml" ).getFile() );
+            parser.setInput( SearchResultDoneTest.class.getResource( "response_with_1_empty_referral.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -395,7 +406,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultDoneTest.class.getResource( "response_with_2_referrals.xml" ).getFile() );
+            parser.setInput( SearchResultDoneTest.class.getResource( "response_with_2_referrals.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -447,8 +459,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultDoneTest.class.getResource(
-                "response_with_1_referral_and_error_message.xml" ).getFile() );
+            parser.setInput( SearchResultDoneTest.class.getResource( "response_with_1_referral_and_error_message.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -489,8 +501,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultDoneTest.class.getResource( "response_with_matchedDN_attribute.xml" )
-                .getFile() );
+            parser.setInput( SearchResultDoneTest.class.getResource( "response_with_matchedDN_attribute.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }

Modified: directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java (original)
+++ directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java Sat Jun  7 07:17:06 2008
@@ -54,7 +54,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultEntryTest.class.getResource( "response_with_1_control.xml" ).getFile() );
+            parser.setInput( SearchResultEntryTest.class.getResource( "response_with_1_control.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -88,8 +89,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultEntryTest.class.getResource( "response_with_1_control_empty_value.xml" )
-                .getFile() );
+            parser.setInput( SearchResultEntryTest.class.getResource( "response_with_1_control_empty_value.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -119,7 +120,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultEntryTest.class.getResource( "response_with_2_controls.xml" ).getFile() );
+            parser.setInput( SearchResultEntryTest.class.getResource( "response_with_2_controls.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -153,8 +155,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultEntryTest.class.getResource( "response_with_3_controls_without_value.xml" )
-                .getFile() );
+            parser.setInput( SearchResultEntryTest.class.getResource( "response_with_3_controls_without_value.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -206,7 +208,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultEntryTest.class.getResource( "response_with_dn_attribute.xml" ).getFile() );
+            parser.setInput( SearchResultEntryTest.class.getResource( "response_with_dn_attribute.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -232,8 +235,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultEntryTest.class.getResource( "response_with_requestID_attribute.xml" )
-                .getFile() );
+            parser.setInput( SearchResultEntryTest.class.getResource( "response_with_requestID_attribute.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -268,7 +271,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultEntryTest.class.getResource( "response_with_0_attr.xml" ).getFile() );
+            parser.setInput( SearchResultEntryTest.class.getResource( "response_with_0_attr.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -291,8 +295,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultEntryTest.class.getResource( "response_with_1_attr_0_value.xml" )
-                .getFile() );
+            parser.setInput(
+                SearchResultEntryTest.class.getResource( "response_with_1_attr_0_value.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -326,8 +330,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultEntryTest.class.getResource( "response_with_1_attr_1_value.xml" )
-                .getFile() );
+            parser.setInput(
+                SearchResultEntryTest.class.getResource( "response_with_1_attr_1_value.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -378,8 +382,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultEntryTest.class.getResource( "response_with_1_attr_1_base64_value.xml" )
-                .getFile() );
+            parser.setInput( SearchResultEntryTest.class.getResource( "response_with_1_attr_1_base64_value.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -433,8 +437,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultEntryTest.class.getResource( "response_with_1_attr_1_empty_value.xml" )
-                .getFile() );
+            parser.setInput( SearchResultEntryTest.class.getResource( "response_with_1_attr_1_empty_value.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -484,8 +488,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultEntryTest.class.getResource( "response_with_1_attr_2_value.xml" )
-                .getFile() );
+            parser.setInput(
+                SearchResultEntryTest.class.getResource( "response_with_1_attr_2_value.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -539,8 +543,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultEntryTest.class.getResource( "response_with_2_attr_1_value.xml" )
-                .getFile() );
+            parser.setInput(
+                SearchResultEntryTest.class.getResource( "response_with_2_attr_1_value.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }

Modified: directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java (original)
+++ directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java Sat Jun  7 07:17:06 2008
@@ -51,8 +51,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser
-                .setInputFile( SearchResultReferenceTest.class.getResource( "response_with_1_control.xml" ).getFile() );
+            parser.setInput( SearchResultReferenceTest.class.getResource( "response_with_1_control.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -74,7 +74,8 @@
 
         assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
     }
-    
+
+
     /**
      * Test parsing of a response with a (optional) Control element with empty value
      */
@@ -85,8 +86,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser
-                .setInputFile( SearchResultReferenceTest.class.getResource( "response_with_1_control_empty_value.xml" ).getFile() );
+            parser.setInput( SearchResultReferenceTest.class.getResource( "response_with_1_control_empty_value.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -120,8 +121,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultReferenceTest.class.getResource( "response_with_2_controls.xml" )
-                .getFile() );
+            parser.setInput(
+                SearchResultReferenceTest.class.getResource( "response_with_2_controls.xml" ).openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -155,8 +156,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultReferenceTest.class.getResource(
-                "response_with_3_controls_without_value.xml" ).getFile() );
+            parser.setInput( SearchResultReferenceTest.class.getResource( "response_with_3_controls_without_value.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -190,8 +191,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultReferenceTest.class.getResource( "response_with_requestID_attribute.xml" )
-                .getFile() );
+            parser.setInput( SearchResultReferenceTest.class.getResource( "response_with_requestID_attribute.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -205,7 +206,8 @@
 
         assertEquals( 456, searchResultReference.getMessageId() );
     }
-    
+
+
     /**
      * Test parsing of a Response with the (optional) requestID attribute equals 0
      */
@@ -234,7 +236,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultReferenceTest.class.getResource( "response_with_1_ref.xml" ).getFile() );
+            parser.setInput( SearchResultReferenceTest.class.getResource( "response_with_1_ref.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }
@@ -259,7 +262,8 @@
             fail();
         }
     }
-    
+
+
     /**
      * Test parsing of a Response with 1 Ref
      */
@@ -270,7 +274,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultReferenceTest.class.getResource( "response_with_1_empty_ref.xml" ).getFile() );
+            parser.setInput( SearchResultReferenceTest.class.getResource( "response_with_1_empty_ref.xml" )
+                .openStream(), "UTF-8" );
 
             parser.parse();
         }
@@ -288,7 +293,6 @@
     }
 
 
-
     /**
      * Test parsing of a Response with 2 Ref
      */
@@ -299,7 +303,8 @@
         {
             parser = new Dsmlv2ResponseParser();
 
-            parser.setInputFile( SearchResultReferenceTest.class.getResource( "response_with_2_ref.xml" ).getFile() );
+            parser.setInput( SearchResultReferenceTest.class.getResource( "response_with_2_ref.xml" ).openStream(),
+                "UTF-8" );
 
             parser.parse();
         }

Modified: directory/sandbox/seelmann/testingframework/studio/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/studio/pom.xml?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/studio/pom.xml (original)
+++ directory/sandbox/seelmann/testingframework/studio/pom.xml Sat Jun  7 07:17:06 2008
@@ -1,25 +1,25 @@
-<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.studio</groupId>
@@ -36,7 +36,7 @@
   <properties>
     <studio-dir>target/ApacheDirectoryStudio</studio-dir>
   </properties>
-
+
   <!-- 
     How building a dist works:
     We presume that all needed dependencies are already somehow available (normally this is the case with mvn install from root)
@@ -180,27 +180,27 @@
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>deploy-dist-linux-x86</id>
-                <phase>deploy</phase>
-                <configuration>
-                  <file>../target/distributions/ApacheDirectoryStudio-linux-x86-${pom.version}-dist.tar.gz</file>
-                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
-                  <artifactId>ApacheDirectoryStudio</artifactId>
-                  <groupId>${pom.groupId}</groupId>
-                  <packaging>tar.gz</packaging>
-                  <version>${pom.version}-linux-x86</version>
-                  <uniqueVersion>false</uniqueVersion>
-                </configuration>
-                <goals>
-                  <goal>deploy-file</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
+          <plugin>
+            <artifactId>maven-deploy-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>deploy-dist-linux-x86</id>
+                <phase>deploy</phase>
+                <configuration>
+                  <file>../target/distributions/ApacheDirectoryStudio-linux-x86-${pom.version}-dist.tar.gz</file>
+                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
+                  <artifactId>ApacheDirectoryStudio</artifactId>
+                  <groupId>${pom.groupId}</groupId>
+                  <packaging>tar.gz</packaging>
+                  <version>${pom.version}-linux-x86</version>
+                  <uniqueVersion>false</uniqueVersion>
+                </configuration>
+                <goals>
+                  <goal>deploy-file</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
@@ -329,28 +329,28 @@
                 </goals>
               </execution>
             </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>deploy-dist-linux-x86_64</id>
-                <phase>deploy</phase>
-                <configuration>
-                  <file>../target/distributions/ApacheDirectoryStudio-linux-x86_64-${pom.version}-dist.tar.gz</file>
-                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
-                  <artifactId>ApacheDirectoryStudio</artifactId>
-                  <groupId>${pom.groupId}</groupId>
-                  <packaging>tar.gz</packaging>
-                  <version>${pom.version}-linux-x86_64</version>
-                  <uniqueVersion>false</uniqueVersion>
-                </configuration>
-                <goals>
-                  <goal>deploy-file</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
+          </plugin>
+          <plugin>
+            <artifactId>maven-deploy-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>deploy-dist-linux-x86_64</id>
+                <phase>deploy</phase>
+                <configuration>
+                  <file>../target/distributions/ApacheDirectoryStudio-linux-x86_64-${pom.version}-dist.tar.gz</file>
+                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
+                  <artifactId>ApacheDirectoryStudio</artifactId>
+                  <groupId>${pom.groupId}</groupId>
+                  <packaging>tar.gz</packaging>
+                  <version>${pom.version}-linux-x86_64</version>
+                  <uniqueVersion>false</uniqueVersion>
+                </configuration>
+                <goals>
+                  <goal>deploy-file</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
@@ -480,27 +480,27 @@
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>deploy-dist-linux-ppc</id>
-                <phase>deploy</phase>
-                <configuration>
-                  <file>../target/distributions/ApacheDirectoryStudio-linux-ppc-${pom.version}-dist.tar.gz</file>
-                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
-                  <artifactId>ApacheDirectoryStudio</artifactId>
-                  <groupId>${pom.groupId}</groupId>
-                  <packaging>tar.gz</packaging>
-                  <version>${pom.version}-linux-ppc</version>
-                  <uniqueVersion>false</uniqueVersion>
-                </configuration>
-                <goals>
-                  <goal>deploy-file</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
+          <plugin>
+            <artifactId>maven-deploy-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>deploy-dist-linux-ppc</id>
+                <phase>deploy</phase>
+                <configuration>
+                  <file>../target/distributions/ApacheDirectoryStudio-linux-ppc-${pom.version}-dist.tar.gz</file>
+                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
+                  <artifactId>ApacheDirectoryStudio</artifactId>
+                  <groupId>${pom.groupId}</groupId>
+                  <packaging>tar.gz</packaging>
+                  <version>${pom.version}-linux-ppc</version>
+                  <uniqueVersion>false</uniqueVersion>
+                </configuration>
+                <goals>
+                  <goal>deploy-file</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
@@ -629,27 +629,27 @@
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>deploy-dist-win32</id>
-                <phase>deploy</phase>
-                <configuration>
-                  <file>../target/distributions/ApacheDirectoryStudio-win32-${pom.version}-dist.zip</file>
-                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
-                  <artifactId>ApacheDirectoryStudio</artifactId>
-                  <groupId>${pom.groupId}</groupId>
-                  <packaging>zip</packaging>
-                  <version>${pom.version}-win32</version>
-                  <uniqueVersion>false</uniqueVersion>
-                </configuration>
-                <goals>
-                  <goal>deploy-file</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
+          <plugin>
+            <artifactId>maven-deploy-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>deploy-dist-win32</id>
+                <phase>deploy</phase>
+                <configuration>
+                  <file>../target/distributions/ApacheDirectoryStudio-win32-${pom.version}-dist.zip</file>
+                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
+                  <artifactId>ApacheDirectoryStudio</artifactId>
+                  <groupId>${pom.groupId}</groupId>
+                  <packaging>zip</packaging>
+                  <version>${pom.version}-win32</version>
+                  <uniqueVersion>false</uniqueVersion>
+                </configuration>
+                <goals>
+                  <goal>deploy-file</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
@@ -689,11 +689,16 @@
                       <outputDirectory>${studio-dir}-macosx</outputDirectory>
                     </artifactItem>
                     <artifactItem>
-                    <groupId>org.eclipse.equinox.launcher.carbon</groupId>
+                      <groupId>org.eclipse.equinox.launcher.carbon</groupId>
                       <artifactId>macosx</artifactId>
                       <type>tar.gz</type>
                       <outputDirectory>${studio-dir}-macosx</outputDirectory>
                     </artifactItem>
+                    <artifactItem>
+                      <groupId>org.eclipse.ui</groupId>
+                      <artifactId>carbon</artifactId>
+                      <outputDirectory>${studio-dir}-macosx/Apache Directory Studio.app/Contents/Resources/Java/plugins</outputDirectory>
+                    </artifactItem>
                   </artifactItems>
                 </configuration>
               </execution>
@@ -744,27 +749,27 @@
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>deploy-dist-macosx</id>
-                <phase>deploy</phase>
-                <configuration>
-                  <file>../target/distributions/ApacheDirectoryStudio-macosx-${pom.version}-dist.tar.gz</file>
-                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
-                  <artifactId>ApacheDirectoryStudio</artifactId>
-                  <groupId>${pom.groupId}</groupId>
-                  <packaging>tar.gz</packaging>
-                  <version>${pom.version}-macosx</version>
-                  <uniqueVersion>false</uniqueVersion>
-                </configuration>
-                <goals>
-                  <goal>deploy-file</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
+          <plugin>
+            <artifactId>maven-deploy-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>deploy-dist-macosx</id>
+                <phase>deploy</phase>
+                <configuration>
+                  <file>../target/distributions/ApacheDirectoryStudio-macosx-${pom.version}-dist.tar.gz</file>
+                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
+                  <artifactId>ApacheDirectoryStudio</artifactId>
+                  <groupId>${pom.groupId}</groupId>
+                  <packaging>tar.gz</packaging>
+                  <version>${pom.version}-macosx</version>
+                  <uniqueVersion>false</uniqueVersion>
+                </configuration>
+                <goals>
+                  <goal>deploy-file</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <groupId>org.apache.directory.studio</groupId>
             <artifactId>maven-studio-plugin</artifactId>
@@ -959,6 +964,10 @@
                   <artifactId>editors</artifactId>
                 </artifactItem>
                 <artifactItem>
+                  <groupId>org.eclipse.ui</groupId>
+                  <artifactId>net</artifactId>
+                </artifactItem>
+                <artifactItem>
                   <groupId>org.eclipse</groupId>
                   <artifactId>text</artifactId>
                 </artifactItem>
@@ -1094,8 +1103,6 @@
                   <groupId>org.eclipse.core</groupId>
                   <artifactId>runtime</artifactId>
                 </artifactItem>
-                
-                
                 <artifactItem>
                     <groupId>javax</groupId>
                     <artifactId>servlet</artifactId>
@@ -1164,7 +1171,6 @@
                     <groupId>org.mortbay</groupId>
                     <artifactId>jetty</artifactId>
                 </artifactItem>
-                
               </artifactItems>
             </configuration>
           </execution>
@@ -1256,25 +1262,25 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-
-      <!-- FIXME enable check for legal file -->
-      <plugin>
-        <groupId>org.apache.geronimo.genesis.plugins</groupId>
-        <artifactId>tools-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>verify-legal-files</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>verify-legal-files</goal>
-            </goals>
-            <configuration>
-              <!-- Fail the build if no legal files were found -->
-              <strict>false</strict>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
+
+      <!-- FIXME enable check for legal file -->
+      <plugin>
+        <groupId>org.apache.geronimo.genesis.plugins</groupId>
+        <artifactId>tools-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>verify-legal-files</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>verify-legal-files</goal>
+            </goals>
+            <configuration>
+              <!-- Fail the build if no legal files were found -->
+              <strict>false</strict>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

Modified: directory/sandbox/seelmann/testingframework/test-integration-core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/test-integration-core/META-INF/MANIFEST.MF?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/test-integration-core/META-INF/MANIFEST.MF (original)
+++ directory/sandbox/seelmann/testingframework/test-integration-core/META-INF/MANIFEST.MF Sat Jun  7 07:17:06 2008
@@ -11,36 +11,36 @@
  org.junit
 Bundle-ClassPath: .,
  lib/antlr-2.7.7.jar,
- lib/apacheds-bootstrap-extract-1.5.2-SNAPSHOT.jar,
- lib/apacheds-bootstrap-partition-1.5.2-SNAPSHOT.jar,
- lib/apacheds-btree-base-1.5.2-SNAPSHOT.jar,
- lib/apacheds-core-1.5.2-SNAPSHOT.jar,
- lib/apacheds-core-constants-1.5.2-SNAPSHOT.jar,
- lib/apacheds-core-entry-1.5.2-SNAPSHOT.jar,
- lib/apacheds-core-integ-1.5.2-SNAPSHOT.jar,
- lib/apacheds-core-shared-1.5.2-SNAPSHOT.jar,
- lib/apacheds-core-unit-1.5.2-SNAPSHOT.jar,
- lib/apacheds-interceptor-kerberos-1.5.2-SNAPSHOT.jar,
- lib/apacheds-jdbm-store-1.5.2-SNAPSHOT.jar,
- lib/apacheds-kerberos-shared-1.5.2-SNAPSHOT.jar,
- lib/apacheds-protocol-ldap-1.5.2-SNAPSHOT.jar,
- lib/apacheds-protocol-shared-1.5.2-SNAPSHOT.jar,
- lib/apacheds-schema-bootstrap-1.5.2-SNAPSHOT.jar,
- lib/apacheds-schema-extras-1.5.2-SNAPSHOT.jar,
- lib/apacheds-schema-registries-1.5.2-SNAPSHOT.jar,
- lib/apacheds-server-jndi-1.5.2-SNAPSHOT.jar,
- lib/apacheds-server-unit-1.5.2-SNAPSHOT.jar,
- lib/apacheds-utils-1.5.2-SNAPSHOT.jar,
+ lib/apacheds-bootstrap-extract-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-bootstrap-partition-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-btree-base-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-core-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-core-constants-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-core-entry-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-core-integ-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-core-shared-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-core-unit-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-interceptor-kerberos-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-jdbm-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-jdbm-store-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-kerberos-shared-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-protocol-ldap-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-protocol-shared-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-schema-bootstrap-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-schema-extras-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-schema-registries-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-server-jndi-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-server-unit-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-utils-1.5.3-SNAPSHOT.jar,
  lib/commons-collections-3.2.jar,
  lib/commons-io-1.3.2.jar,
  lib/commons-lang-2.3.jar,
- lib/jdbm-1.0.jar,
  lib/mina-core-1.1.6.jar,
  lib/mina-filter-ssl-1.1.6.jar,
  lib/nlog4j-1.2.25.jar,
- lib/shared-asn1-0.9.9-SNAPSHOT.jar,
- lib/shared-asn1-codec-0.9.9-SNAPSHOT.jar,
- lib/shared-bouncycastle-reduced-0.9.9-SNAPSHOT.jar,
- lib/shared-ldap-0.9.9-SNAPSHOT.jar,
- lib/shared-ldap-constants-0.9.9-SNAPSHOT.jar,
+ lib/shared-asn1-0.9.11-SNAPSHOT.jar,
+ lib/shared-asn1-codec-0.9.11-SNAPSHOT.jar,
+ lib/shared-bouncycastle-reduced-0.9.11-SNAPSHOT.jar,
+ lib/shared-ldap-0.9.11-SNAPSHOT.jar,
+ lib/shared-ldap-constants-0.9.11-SNAPSHOT.jar,
  lib/slf4j-api-1.4.3.jar

Modified: directory/sandbox/seelmann/testingframework/test-integration-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/test-integration-core/pom.xml?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/test-integration-core/pom.xml (original)
+++ directory/sandbox/seelmann/testingframework/test-integration-core/pom.xml Sat Jun  7 07:17:06 2008
@@ -186,7 +186,7 @@
                     <java fork="true" failonerror="true" classname="org.eclipse.core.launcher.Main">
                       <arg line="${integration-cmdline-params} -application org.eclipse.test.coretestapplication -data target/test-sandbox/workspace formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,target/test-sandbox/workspace/test-result.xml -testPluginName org.apache.directory.studio.test.integration.core -className org.apache.directory.studio.test.integration.core.AutomatedSuite"/>
                       <classpath>
-                        <pathelement location="target/test-sandbox/plugins/org.eclipse.equinox.launcher_1.0.1.R33x_v20070828.jar" />
+                        <pathelement location="target/test-sandbox/plugins/org.eclipse.equinox.launcher_1.0.1.R33x_v20080118.jar" />
                       </classpath>
                     </java>
                   </tasks>
@@ -270,12 +270,12 @@
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-server-unit</artifactId>
-      <version>1.5.2-SNAPSHOT</version>
+      <version>1.5.3-SNAPSHOT</version>
     </dependency> 
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-integ</artifactId>
-      <version>1.5.2-SNAPSHOT</version>
+      <version>1.5.3-SNAPSHOT</version>
     </dependency> 
     <dependency>
       <groupId>junit</groupId>

Modified: directory/sandbox/seelmann/testingframework/test-integration-ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/test-integration-ui/META-INF/MANIFEST.MF?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/test-integration-ui/META-INF/MANIFEST.MF (original)
+++ directory/sandbox/seelmann/testingframework/test-integration-ui/META-INF/MANIFEST.MF Sat Jun  7 07:17:06 2008
@@ -14,36 +14,36 @@
  net.sf.swtbot.eclipse.finder
 Bundle-ClassPath: .,
  lib/antlr-2.7.7.jar,
- lib/apacheds-bootstrap-extract-1.5.2-SNAPSHOT.jar,
- lib/apacheds-bootstrap-partition-1.5.2-SNAPSHOT.jar,
- lib/apacheds-btree-base-1.5.2-SNAPSHOT.jar,
- lib/apacheds-core-1.5.2-SNAPSHOT.jar,
- lib/apacheds-core-constants-1.5.2-SNAPSHOT.jar,
- lib/apacheds-core-entry-1.5.2-SNAPSHOT.jar,
- lib/apacheds-core-integ-1.5.2-SNAPSHOT.jar,
- lib/apacheds-core-shared-1.5.2-SNAPSHOT.jar,
- lib/apacheds-core-unit-1.5.2-SNAPSHOT.jar,
- lib/apacheds-interceptor-kerberos-1.5.2-SNAPSHOT.jar,
- lib/apacheds-jdbm-store-1.5.2-SNAPSHOT.jar,
- lib/apacheds-kerberos-shared-1.5.2-SNAPSHOT.jar,
- lib/apacheds-protocol-ldap-1.5.2-SNAPSHOT.jar,
- lib/apacheds-protocol-shared-1.5.2-SNAPSHOT.jar,
- lib/apacheds-schema-bootstrap-1.5.2-SNAPSHOT.jar,
- lib/apacheds-schema-extras-1.5.2-SNAPSHOT.jar,
- lib/apacheds-schema-registries-1.5.2-SNAPSHOT.jar,
- lib/apacheds-server-jndi-1.5.2-SNAPSHOT.jar,
- lib/apacheds-server-unit-1.5.2-SNAPSHOT.jar,
- lib/apacheds-utils-1.5.2-SNAPSHOT.jar,
+ lib/apacheds-bootstrap-extract-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-bootstrap-partition-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-btree-base-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-core-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-core-constants-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-core-entry-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-core-integ-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-core-shared-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-core-unit-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-interceptor-kerberos-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-jdbm-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-jdbm-store-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-kerberos-shared-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-protocol-ldap-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-protocol-shared-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-schema-bootstrap-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-schema-extras-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-schema-registries-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-server-jndi-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-server-unit-1.5.3-SNAPSHOT.jar,
+ lib/apacheds-utils-1.5.3-SNAPSHOT.jar,
  lib/commons-collections-3.2.jar,
  lib/commons-io-1.3.2.jar,
  lib/commons-lang-2.3.jar,
- lib/jdbm-1.0.jar,
  lib/mina-core-1.1.6.jar,
  lib/mina-filter-ssl-1.1.6.jar,
  lib/nlog4j-1.2.25.jar,
- lib/shared-asn1-0.9.9-SNAPSHOT.jar,
- lib/shared-asn1-codec-0.9.9-SNAPSHOT.jar,
- lib/shared-bouncycastle-reduced-0.9.9-SNAPSHOT.jar,
- lib/shared-ldap-0.9.9-SNAPSHOT.jar,
- lib/shared-ldap-constants-0.9.9-SNAPSHOT.jar,
+ lib/shared-asn1-0.9.11-SNAPSHOT.jar,
+ lib/shared-asn1-codec-0.9.11-SNAPSHOT.jar,
+ lib/shared-bouncycastle-reduced-0.9.11-SNAPSHOT.jar,
+ lib/shared-ldap-0.9.11-SNAPSHOT.jar,
+ lib/shared-ldap-constants-0.9.11-SNAPSHOT.jar,
  lib/slf4j-api-1.4.3.jar

Modified: directory/sandbox/seelmann/testingframework/test-integration-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/test-integration-ui/pom.xml?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/test-integration-ui/pom.xml (original)
+++ directory/sandbox/seelmann/testingframework/test-integration-ui/pom.xml Sat Jun  7 07:17:06 2008
@@ -186,7 +186,7 @@
                     <java fork="true" failonerror="true" classname="org.eclipse.core.launcher.Main">
                       <arg line="${integration-cmdline-params} -application net.sf.swtbot.eclipse.headless.swtbottestapplication -data target/test-sandbox/workspace formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,target/test-sandbox/workspace/test-result.xml -testPluginName org.apache.directory.studio.test.integration.ui -className org.apache.directory.studio.test.integration.ui.AutomatedSuite"/>
                       <classpath>
-                        <pathelement location="target/test-sandbox/plugins/org.eclipse.equinox.launcher_1.0.1.R33x_v20070828.jar" />
+                        <pathelement location="target/test-sandbox/plugins/org.eclipse.equinox.launcher_1.0.1.R33x_v20080118.jar" />
                       </classpath>
                     </java>
                   </tasks>
@@ -270,12 +270,12 @@
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-server-unit</artifactId>
-      <version>1.5.2-SNAPSHOT</version>
+      <version>1.5.3-SNAPSHOT</version>
     </dependency> 
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-integ</artifactId>
-      <version>1.5.2-SNAPSHOT</version>
+      <version>1.5.3-SNAPSHOT</version>
     </dependency> 
     <dependency>
       <groupId>junit</groupId>



Mime
View raw message