Skip to content

Commit e66edcf

Browse files
author
Mike Krumlauf
committed
Reorganized project for Maven build; cmake not yet reconfigured
1 parent c288f8a commit e66edcf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+13852
-13782
lines changed

Diff for: ‎.classpath

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" output="target/classes" path="src/main/java">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="src" output="target/classes" path="target/generated-sources/antlr3">
10+
<attributes>
11+
<attribute name="optional" value="true"/>
12+
<attribute name="maven.pomderived" value="true"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/resources"/>
16+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
17+
<attributes>
18+
<attribute name="optional" value="true"/>
19+
<attribute name="maven.pomderived" value="true"/>
20+
</attributes>
21+
</classpathentry>
22+
<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
23+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
24+
<attributes>
25+
<attribute name="maven.pomderived" value="true"/>
26+
</attributes>
27+
</classpathentry>
28+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
29+
<attributes>
30+
<attribute name="maven.pomderived" value="true"/>
31+
</attributes>
32+
</classpathentry>
33+
<classpathentry kind="output" path="target/classes"/>
34+
</classpath>

Diff for: ‎.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
target
2+
.settings/
3+
*.log
4+
.idea/
5+
*.iml
6+
*.eml

Diff for: ‎.project

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>jdbcdriver</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
22+
</natures>
23+
</projectDescription>

Diff for: ‎pom.xml

+132-124
Original file line numberDiff line numberDiff line change
@@ -1,135 +1,143 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>org.hpccsystems</groupId>
5-
<artifactId>jdbcdriver</artifactId>
6-
<version>0.2.2-SNAPSHOT</version>
7-
<packaging>jar</packaging>
8-
<name>HPCC Systems Java JDBC Driver</name>
9-
<description>JDBC Driver for HPCC Systems - access HPCC data via SQL in Java or other JVM language</description>
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>org.hpccsystems</groupId>
5+
<artifactId>jdbcdriver</artifactId>
6+
<version>0.2.2-SNAPSHOT</version>
7+
<packaging>jar</packaging>
8+
<name>HPCC Systems Java JDBC Driver</name>
9+
<description>JDBC Driver for HPCC Systems - access HPCC data via SQL in Java or other JVM language</description>
1010

11-
<parent>
12-
<groupId>org.sonatype.oss</groupId>
13-
<artifactId>oss-parent</artifactId>
14-
<version>7</version>
15-
</parent>
11+
<parent>
12+
<groupId>org.sonatype.oss</groupId>
13+
<artifactId>oss-parent</artifactId>
14+
<version>7</version>
15+
</parent>
1616

17-
<url>http://hpccsystems.com</url>
17+
<url>http://hpccsystems.com</url>
1818

19-
<licenses>
20-
<license>
21-
<name>Apache License, Version 2.0</name>
22-
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
23-
<distribution>repo</distribution>
24-
</license>
25-
</licenses>
19+
<licenses>
20+
<license>
21+
<name>Apache License, Version 2.0</name>
22+
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
23+
<distribution>repo</distribution>
24+
</license>
25+
</licenses>
2626

27-
<scm>
28-
<url>[email protected]/hpcc-systems/hpcc-jdbc.git</url>
29-
<connection>scm:git:[email protected]/hpcc-systems/hpcc-jdbc.git</connection>
30-
<developerConnection>scm:git:[email protected]/hpcc-systems/hpcc-jdbc.git</developerConnection>
31-
</scm>
27+
<scm>
28+
<url>[email protected]/hpcc-systems/hpcc-jdbc.git</url>
29+
<connection>scm:git:[email protected]/hpcc-systems/hpcc-jdbc.git</connection>
30+
<developerConnection>scm:git:[email protected]/hpcc-systems/hpcc-jdbc.git</developerConnection>
31+
</scm>
3232

