You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2007/01/09 10:56:34 UTC
svn commit: r494352 - in
/directory/trunks/ldapstudio/ldapstudio-dsml-parser: build.xml
src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2Parser.java
src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2ResponseParser.java
Author: pamarcelot
Date: Tue Jan 9 01:56:33 2007
New Revision: 494352
URL: http://svn.apache.org/viewvc?view=rev&rev=494352
Log:
Removing silly error throwing... Increasing version number to 0.2.
Modified:
directory/trunks/ldapstudio/ldapstudio-dsml-parser/build.xml
directory/trunks/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2Parser.java
directory/trunks/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2ResponseParser.java
Modified: directory/trunks/ldapstudio/ldapstudio-dsml-parser/build.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-dsml-parser/build.xml?view=diff&rev=494352&r1=494351&r2=494352
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-dsml-parser/build.xml (original)
+++ directory/trunks/ldapstudio/ldapstudio-dsml-parser/build.xml Tue Jan 9 01:56:33 2007
@@ -18,7 +18,7 @@
-->
<project name="ldapstudio-dsml-parser" default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
<property name="project.name" value="ldapstudio-dsml-parser" />
- <property name="project.version" value="0.1" />
+ <property name="project.version" value="0.2" />
<property name="project.output" value="${basedir}/target" />
<property name="project.build" value="${project.output}/build" />
@@ -95,7 +95,7 @@
<!-- JAR -->
<!-- ================================== -->
<target name="jar" description="Creates jar file" depends="compile">
- <jar destfile="${project.output}/${project.name}_${project.version}.jar" manifest="${project.build}/META-INF/MANIFEST.MF">
+ <jar destfile="${project.output}/${project.name}-${project.version}.jar" manifest="${project.build}/META-INF/MANIFEST.MF">
<fileset dir="${project.build}" excludes="compile.timestamp" />
</jar>
</target>
@@ -123,16 +123,7 @@
<exclude name="build.xml" />
<exclude name="ivy.xml" />
<exclude name="src/**" />
- <exclude name="META-INF/**" />
- <exclude name="CompleteBatchRequest.xml" />
- <exclude name="BatchResponse.xml" />
- <exclude name="document_dsml_test.xml" />
- <exclude name="SimpleAddDSML.xml" />
- <exclude name="SimpleAuthDSML.xml" />
- <exclude name="SimpleDelDSML.xml" />
- <exclude name="SimpleErrorResponseGeneratingDSML.xml" />
- <exclude name="SimpleExtendedDSML.xml" />
- <exclude name="SimpleSearchDSML.xml" />
+ <exclude name="META-INF/**" />
</fileset>
</delete>
</target>
Modified: directory/trunks/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2Parser.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2Parser.java?view=diff&rev=494352&r1=494351&r2=494352
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2Parser.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2Parser.java Tue Jan 9 01:56:33 2007
@@ -230,8 +230,7 @@
{
if ( container.getBatchRequest() == null )
{
- throw new XmlPullParserException( "The batch request needs to be parsed before parsing a request",
- container.getParser(), null );
+ parseBatchRequest();
}
XmlPullParser xpp = container.getParser();
Modified: directory/trunks/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2ResponseParser.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2ResponseParser.java?view=diff&rev=494352&r1=494351&r2=494352
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2ResponseParser.java (original)
+++ directory/trunks/ldapstudio/ldapstudio-dsml-parser/src/main/java/org/apache/directory/ldapstudio/dsmlv2/Dsmlv2ResponseParser.java Tue Jan 9 01:56:33 2007
@@ -230,8 +230,7 @@
{
if ( container.getBatchResponse() == null )
{
- throw new XmlPullParserException( "The batch response needs to be parsed before parsing a response",
- container.getParser(), null );
+ parseBatchResponse();
}
XmlPullParser xpp = container.getParser();