You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2011/11/23 21:44:36 UTC

svn commit: r1205577 - in /incubator/jena/Jena2/IRI/trunk/src/main/java/com/hp/hpl/jena/iri/impl: AbsLexer.java BuildViolationCodes.java PatternCompiler.java

Author: andy
Date: Wed Nov 23 20:44:36 2011
New Revision: 1205577

URL: http://svn.apache.org/viewvc?rev=1205577&view=rev
Log:
Fix file names used for the input files to JFlex.

Modified:
    incubator/jena/Jena2/IRI/trunk/src/main/java/com/hp/hpl/jena/iri/impl/AbsLexer.java
    incubator/jena/Jena2/IRI/trunk/src/main/java/com/hp/hpl/jena/iri/impl/BuildViolationCodes.java
    incubator/jena/Jena2/IRI/trunk/src/main/java/com/hp/hpl/jena/iri/impl/PatternCompiler.java

Modified: incubator/jena/Jena2/IRI/trunk/src/main/java/com/hp/hpl/jena/iri/impl/AbsLexer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/IRI/trunk/src/main/java/com/hp/hpl/jena/iri/impl/AbsLexer.java?rev=1205577&r1=1205576&r2=1205577&view=diff
==============================================================================
--- incubator/jena/Jena2/IRI/trunk/src/main/java/com/hp/hpl/jena/iri/impl/AbsLexer.java (original)
+++ incubator/jena/Jena2/IRI/trunk/src/main/java/com/hp/hpl/jena/iri/impl/AbsLexer.java Wed Nov 23 20:44:36 2011
@@ -235,8 +235,8 @@ abstract class AbsLexer implements Viola
     static private long start;   
     static public void main(String args[]) throws IOException {
         start = System.currentTimeMillis();
-        // out = new FileWriter("src/com/hp/hpl/jena/iri/impl/iri2.jflex");
-        // copy("src/com/hp/hpl/jena/iri/impl/iri.jflex");
+        // out = new FileWriter("src/main/java/com/hp/hpl/jena/iri/impl/iri2.jflex");
+        // copy("src/main/java/com/hp/hpl/jena/iri/impl/iri.jflex");
         outRules("scheme");
         outRules("userinfo");
         outRules("xhost");
@@ -247,7 +247,7 @@ abstract class AbsLexer implements Viola
         // out.close();
         //        
         // JFlex.Main.main(new
-        // String[]{"src/com/hp/hpl/jena/iri/impl/iri2.jflex"});
+        // String[]{"src/main/java/com/hp/hpl/jena/iri/impl/iri2.jflex"});
         System.out.println(System.currentTimeMillis() - start);
     }
 
@@ -268,7 +268,7 @@ abstract class AbsLexer implements Viola
 
     static private void outRules(String name) throws IOException {
 //        count = 0;
-        String jflexFile = "src/com/hp/hpl/jena/iri/impl/"+name+".jflex";
+        String jflexFile = "src/main/java/com/hp/hpl/jena/iri/impl/"+name+".jflex";
         
         if (name.equals("scheme")|| name.equals("port")) {
             
@@ -276,13 +276,10 @@ abstract class AbsLexer implements Viola
             out = new FileWriter("tmp.jflex");
             copy(jflexFile);
             jflexFile = "tmp.jflex";
-            copy("src/com/hp/hpl/jena/iri/impl/xchar.jflex");
+            copy("src/main/java/com/hp/hpl/jena/iri/impl/xchar.jflex");
             out.close();
         }
-        runJFlex(
-//        JFlex.Main
-//                .main(
-                		new String[] { "-d", "src/com/hp/hpl/jena/iri/impl", jflexFile });
+        runJFlex(new String[] { "-d", "src/main/java/com/hp/hpl/jena/iri/impl", jflexFile });
         System.out.println(System.currentTimeMillis() - start);
 
     }

