Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2012-03-05 09:13:08 -0500
committerChristopher Frost2012-03-05 09:13:08 -0500
commita917cb6a0155256bfce6085463aacfef0e9e98a7 (patch)
treef84a6f4477dc16a056de175a00daab6a2fedd95c /org.eclipse.virgo.kernel.agent.dm/.classpath
parentb529fce4d3affbadeec1e8259fcac33b20c5e9a4 (diff)
parente00dc910d48e3e53f17d670ccc09a5beb0427a12 (diff)
downloadorg.eclipse.virgo.kernel-a917cb6a0155256bfce6085463aacfef0e9e98a7.tar.gz
org.eclipse.virgo.kernel-a917cb6a0155256bfce6085463aacfef0e9e98a7.tar.xz
org.eclipse.virgo.kernel-a917cb6a0155256bfce6085463aacfef0e9e98a7.zip
Merge branch 'master' into 368157-GeminiManagement
Conflicts: build-kernel/plugins-ivy.xml build.versions org.eclipse.virgo.kernel.agent.dm/.classpath org.eclipse.virgo.kernel.artifact/.classpath org.eclipse.virgo.kernel.deployer.dm/.classpath org.eclipse.virgo.kernel.deployer/.classpath org.eclipse.virgo.kernel.dmfragment/.classpath org.eclipse.virgo.kernel.kerneldmfragment/.classpath org.eclipse.virgo.kernel.model/.classpath org.eclipse.virgo.kernel.osgi/.classpath org.eclipse.virgo.kernel.services/.classpath org.eclipse.virgo.kernel.shell/.classpath org.eclipse.virgo.kernel.test/.classpath org.eclipse.virgo.kernel.userregion/.classpath org.eclipse.virgo.kernel.userregionfactory/.classpath
Diffstat (limited to 'org.eclipse.virgo.kernel.agent.dm/.classpath')
-rw-r--r--org.eclipse.virgo.kernel.agent.dm/.classpath6
1 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.virgo.kernel.agent.dm/.classpath b/org.eclipse.virgo.kernel.agent.dm/.classpath
index 41e44eee..15eab39b 100644
--- a/org.eclipse.virgo.kernel.agent.dm/.classpath
+++ b/org.eclipse.virgo.kernel.agent.dm/.classpath
@@ -22,7 +22,7 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.BUILD-20120224155247/org.eclipse.virgo.medic-3.5.0.BUILD-20120224155247.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.0.CI-B20/org.eclipse.virgo.medic-sources-1.0.0.CI-B20.jar">
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.D-20120301131924/org.eclipse.virgo.medic-3.5.0.D-20120301131924.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.0.CI-B20/org.eclipse.virgo.medic-sources-1.0.0.CI-B20.jar">
<attributes>
<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
</attributes>
@@ -35,7 +35,7 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.D-20120125135853/org.eclipse.virgo.teststubs.osgi-3.5.0.D-20120125135853.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.D-20120125135853/org.eclipse.virgo.teststubs.osgi-sources-3.5.0.D-20120125135853.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.D-20120125140456/org.eclipse.virgo.util.osgi-3.5.0.D-20120125140456.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.M01/org.eclipse.virgo.util.osgi-sources-3.1.0.M01.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.D-20120301131322/org.eclipse.virgo.util.osgi-3.5.0.D-20120301131322.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.M01/org.eclipse.virgo.util.osgi-sources-3.1.0.M01.jar"/>
<classpathentry kind="src" path="/org.eclipse.virgo.kernel.deployer"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-sources-3.0.5.RELEASE.jar"/>
@@ -43,6 +43,6 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.event/1.2.100.v20110110/org.eclipse.equinox.event-1.2.100.v20110110.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.region/1.0.0.v20110503/org.eclipse.equinox.region-1.0.0.v20110503.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.region/1.0.0.v20110503/org.eclipse.equinox.region-1.0.0.v20110503.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-3.3.0.v20110513.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.5.0.D-20120125142228/org.eclipse.virgo.kernel.core-3.5.0.D-20120125142228.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.5.0.D-20120125142228/org.eclipse.virgo.kernel.core-sources-3.5.0.D-20120125142228.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.5.0.D-20120301132830/org.eclipse.virgo.kernel.core-3.5.0.D-20120301132830.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.5.0.D-20120301132830/org.eclipse.virgo.kernel.core-sources-3.5.0.D-20120301132830.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

Back to the top