Repository: incubator-juneau Updated Branches: refs/heads/master 98ef86f99 -> aa4ab23ad
Fix minor Eclipse classpath issues. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/aa4ab23a Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/aa4ab23a Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/aa4ab23a Branch: refs/heads/master Commit: aa4ab23ad5f06344776732db0d87320d0e34fb52 Parents: 98ef86f Author: jamesbognar <[email protected]> Authored: Tue Aug 2 14:37:26 2016 -0400 Committer: jamesbognar <[email protected]> Committed: Tue Aug 2 14:37:26 2016 -0400 ---------------------------------------------------------------------- org.apache.juneau.client/.classpath | 12 ++++++------ .../.classpath | 12 ++++++------ .../src/test/java/empty.txt | 0 org.apache.juneau.microservice/.classpath | 12 ++++++------ .../src/test/java/empty.txt | 0 org.apache.juneau.samples/.classpath | 14 +++++++------- org.apache.juneau/.classpath | 18 +++++++++--------- 7 files changed, 34 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/aa4ab23a/org.apache.juneau.client/.classpath ---------------------------------------------------------------------- diff --git a/org.apache.juneau.client/.classpath b/org.apache.juneau.client/.classpath index d8744ff..0ab9d57 100755 --- a/org.apache.juneau.client/.classpath +++ b/org.apache.juneau.client/.classpath @@ -6,6 +6,12 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <attributes> <attribute name="maven.pomderived" value="true"/> @@ -19,11 +25,5 @@ </attributes> </classpathentry> <classpathentry combineaccessrules="false" kind="src" path="/org.apache.juneau"/> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"> - <attributes> - <attribute name="optional" value="true"/> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> <classpathentry kind="output" path="target/classes"/> </classpath> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/aa4ab23a/org.apache.juneau.microservice.template/.classpath ---------------------------------------------------------------------- diff --git a/org.apache.juneau.microservice.template/.classpath b/org.apache.juneau.microservice.template/.classpath index 9308111..4a7b4dc 100755 --- a/org.apache.juneau.microservice.template/.classpath +++ b/org.apache.juneau.microservice.template/.classpath @@ -6,6 +6,12 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <attributes> <attribute name="maven.pomderived" value="true"/> @@ -15,12 +21,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/org.apache.juneau.client"/> <classpathentry combineaccessrules="false" kind="src" path="/org.apache.juneau.microservice"/> <classpathentry combineaccessrules="false" kind="src" path="/org.apache.juneau.server"/> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"> - <attributes> - <attribute name="optional" value="true"/> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> <classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <attributes> <attribute name="maven.pomderived" value="true"/> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/aa4ab23a/org.apache.juneau.microservice.template/src/test/java/empty.txt ---------------------------------------------------------------------- diff --git a/org.apache.juneau.microservice.template/src/test/java/empty.txt b/org.apache.juneau.microservice.template/src/test/java/empty.txt new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/aa4ab23a/org.apache.juneau.microservice/.classpath ---------------------------------------------------------------------- diff --git a/org.apache.juneau.microservice/.classpath b/org.apache.juneau.microservice/.classpath index 86e6eda..28e7893 100755 --- a/org.apache.juneau.microservice/.classpath +++ b/org.apache.juneau.microservice/.classpath @@ -6,6 +6,12 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.juneau.server"/> <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.juneau.client"/> <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.juneau"/> @@ -19,11 +25,5 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"> - <attributes> - <attribute name="optional" value="true"/> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> <classpathentry kind="output" path="target/classes"/> </classpath> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/aa4ab23a/org.apache.juneau.microservice/src/test/java/empty.txt ---------------------------------------------------------------------- diff --git a/org.apache.juneau.microservice/src/test/java/empty.txt b/org.apache.juneau.microservice/src/test/java/empty.txt new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/aa4ab23a/org.apache.juneau.samples/.classpath ---------------------------------------------------------------------- diff --git a/org.apache.juneau.samples/.classpath b/org.apache.juneau.samples/.classpath index acc10d9..d14ff0d 100755 --- a/org.apache.juneau.samples/.classpath +++ b/org.apache.juneau.samples/.classpath @@ -6,11 +6,7 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.juneau.microservice"/> - <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.juneau.server"/> - <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.juneau"/> - <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.juneau.client"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> @@ -21,12 +17,16 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> + <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.juneau.microservice"/> + <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.juneau.server"/> + <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.juneau"/> + <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.juneau.client"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/aa4ab23a/org.apache.juneau/.classpath ---------------------------------------------------------------------- diff --git a/org.apache.juneau/.classpath b/org.apache.juneau/.classpath index 75cedcb..fe62c23 100755 --- a/org.apache.juneau/.classpath +++ b/org.apache.juneau/.classpath @@ -6,33 +6,33 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"> + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"> <attributes> - <attribute name="ignore_optional_problems" value="true"/> - <attribute name="optional" value="true"/> <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"> <attributes> + <attribute name="ignore_optional_problems" value="true"/> + <attribute name="optional" value="true"/> <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> + <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> <attributes> <attribute name="maven.pomderived" value="true"/> - <attribute name="org.eclipse.jst.component.nondependency" value=""/> </attributes> </classpathentry> - <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <attributes> <attribute name="maven.pomderived" value="true"/> + <attribute name="org.eclipse.jst.component.nondependency" value=""/> </attributes> </classpathentry> <classpathentry kind="output" path="target/classes"/>