33-
<developers>
34-
<developer>
35-
<id>rpastrana</id>
36-
<name>Rodrigo Pastrana</name>
37-
<email>rodrigo dot pastrana at lexisnexis dot com</email>
38-
</developer>
39-
<developer>
40-
<id>mkrumlauf</id>
41-
<name>Mike Krumlauf</name>
42-
<email>mjkrumlauf at computer dot org</email>
43-
</developer>
44-
</developers>
33+
<developers>
34+
<developer>
35+
<id>rpastrana</id>
36+
<name>Rodrigo Pastrana</name>
37+
<email>rodrigo dot pastrana at lexisnexis dot com</email>
38+
</developer>
39+
<developer>
40+
<id>mkrumlauf</id>
41+
<name>Mike Krumlauf</name>
42+
<email>mjkrumlauf at computer dot org</email>
43+
</developer>
44+
</developers>
4545

46-
<properties>
47-
<maven.compiler.plugin.version>3.0</maven.compiler.plugin.version>
48-
<maven.javadoc.plugin.version>2.9</maven.javadoc.plugin.version>
49-
<maven.source.plugin.version>2.2.1</maven.source.plugin.version>
50-
<junit.version>4.11</junit.version>
51-
<surefire.version>2.11</surefire.version>
52-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
53-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
54-
</properties>
46+
<properties>
47+
<maven.compiler.plugin.version>3.0</maven.compiler.plugin.version>
48+
<maven.javadoc.plugin.version>2.9</maven.javadoc.plugin.version>
49+
<maven.source.plugin.version>2.2.1</maven.source.plugin.version>
50+
<junit.version>4.11</junit.version>
51+
<surefire.version>2.11</surefire.version>
52+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
53+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
54+
</properties>
5555