Modified: incubator/jena/Jena2/IRI/trunk/src/main/java/com/hp/hpl/jena/iri/impl/BuildViolationCodes.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/IRI/trunk/src/main/java/com/hp/hpl/jena/iri/impl/BuildViolationCodes.java?rev=1205577&r1=1205576&r2=1205577&view=diff
==============================================================================
--- incubator/jena/Jena2/IRI/trunk/src/main/java/com/hp/hpl/jena/iri/impl/BuildViolationCodes.java (original)
+++ incubator/jena/Jena2/IRI/trunk/src/main/java/com/hp/hpl/jena/iri/impl/BuildViolationCodes.java Wed Nov 23 20:44:36 2011
@@ -39,11 +39,11 @@ public class BuildViolationCodes {
     public static void main(String[] args) throws TransformerException, TransformerFactoryConfigurationError {
         Transformer xsl =
         TransformerFactory.newInstance().newTransformer(
-                new StreamSource(new File("src/com/hp/hpl/jena/iri/impl/viol2java.xsl"))
+                new StreamSource(new File("src/main/java/com/hp/hpl/jena/iri/impl/viol2java.xsl"))
                 );
         xsl.transform(
-                new StreamSource(new File("src/com/hp/hpl/jena/iri/impl/violations.xml")),
-                new StreamResult(new File("src/com/hp/hpl/jena/iri/ViolationCodes.java"))
+                new StreamSource(new File("src/main/java/com/hp/hpl/jena/iri/impl/violations.xml")),
+                new StreamResult(new File("src/main/java/com/hp/hpl/jena/iri/ViolationCodes.java"))
                         
         );
         

Modified: incubator/jena/Jena2/IRI/trunk/src/main/java/com/hp/hpl/jena/iri/impl/PatternCompiler.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/IRI/trunk/src/main/java/com/hp/hpl/jena/iri/impl/PatternCompiler.java?rev=1205577&r1=1205576&r2=1205577&view=diff
==============================================================================
--- incubator/jena/Jena2/IRI/trunk/src/main/java/com/hp/hpl/jena/iri/impl/PatternCompiler.java (original)
+++ incubator/jena/Jena2/IRI/trunk/src/main/java/com/hp/hpl/jena/iri/impl/PatternCompiler.java Wed Nov 23 20:44:36 2011
@@ -397,8 +397,8 @@ static VarPattern unreservedDNSLabel[] =
 
     static public void main(String args[]) throws IOException {
         start = System.currentTimeMillis();
-        // out = new FileWriter("src/com/hp/hpl/jena/iri/impl/iri2.jflex");
-        // copy("src/com/hp/hpl/jena/iri/impl/iri.jflex");
+        // out = new FileWriter("src/main/java/com/hp/hpl/jena/iri/impl/iri2.jflex");
+        // copy("src/main/java/com/hp/hpl/jena/iri/impl/iri.jflex");
 //        outRules("scheme");
 //        outRules("userinfo");
         outRules("host");
@@ -409,7 +409,7 @@ static VarPattern unreservedDNSLabel[] =
         // out.close();
         //        
         // JFlex.Main.main(new
-        // String[]{"src/com/hp/hpl/jena/iri/impl/iri2.jflex"});
+        // String[]{"src/main/java/com/hp/hpl/jena/iri/impl/iri2.jflex"});
         System.out.println(System.currentTimeMillis() - start);
     }
 
@@ -485,8 +485,8 @@ static VarPattern unreservedDNSLabel[] =
     static private void outRules(String name) throws IOException {
         count = 0;
         // if (true) throw new RuntimeException();
-        out = new FileWriter("src/com/hp/hpl/jena/iri/impl/"+name+".jflex");
-        copy("src/com/hp/hpl/jena/iri/impl/iri.jflex");
+        out = new FileWriter("src/main/java/com/hp/hpl/jena/iri/impl/"+name+".jflex");
+        copy("src/main/java/com/hp/hpl/jena/iri/impl/iri.jflex");
         out.write("%class Lexer");
         out.write(name.substring(0, 1).toUpperCase());
         out.write(name.substring(1));
@@ -508,7 +508,7 @@ static VarPattern unreservedDNSLabel[] =
         System.out.println(name + ": " + count + " expansions");
         out.close();
 
-        AbsLexer.runJFlex(new String[] { "src/com/hp/hpl/jena/iri/impl/"+name+".jflex" });
+        AbsLexer.runJFlex(new String[] { "src/main/java/com/hp/hpl/jena/iri/impl/"+name+".jflex" });
         System.out.println(System.currentTimeMillis() - start);
 
     }