summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2012-05-30 17:42:59 +0200
committerAndrew Branson <andrew.branson@cern.ch>2012-05-30 17:42:59 +0200
commit5c78664a60fb490fc695859229d362261e14df64 (patch)
tree018221e8e74cd7e0bdf6854edcde9d0e153533ce
parentb086f57f56bf0eb9dab9cf321a0f69aaaae84347 (diff)
Auto set classpath in eclipse for generated source. Requires build
helper plugin.
-rw-r--r--.classpath8
-rw-r--r--pom.xml37
2 files changed, 41 insertions, 4 deletions
diff --git a/.classpath b/.classpath
index 1eb22e5..04034f2 100644
--- a/.classpath
+++ b/.classpath
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry kind="src" path="target/generated-sources/idl"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" output="target/classes" path="target/generated-sources/idl">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/pom.xml b/pom.xml
index 79d104c..45fa6ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>cristal-kernel</groupId>
+ <groupId>cristal</groupId>
<artifactId>cristal-kernel</artifactId>
<version>2.3.1</version>
<name>cristal-kernel</name>
@@ -14,6 +14,12 @@
<dependency>
<groupId>org.codehaus.castor</groupId>
<artifactId>castor-xml-schema</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>stax</artifactId>
+ <groupId>stax</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.python</groupId>
@@ -131,12 +137,39 @@
<prefix>com.c2kernel</prefix>
</packagePrefix>
</packagePrefixes>
- <compatible>false</compatible>
+ <compatible>false</compatible>
</source>
</sources>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin> <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/generated-sources/idl/</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
+
<resources>
<resource>
<directory>src/main/resources</directory>