56-
<build>
57-
<sourceDirectory>src</sourceDirectory>
58-
<testSourceDirectory>src/org/hpccsystems/jdbcdriver/tests</testSourceDirectory>
59-
<plugins>
60-
<plugin>
61-
<groupId>org.apache.maven.plugins</groupId>
62-
<artifactId>maven-compiler-plugin</artifactId>
63-
<version>${maven.compiler.plugin.version}</version>
64-
<configuration>
65-
<source>1.6</source>
66-
<target>1.6</target>
67-
<excludes>
68-
<exclude>org/hpccsystems/jdbcdriver/tests/**</exclude>
69-
</excludes>
70-
</configuration>
71-
<executions>
72-
<execution>
73-
<phase>compile</phase>
74-
<goals>
75-
<goal>compile</goal>
76-
</goals>
77-
</execution>
78-
</executions>
79-
</plugin>
80-
<plugin>
81-
<groupId>org.codehaus.mojo</groupId>
82-
<artifactId>antlr3-maven-plugin</artifactId>
83-
<version>1.0</version>
84-
<executions>
85-
<execution>
86-
<goals>
87-
<goal>antlr</goal>
88-
</goals>
89-
</execution>
90-
</executions>
91-
</plugin>
92-
<plugin>
93-
<groupId>org.apache.maven.plugins</groupId>
94-
<artifactId>maven-source-plugin</artifactId>
95-
<version>${maven.source.plugin.version}</version>
96-
<executions>
97-
<execution>
98-
<id>attach-sources</id>
99-
<goals>
100-
<goal>jar</goal>
101-
</goals>
102-
</execution>
103-
</executions>
104-
</plugin>
105-
<plugin>
106-
<groupId>org.apache.maven.plugins</groupId>
107-
<artifactId>maven-javadoc-plugin</artifactId>
108-
<version>${maven.javadoc.plugin.version}</version>
109-
<executions>
110-
<execution>
111-
<id>attach-javadocs</id>
112-
<goals>
113-
<goal>jar</goal>
114-
</goals>
115-
</execution>
116-
</executions>
117-
</plugin>
118-
</plugins>
119-
</build>
56+
<build>
57+
<plugins>
58+
<plugin>
59+
<groupId>org.codehaus.mojo</groupId>
60+
<artifactId>build-helper-maven-plugin</artifactId>
61+
<version>1.7</version>
62+
<executions>
63+
<execution>
64+
<id>add-source</id>
65+
<phase>generate-sources</phase>
66+
<goals>
67+
<goal>add-source</goal>
68+
</goals>
69+
<configuration>
70+
<sources>
71+
<source>target/generated-sources/antlr3</source>
72+
</sources>
73+
</configuration>
74+
</execution>
75+
</executions>
76+
</plugin>
77+
<plugin>
78+
<groupId>org.antlr</groupId>
79+
<artifactId>antlr3-maven-plugin</artifactId>
80+
<version>3.5</version>
81+
<executions>
82+
<execution>
83+
<goals>
84+
<goal>antlr</goal>
85+
</goals>
86+
</execution>
87+
</executions>
88+
</plugin>
89+
<plugin>
90+
<groupId>org.apache.maven.plugins</groupId>
91+
<artifactId>maven-compiler-plugin</artifactId>
92+
<version>${maven.compiler.plugin.version}</version>
93+
<configuration>
94+
<source>1.6</source>
95+
<target>1.6</target>
96+
</configuration>
97+
<!-- <executions> <execution> <phase>compile</phase> <goals> <goal>compile</goal>
98+
</goals> </execution> </executions> -->
99+
</plugin>
100+
<plugin>
101+
<groupId>org.apache.maven.plugins</groupId>
102+
<artifactId>maven-source-plugin</artifactId>
103+
<version>${maven.source.plugin.version}</version>
104+
<executions>
105+
<execution>
106+
<id>attach-sources</id>
107+
<goals>
108+
<goal>jar</goal>
109+
</goals>
110+
</execution>
111+
</executions>
112+
</plugin>
113+
<plugin>
114+
<groupId>org.apache.maven.plugins</groupId>
115+
<artifactId>maven-javadoc-plugin</artifactId>
116+
<version>${maven.javadoc.plugin.version}</version>
117+
<executions>
118+
<execution>
119+
<id>attach-javadocs</id>
120+
<goals>
121+
<goal>jar</goal>
122+
</goals>
123+
</execution>
124+
</executions>
125+
</plugin>
126+
</plugins>
127+
</build>
120128

121-
<dependencies>
122-
<dependency>
123-
<groupId>junit</groupId>
124-
<artifactId>junit</artifactId>
125-
<version>${junit.version}</version>
126-
<scope>test</scope>
127-
</dependency>
128-
<dependency>
129-
<groupId>org.antlr</groupId>
130-
<artifactId>antlr-runtime</artifactId>
131-
<version>3.0.1</version>
132-
</dependency>
133-
</dependencies>
129+
<dependencies>
130+
<dependency>
131+
<groupId>junit</groupId>
132+
<artifactId>junit</artifactId>
133+
<version>${junit.version}</version>
134+
<scope>test</scope>
135+
</dependency>
136+
<dependency>
137+
<groupId>org.antlr</groupId>
138+
<artifactId>antlr-runtime</artifactId>
139+
<version>3.5</version>
140+
</dependency>
141+
</dependencies>
134142

135143
</project>

Diff for: ‎src/org/hpccsystems/jdbcdriver/antlr/grammar/SQLExpression.g renamed to ‎src/main/antlr3/org/hpccsystems/jdbcdriver/antlr/sqlparser/SQLExpression.g

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ tokens
2020

2121
@header
2222
{
23-
package org.hpccsystems.jdbcdriver.antlr.sqlparser.generated;
23+
package org.hpccsystems.jdbcdriver.antlr.sqlparser;
2424
}
2525

2626
@members
@@ -34,7 +34,7 @@ package org.hpccsystems.jdbcdriver.antlr.sqlparser.generated;
3434

3535
@lexer::header
3636
{
37-
package org.hpccsystems.jdbcdriver.antlr.sqlparser.generated;
37+
package org.hpccsystems.jdbcdriver.antlr.sqlparser;
3838
}
3939

4040
@lexer::members

Diff for: ‎src/org/hpccsystems/jdbcdriver/CMakeLists.txt renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/CMakeLists.txt

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/DFUFile.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/DFUFile.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/ECLEngine.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/ECLEngine.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/ECLFunction.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/ECLFunction.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/ECLFunctions.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/ECLFunctions.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/HPCCColumn.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/HPCCColumn.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/HPCCColumnMetaData.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/HPCCColumnMetaData.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/HPCCConnection.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/HPCCConnection.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/HPCCDatabaseMetaData.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/HPCCDatabaseMetaData.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/HPCCDriver.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/HPCCDriver.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/HPCCJDBCLogFormatter.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/HPCCJDBCLogFormatter.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/HPCCJDBCStdOutConsoleHandler.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/HPCCJDBCStdOutConsoleHandler.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/HPCCJDBCUtils.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/HPCCJDBCUtils.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/HPCCLogicalFiles.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/HPCCLogicalFiles.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/HPCCPreparedStatement.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/HPCCPreparedStatement.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/HPCCQueries.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/HPCCQueries.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/HPCCQuery.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/HPCCQuery.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/HPCCResultSet.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/HPCCResultSet.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/HPCCResultSetMetadata.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/HPCCResultSetMetadata.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/HPCCStatement.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/HPCCStatement.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/HPCCVersionTracker.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/HPCCVersionTracker.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/HPCCVersionTracker.java.in renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/HPCCVersionTracker.java.in

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/SQLColumn.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/SQLColumn.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/SQLJoinClause.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/SQLJoinClause.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/SQLParser.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/SQLParser.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/SQLTable.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/SQLTable.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/antlr/sqlparser/SQLBinaryExpression.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/antlr/sqlparser/SQLBinaryExpression.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/antlr/sqlparser/SQLExpression.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/antlr/sqlparser/SQLExpression.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ HPCC SYSTEMS software Copyright (C) 2013 HPCC Systems.
3333
import org.hpccsystems.jdbcdriver.antlr.sqlparser.SQLBinaryExpression.SQLBinaryExpressionType;
3434
import org.hpccsystems.jdbcdriver.antlr.sqlparser.SQLUnaryExpression.SQLUnaryExpressionType;
3535
import org.hpccsystems.jdbcdriver.antlr.sqlparser.SQLValueExpression.SQLValueType;
36-
import org.hpccsystems.jdbcdriver.antlr.sqlparser.generated.SQLExpressionLexer;
37-
import org.hpccsystems.jdbcdriver.antlr.sqlparser.generated.SQLExpressionParser;
36+
import org.hpccsystems.jdbcdriver.antlr.sqlparser.SQLExpressionLexer;
37+
import org.hpccsystems.jdbcdriver.antlr.sqlparser.SQLExpressionParser;
3838

3939

4040
public abstract class SQLExpression

Diff for: ‎src/org/hpccsystems/jdbcdriver/antlr/sqlparser/SQLFieldValueExpression.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/antlr/sqlparser/SQLFieldValueExpression.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/antlr/sqlparser/SQLFunctionExpression.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/antlr/sqlparser/SQLFunctionExpression.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/antlr/sqlparser/SQLParameterPlaceHolderExpression.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/antlr/sqlparser/SQLParameterPlaceHolderExpression.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/antlr/sqlparser/SQLParenthesisExpression.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/antlr/sqlparser/SQLParenthesisExpression.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/antlr/sqlparser/SQLUnaryExpression.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/antlr/sqlparser/SQLUnaryExpression.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/antlr/sqlparser/SQLValueExpression.java renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/antlr/sqlparser/SQLValueExpression.java

File renamed without changes.

Diff for: ‎src/org/hpccsystems/jdbcdriver/antlr/sqlparser/generated/SQLExpression.tokens renamed to ‎src/main/java/org/hpccsystems/jdbcdriver/antlr/sqlparser/generated/SQLExpression.tokens

File renamed without changes.

0 commit comments

Comments
 (0)