Svante, I am concerned that you replaced an Apache Licensed dependency with one with an unknown license. [1]
This is something that requires discussion. [1] https://github.com/shellac/java-rdfa/releases/tag/0.4.2 Regards, Dave On Sep 11, 2013, at 12:16 PM, [email protected] wrote: > Author: svanteschubert > Date: Wed Sep 11 19:16:06 2013 > New Revision: 1521993 > > URL: http://svn.apache.org/r1521993 > Log: > Exchanging clerezza dependency with original java-rdfa project (SAX-based > java RDFa parser) > > Modified: > incubator/odf/trunk/odfdom/pom.xml > > incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfFileSaxHandler.java > > incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/Util.java > > incubator/odf/trunk/odfdom/src/test/java/org/odftoolkit/odfdom/pkg/GRDDLTest.java > > Modified: incubator/odf/trunk/odfdom/pom.xml > URL: > http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/pom.xml?rev=1521993&r1=1521992&r2=1521993&view=diff > ============================================================================== > --- incubator/odf/trunk/odfdom/pom.xml (original) > +++ incubator/odf/trunk/odfdom/pom.xml Wed Sep 11 19:16:06 2013 > @@ -62,9 +62,9 @@ > <scope>test</scope> > </dependency> > <dependency> > - <groupId>org.apache.clerezza</groupId> > - <artifactId>rdf.rdfa</artifactId> > - <version>0.1-incubating</version> > + <groupId>net.rootdev</groupId> > + <artifactId>java-rdfa</artifactId> > + <version>0.4.2</version> > </dependency> > <dependency> > <groupId>commons-validator</groupId> > > Modified: > incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfFileSaxHandler.java > URL: > http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfFileSaxHandler.java?rev=1521993&r1=1521992&r2=1521993&view=diff > ============================================================================== > --- > incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfFileSaxHandler.java > (original) > +++ > incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfFileSaxHandler.java > Wed Sep 11 19:16:06 2013 > @@ -23,7 +23,6 @@ package org.odftoolkit.odfdom.pkg; > > import java.io.IOException; > import java.util.Stack; > -import net.rootdev.javardfa.StatementSink; > import org.odftoolkit.odfdom.pkg.rdfa.JenaSink; > import org.w3c.dom.Element; > import org.w3c.dom.Node; > > Modified: > incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/Util.java > URL: > http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/Util.java?rev=1521993&r1=1521992&r2=1521993&view=diff > ============================================================================== > --- > incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/Util.java > (original) > +++ > incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/Util.java > Wed Sep 11 19:16:06 2013 > @@ -22,11 +22,12 @@ > package org.odftoolkit.odfdom.pkg.rdfa; > > import java.net.URI; > +import java.net.URISyntaxException; > +import java.util.logging.Level; > +import java.util.logging.Logger; > > import javax.xml.XMLConstants; > import javax.xml.namespace.QName; > -import org.apache.clerezza.utils.UriException; > -import org.apache.clerezza.utils.UriUtil; > > public class Util { > > @@ -135,10 +136,11 @@ public class Util { > sb.append('#'); > sb.append(u.getFragment()); > } > - String ret = sb.toString(); > + String ret = sb.toString(); > try { > - ret = UriUtil.encodePath(ret); > - } catch (UriException e) { > + ret = new URI(ret).toASCIIString(); > + } catch (URISyntaxException ex) { > + > Logger.getLogger(Util.class.getName()).log(Level.SEVERE, null, ex); > } > return ret; > } > > Modified: > incubator/odf/trunk/odfdom/src/test/java/org/odftoolkit/odfdom/pkg/GRDDLTest.java > URL: > http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/test/java/org/odftoolkit/odfdom/pkg/GRDDLTest.java?rev=1521993&r1=1521992&r2=1521993&view=diff > ============================================================================== > --- > incubator/odf/trunk/odfdom/src/test/java/org/odftoolkit/odfdom/pkg/GRDDLTest.java > (original) > +++ > incubator/odf/trunk/odfdom/src/test/java/org/odftoolkit/odfdom/pkg/GRDDLTest.java > Wed Sep 11 19:16:06 2013 > @@ -42,8 +42,9 @@ import org.xml.sax.InputSource; > > import com.hp.hpl.jena.rdf.model.Model; > import com.hp.hpl.jena.rdf.model.test.ModelTestBase; > -import com.ibm.icu.impl.Assert; > + > import java.util.logging.Level; > +import org.junit.Assert; > > public class GRDDLTest extends ModelTestBase { > > >
