Skip to content

Commit 6e6e547

Browse files
jbingeljbingel
committed
- pom.xml: removed pluginManagement to enable execution of
generate-sources - Cosmas2QueryProcessor: cleanup
1 parent f7a08ad commit 6e6e547

File tree

2 files changed

+117
-121
lines changed

2 files changed

+117
-121
lines changed

‎pom.xml‎

Lines changed: 117 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -103,126 +103,124 @@
103103
<build>
104104
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
105105
<outputDirectory>${basedir}/target/classes</outputDirectory>
106-
<pluginManagement>
107-
<plugins>
108-
<!-- Formatter plugin for Eclipse based coding conventions http://maven-java-formatter-plugin.googlecode.com/svn/site/0.4/usage.html -->
109-
<plugin>
110-
<groupId>com.googlecode.maven-java-formatter-plugin</groupId>
111-
<artifactId>maven-java-formatter-plugin</artifactId>
112-
<version>0.4</version>
113-
<configuration>
114-
<configFile>${project.basedir}/korap-style.xml</configFile>
115-
<overrideConfigCompilerVersion>true</overrideConfigCompilerVersion>
116-
<compilerSource>1.7</compilerSource>
117-
<compilerCompliance>1.7</compilerCompliance>
118-
<compilerTargetPlatform>1.7</compilerTargetPlatform>
119-
</configuration>
120-
</plugin>
121-
<plugin>
122-
<artifactId>maven-dependency-plugin</artifactId>
123-
<executions>
124-
<execution>
125-
<phase>install</phase>
126-
<goals>
127-
<goal>copy-dependencies</goal>
128-
</goals>
129-
<configuration>
130-
<outputDirectory>${project.build.directory}/../lib</outputDirectory>
131-
</configuration>
132-
</execution>
133-
</executions>
134-
</plugin>
135-
<plugin>
136-
<groupId>org.apache.maven.plugins</groupId>
137-
<artifactId>maven-jar-plugin</artifactId>
138-
<version>2.5</version>
139-
<configuration>
140-
<archive>
141-
<manifest>
142-
<addClasspath>true</addClasspath>
143-
<classpathPrefix>../lib/</classpathPrefix>
144-
<mainClass>de.ids_mannheim.korap.query.serialize.QuerySerializer</mainClass>
145-
</manifest>
146-
</archive>
147-
</configuration>
148-
</plugin>
149-
<plugin>
150-
<!-- This plugin will help to build the ANTLR4 grammar on the fly. The
151-
recipe is based on http://stackoverflow.com/questions/15310628/ customize-maven-to-automatically-create-antlr4-grammar-java-files-on-build -->
152-
<groupId>org.antlr</groupId>
153-
<artifactId>antlr4-maven-plugin</artifactId>
154-
<version>4.1</version>
155-
<executions>
156-
<execution>
157-
<id>poliqarpplus</id>
158-
<goals>
159-
<goal>antlr4</goal>
160-
</goals>
161-
<configuration>
162-
<sourceDirectory>${basedir}/src/main/antlr/poliqarpplus</sourceDirectory>
163-
<outputDirectory>${basedir}/src/main/java/de/ids_mannheim/korap/query/parse/poliqarpplus</outputDirectory>
164-
<libDirectory>${basedir}/src/main/antlr/poliqarpplus</libDirectory>
165-
</configuration>
166-
<phase>generate-sources</phase>
167-
</execution>
168-
<execution>
169-
<id>annis</id>
170-
<goals>
171-
<goal>antlr4</goal>
172-
</goals>
173-
<configuration>
174-
<sourceDirectory>${basedir}/src/main/antlr/annis</sourceDirectory>
175-
<outputDirectory>${basedir}/src/main/java/de/ids_mannheim/korap/query/parse/annis</outputDirectory>
176-
<libDirectory>${basedir}/src/main/antlr/annis</libDirectory>
177-
</configuration>
178-
<phase>generate-sources</phase>
179-
</execution>
180-
<execution>
181-
<id>collection</id>
182-
<goals>
183-
<goal>antlr4</goal>
184-
</goals>
185-
<configuration>
186-
<sourceDirectory>${basedir}/src/main/antlr/collection</sourceDirectory>
187-
<outputDirectory>${basedir}/src/main/java/de/ids_mannheim/korap/query/parse/collection</outputDirectory>
188-
<libDirectory>${basedir}/src/main/antlr/collection</libDirectory>
189-
</configuration>
190-
<phase>generate-sources</phase>
191-
</execution>
192-
</executions>
193-
</plugin>
194-
<plugin>
195-
<!-- This plugin will help to build the ANTLR3 grammar on the fly. The
196-
recipe is based on http://stackoverflow.com/questions/15310628/ customize-maven-to-automatically-create-antlr4-grammar-java-files-on-build -->
197-
<groupId>org.antlr</groupId>
198-
<artifactId>antlr3-maven-plugin</artifactId>
199-
<version>3.5.1</version>
200-
<configuration>
201-
<sourceDirectory>${basedir}/src/main/antlr/cosmas</sourceDirectory>
202-
<outputDirectory>${basedir}/src/main/java/de/ids_mannheim/korap/query/parse/cosmas</outputDirectory>
203-
<libDirectory>${basedir}/src/main/antlr</libDirectory>
204-
</configuration>
106+
<plugins>
107+
<!-- Formatter plugin for Eclipse based coding conventions http://maven-java-formatter-plugin.googlecode.com/svn/site/0.4/usage.html -->
108+
<plugin>
109+
<groupId>com.googlecode.maven-java-formatter-plugin</groupId>
110+
<artifactId>maven-java-formatter-plugin</artifactId>
111+
<version>0.4</version>
112+
<configuration>
113+
<configFile>${project.basedir}/korap-style.xml</configFile>
114+
<overrideConfigCompilerVersion>true</overrideConfigCompilerVersion>
115+
<compilerSource>1.7</compilerSource>
116+
<compilerCompliance>1.7</compilerCompliance>
117+
<compilerTargetPlatform>1.7</compilerTargetPlatform>
118+
</configuration>
119+
</plugin>
120+
<plugin>
121+
<artifactId>maven-dependency-plugin</artifactId>
122+
<executions>
123+
<execution>
124+
<phase>install</phase>
125+
<goals>
126+
<goal>copy-dependencies</goal>
127+
</goals>
128+
<configuration>
129+
<outputDirectory>${project.build.directory}/../lib</outputDirectory>
130+
</configuration>
131+
</execution>
132+
</executions>
133+
</plugin>
134+
<plugin>
135+
<groupId>org.apache.maven.plugins</groupId>
136+
<artifactId>maven-jar-plugin</artifactId>
137+
<version>2.5</version>
138+
<configuration>
139+
<archive>
140+
<manifest>
141+
<addClasspath>true</addClasspath>
142+
<classpathPrefix>../lib/</classpathPrefix>
143+
<mainClass>de.ids_mannheim.korap.query.serialize.QuerySerializer</mainClass>
144+
</manifest>
145+
</archive>
146+
</configuration>
147+
</plugin>
148+
<plugin>
149+
<!-- This plugin will help to build the ANTLR4 grammar on the fly. The
150+
recipe is based on http://stackoverflow.com/questions/15310628/ customize-maven-to-automatically-create-antlr4-grammar-java-files-on-build -->
151+
<groupId>org.antlr</groupId>
152+
<artifactId>antlr4-maven-plugin</artifactId>
153+
<version>4.1</version>
154+
<executions>
155+
<execution>
156+
<id>poliqarpplus</id>
157+
<goals>
158+
<goal>antlr4</goal>
159+
</goals>
160+
<configuration>
161+
<sourceDirectory>${basedir}/src/main/antlr/poliqarpplus</sourceDirectory>
162+
<outputDirectory>${basedir}/src/main/java/de/ids_mannheim/korap/query/parse/poliqarpplus</outputDirectory>
163+
<libDirectory>${basedir}/src/main/antlr/poliqarpplus</libDirectory>
164+
</configuration>
165+
<phase>generate-sources</phase>
166+
</execution>
167+
<execution>
168+
<id>annis</id>
169+
<goals>
170+
<goal>antlr4</goal>
171+
</goals>
172+
<configuration>
173+
<sourceDirectory>${basedir}/src/main/antlr/annis</sourceDirectory>
174+
<outputDirectory>${basedir}/src/main/java/de/ids_mannheim/korap/query/parse/annis</outputDirectory>
175+
<libDirectory>${basedir}/src/main/antlr/annis</libDirectory>
176+
</configuration>
177+
<phase>generate-sources</phase>
178+
</execution>
179+
<execution>
180+
<id>collection</id>
181+
<goals>
182+
<goal>antlr4</goal>
183+
</goals>
184+
<configuration>
185+
<sourceDirectory>${basedir}/src/main/antlr/collection</sourceDirectory>
186+
<outputDirectory>${basedir}/src/main/java/de/ids_mannheim/korap/query/parse/collection</outputDirectory>
187+
<libDirectory>${basedir}/src/main/antlr/collection</libDirectory>
188+
</configuration>
189+
<phase>generate-sources</phase>
190+
</execution>
191+
</executions>
192+
</plugin>
193+
<plugin>
194+
<!-- This plugin will help to build the ANTLR3 grammar on the fly. The
195+
recipe is based on http://stackoverflow.com/questions/15310628/ customize-maven-to-automatically-create-antlr4-grammar-java-files-on-build -->
196+
<groupId>org.antlr</groupId>
197+
<artifactId>antlr3-maven-plugin</artifactId>
198+
<version>3.5.1</version>
199+
<configuration>
200+
<sourceDirectory>${basedir}/src/main/antlr/cosmas</sourceDirectory>
201+
<outputDirectory>${basedir}/src/main/java/de/ids_mannheim/korap/query/parse/cosmas</outputDirectory>
202+
<libDirectory>${basedir}/src/main/antlr</libDirectory>
203+
</configuration>
205204

