[jboss-cvs] JBossAS SVN: r106037 - in projects/jboss-cl/trunk: classloader/.settings and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jun 14 15:22:02 EDT 2010
Author: thomas.diesler at jboss.com
Date: 2010-06-14 15:22:01 -0400 (Mon, 14 Jun 2010)
New Revision: 106037
Modified:
projects/jboss-cl/trunk/classloader/.classpath
projects/jboss-cl/trunk/classloader/.settings/org.eclipse.jdt.core.prefs
projects/jboss-cl/trunk/classloading-vfs/.classpath
projects/jboss-cl/trunk/classloading-vfs/.settings/org.eclipse.jdt.core.prefs
projects/jboss-cl/trunk/classloading/.classpath
projects/jboss-cl/trunk/classloading/.settings/org.eclipse.jdt.core.prefs
projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java
Log:
[JBOSGI-323] DynamicImport-Package takes presendence over embedded classes
Also see http://community.jboss.org/message/547891
Modified: projects/jboss-cl/trunk/classloader/.classpath
===================================================================
--- projects/jboss-cl/trunk/classloader/.classpath 2010-06-14 17:49:16 UTC (rev 106036)
+++ projects/jboss-cl/trunk/classloader/.classpath 2010-06-14 19:22:01 UTC (rev 106037)
@@ -3,7 +3,7 @@
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="src" output="target/tests-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/tests-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/jboss-cl/trunk/classloader/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-cl/trunk/classloader/.settings/org.eclipse.jdt.core.prefs 2010-06-14 17:49:16 UTC (rev 106036)
+++ projects/jboss-cl/trunk/classloader/.settings/org.eclipse.jdt.core.prefs 2010-06-14 19:22:01 UTC (rev 106037)
@@ -1,5 +1,6 @@
-#Fri Sep 21 17:50:00 BST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+#Mon Jun 14 21:10:37 CEST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
Modified: projects/jboss-cl/trunk/classloading/.classpath
===================================================================
--- projects/jboss-cl/trunk/classloading/.classpath 2010-06-14 17:49:16 UTC (rev 106036)
+++ projects/jboss-cl/trunk/classloading/.classpath 2010-06-14 19:22:01 UTC (rev 106037)
@@ -3,7 +3,7 @@
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="src" output="target/tests-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/tests-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/jboss-cl/trunk/classloading/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-cl/trunk/classloading/.settings/org.eclipse.jdt.core.prefs 2010-06-14 17:49:16 UTC (rev 106036)
+++ projects/jboss-cl/trunk/classloading/.settings/org.eclipse.jdt.core.prefs 2010-06-14 19:22:01 UTC (rev 106037)
@@ -1,5 +1,6 @@
-#Fri Sep 21 17:50:00 BST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+#Mon Jun 14 21:10:38 CEST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java 2010-06-14 17:49:16 UTC (rev 106036)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java 2010-06-14 19:22:01 UTC (rev 106037)
@@ -131,6 +131,7 @@
{
ControllerContext context = module.getControllerContext();
setIDependOn(context.getName());
+ resolvedModule = module;
setResolved(true);
return true;
}
Modified: projects/jboss-cl/trunk/classloading-vfs/.classpath
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/.classpath 2010-06-14 17:49:16 UTC (rev 106036)
+++ projects/jboss-cl/trunk/classloading-vfs/.classpath 2010-06-14 19:22:01 UTC (rev 106037)
@@ -4,7 +4,7 @@
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/tests-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/tests-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/jboss-cl/trunk/classloading-vfs/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/.settings/org.eclipse.jdt.core.prefs 2010-06-14 17:49:16 UTC (rev 106036)
+++ projects/jboss-cl/trunk/classloading-vfs/.settings/org.eclipse.jdt.core.prefs 2010-06-14 19:22:01 UTC (rev 106037)
@@ -1,5 +1,6 @@
-#Tue Apr 29 21:03:22 PDT 2008
+#Mon Jun 14 21:10:38 CEST 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.5
More information about the jboss-cvs-commits
mailing list