You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2016/08/09 14:44:10 UTC

incubator-juneau git commit: Fix classpath file issues.

Repository: incubator-juneau
Updated Branches:
  refs/heads/master 3de78cf7b -> 90078f267


Fix classpath file 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/90078f26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/90078f26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/90078f26

Branch: refs/heads/master
Commit: 90078f267cb8079ef848cd826c66ec952a06cd1b
Parents: 3de78cf
Author: James <ja...@salesforce.com>
Authored: Tue Aug 9 10:43:53 2016 -0400
Committer: James <ja...@salesforce.com>
Committed: Tue Aug 9 10:43:53 2016 -0400

----------------------------------------------------------------------
 org.apache.juneau.samples/.classpath     |  1 -
 org.apache.juneau.server.test/.classpath | 10 +++++-----
 org.apache.juneau.server/.classpath      |  1 -
 3 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/90078f26/org.apache.juneau.samples/.classpath
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/.classpath b/org.apache.juneau.samples/.classpath
index 1f18766..b53bcdf 100644
--- a/org.apache.juneau.samples/.classpath
+++ b/org.apache.juneau.samples/.classpath
@@ -3,7 +3,6 @@
   <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
-  <classpathentry kind="src" path="target/maven-shared-archive-resources" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="var" path="M2_REPO/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4.1/mail-1.4.1.jar"/>

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/90078f26/org.apache.juneau.server.test/.classpath
----------------------------------------------------------------------
diff --git a/org.apache.juneau.server.test/.classpath b/org.apache.juneau.server.test/.classpath
index df48e6a..5f0b405 100644
--- a/org.apache.juneau.server.test/.classpath
+++ b/org.apache.juneau.server.test/.classpath
@@ -8,10 +8,11 @@
   <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/juneau/juneau-samples/6.0.0-SNAPSHOT/juneau-samples-6.0.0-SNAPSHOT.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/juneau/juneau-microservice/6.0.0-SNAPSHOT/juneau-microservice-6.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/juneau/juneau-microservice/6.0.0-SNAPSHOT/juneau-microservice-6.0.0-SNAPSHOT-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/juneau/juneau-server/6.0.0-SNAPSHOT/juneau-server-6.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/juneau/juneau-server/6.0.0-SNAPSHOT/juneau-server-6.0.0-SNAPSHOT-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/juneau/juneau-core/6.0.0-SNAPSHOT/juneau-core-6.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/juneau/juneau-core/6.0.0-SNAPSHOT/juneau-core-6.0.0-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="src" path="/juneau-samples"/>
+  <classpathentry kind="src" path="/juneau-microservice"/>
+  <classpathentry kind="src" path="/juneau-server"/>
+  <classpathentry kind="src" path="/juneau-core"/>
+  <classpathentry kind="src" path="/juneau-client"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.1/jena-core-2.7.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.2/jena-iri-0.9.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar"/>
@@ -19,7 +20,6 @@
   <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar"/>
   <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/juneau/juneau-client/6.0.0-SNAPSHOT/juneau-client-6.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/juneau/juneau-client/6.0.0-SNAPSHOT/juneau-client-6.0.0-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/90078f26/org.apache.juneau.server/.classpath
----------------------------------------------------------------------
diff --git a/org.apache.juneau.server/.classpath b/org.apache.juneau.server/.classpath
index 674cc09..5bcc76a 100644
--- a/org.apache.juneau.server/.classpath
+++ b/org.apache.juneau.server/.classpath
@@ -3,7 +3,6 @@
   <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
-  <classpathentry kind="src" path="target/maven-shared-archive-resources" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="var" path="M2_REPO/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1.jar"/>