206-
<executions>
207-
<execution>
208-
<goals>
209-
<goal>antlr</goal>
210-
</goals>
211-
<phase>generate-sources</phase>
212-
</execution>
213-
</executions>
205+
<executions>
206+
<execution>
207+
<goals>
208+
<goal>antlr</goal>
209+
</goals>
210+
<phase>generate-sources</phase>
211+
</execution>
212+
</executions>
214213

215-
</plugin>
216-
<plugin>
217-
<artifactId>maven-compiler-plugin</artifactId>
218-
<version>2.3.2</version>
219-
<configuration>
220-
<source>1.7</source>
221-
<target>1.7</target>
222-
<!-- excludes> <exclude>**/CosmasTree.java</exclude> </excludes -->
223-
</configuration>
224-
</plugin>
225-
</plugins>
226-
</pluginManagement>
214+
</plugin>
215+
<plugin>
216+
<artifactId>maven-compiler-plugin</artifactId>
217+
<version>2.3.2</version>
218+
<configuration>
219+
<source>1.7</source>
220+
<target>1.7</target>
221+
<!-- excludes> <exclude>**/CosmasTree.java</exclude> </excludes -->
222+
</configuration>
223+
</plugin>
224+
</plugins>
227225
</build>
228226
</project>

‎src/main/java/de/ids_mannheim/korap/query/serialize/Cosmas2QueryProcessor.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -599,10 +599,8 @@ else if (direction.equals("both")) {
599599
|| openNodeCats.get(1).equals("OPEND")
600600
|| inOPALL
601601
|| openNodeCats.get(1).equals("OPNHIT"))) {
602-
System.err.println(classCounter);
603602
wrapOperandInClass(node, 1, 128+classCounter);
604603
wrapOperandInClass(node, 2, 128+classCounter);
605-
System.err.println(classCounter);
606604
// Deactivated, uncomment to wrap sequence in reference.
607605
// group = KoralObjectGenerator.wrapInReference(group,
608606
// classCounter++);

0 commit comments

Comments
 (0)