directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1066272 - in /directory/studio/branches/m1: ./ plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java pom.xml
Date Tue, 01 Feb 2011 23:33:46 GMT
Author: akarasulu
Date: Tue Feb  1 23:33:45 2011
New Revision: 1066272

URL: http://svn.apache.org/viewvc?rev=1066272&view=rev
Log:
merging in changes today from trunk

Modified:
    directory/studio/branches/m1/   (props changed)
    directory/studio/branches/m1/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
    directory/studio/branches/m1/pom.xml

Propchange: directory/studio/branches/m1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  1 23:33:45 2011
@@ -1,2 +1,3 @@
 /directory/studio/branches/shared-trunk-merge:1004968-1005876
 /directory/studio/branches/studio-connection-refactoring:1022102-1030058
+/directory/studio/trunk:1066125-1066271

Modified: directory/studio/branches/m1/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java?rev=1066272&r1=1066271&r2=1066272&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
(original)
+++ directory/studio/branches/m1/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
Tue Feb  1 23:33:45 2011
@@ -192,7 +192,7 @@ public class ImportDsmlRunnable implemen
         try
         {
             // Parsing the file
-            Dsmlv2Parser parser = new Dsmlv2Parser();
+            Dsmlv2Parser parser = new Dsmlv2Parser( codec );
             parser.setInput( new FileInputStream( dsmlFile ), "UTF-8" );
             parser.parseAllRequests();
 

Modified: directory/studio/branches/m1/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/pom.xml?rev=1066272&r1=1066271&r2=1066272&view=diff
==============================================================================
--- directory/studio/branches/m1/pom.xml (original)
+++ directory/studio/branches/m1/pom.xml Tue Feb  1 23:33:45 2011
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.project</groupId>
     <artifactId>project</artifactId>
-    <version>18</version>
+    <version>19</version>
   </parent>
 
   <groupId>org.apache.directory.studio</groupId>



Mime
View raw message