Commit 2a2b1deb authored by Fred Eisele's avatar Fred Eisele
Browse files

updating antlr parser

parent ebf7e41e

pom.xml

+22 −8
Changes for pom.xml: 22 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ 
    </properties>

    <repositories>

        <repository>

            <id>babeloff</id>

            <url>https://github.com/babeloff/mvn-repo/raw/master/releases</url>

          <id>release</id>

          <url>https://nexus.isis.vanderbilt.edu/repository/maven-releases</url>

        </repository>

        <repository>

            <id>babeloff-snapshots</id>

            <url>https://github.com/babeloff/mvn-repo/raw/master/snapshots</url>

          <id>snapshot</id>

          <url>https://nexus.isis.vanderbilt.edu/repository/maven-snapshots</url>

        </repository>

    </repositories>

    <build>
@@ -75,7 +75,7 @@ 
            <plugin>

                <groupId>org.apache.maven.plugins</groupId>

                <artifactId>maven-compiler-plugin</artifactId>

                <version>3.6.2</version>

                <version>3.7.0</version>

                <configuration>

                    <source>${maven.compiler.source}</source>

                    <target>${maven.compiler.target}</target>
@@ -97,6 +97,7 @@ 
            <!-- Build a standalone FQL jar containing all libraries when 'package' is executed. -->

            <plugin>

                <artifactId>maven-assembly-plugin</artifactId>

                <version>3.1.0</version>

                <configuration>

                    <archive>

                        <manifest>
@@ -104,9 +105,10 @@ 
                            <!-- your further configuration here -->

                        </manifest>

                    </archive>

                    <descriptorRefs>

                        <descriptorRef>jar-with-dependencies</descriptorRef>

                    </descriptorRefs>

                    <descriptors>

                      <descriptor>src/assembly/bin.xml</descriptor>

                      <descriptor>src/assembly/jar-with-deps.xml</descriptor>

                    </descriptors>

                </configuration>

                <executions>

                    <execution>
@@ -147,6 +149,18 @@ 
            </plugin>

        </plugins>

    </build>

    <distributionManagement>

      <repository>

        <id>release</id>

        <name>Release</name>

        <url>https://nexus.isis.vanderbilt.edu/repository/maven-releases</url>

      </repository>

      <snapshotRepository>

        <id>dsnapshot</id>

        <name>Snapshot</name>

        <url>https://nexus.isis.vanderbilt.edu/repository/maven-snapshots</url>

      </snapshotRepository>

    </distributionManagement>

    <dependencies>

        <dependency>

            <groupId>net.sourceforge.collections</groupId>

resources/examples/aql/Constraints.aql

+1 −1
Changes for resources/examples/aql/Constraints.aql: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ instance J = chase theEDs I 


command JisOk1 = check theEDs J //verify the chased instance satisfies the EDs



//pragma InotOk = check theEDs I //the input instance does not satisfy the EDs

//command InotOk = check theEDs I //the input instance does not satisfy the EDs



///////////////////////////////////////////////////////////////////////////

//primary key constraints

resources/examples/aql/JDBC SQL.aql

+1 −1
Changes for resources/examples/aql/JDBC SQL.aql: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ command view2 = exec_jdbc "" "" { 
}



//to import all the data in a SQL DB at once onto an auto-generated schema, use the following:

instance import_all = import_jdbc_all "" "" 

instance import_all_inst = import_jdbc_all "" "" 

//the schema can be obtained as

schema import_all_schema = schemaOf import_all

//or

src/assembly/bin.xml

0 → 100644
+32 −0
Changes for src/assembly/bin.xml: 32 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"

  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">

  <id>bin</id>

  <formats>

    <format>tar.gz</format>

    <format>tar.bz2</format>

    <format>zip</format>

  </formats>

  <fileSets>

    <fileSet>

      <directory>${project.basedir}</directory>

      <outputDirectory>/</outputDirectory>

      <includes>

        <include>README*</include>

        <include>LICENSE*</include>

        <include>NOTICE*</include>

      </includes>

    </fileSet>

    <fileSet>

      <directory>${project.build.directory}</directory>

      <outputDirectory>/</outputDirectory>

      <includes>

        <include>*.jar</include>

      </includes>

    </fileSet>

    <fileSet>

      <directory>${project.build.directory}/site</directory>

      <outputDirectory>docs</outputDirectory>

    </fileSet>

  </fileSets>

</assembly>

src/assembly/jar-with-deps.xml

0 → 100644
+17 −0
Changes for src/assembly/jar-with-deps.xml: 17 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"

  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">

  <id>jar-with-deps</id>

  <formats>

    <format>jar</format>

  </formats>

  <includeBaseDirectory>false</includeBaseDirectory>

  <dependencySets>

    <dependencySet>

      <outputDirectory>/</outputDirectory>

      <useProjectArtifact>true</useProjectArtifact>

      <unpack>true</unpack>

      <scope>runtime</scope>

    </dependencySet>

  </dependencySets>

</assembly>