Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDJ Houghton2005-03-16 16:44:59 +0000
committerDJ Houghton2005-03-16 16:44:59 +0000
commitf8cdf7a660c5e99a4c7c1e149ada3fd308af97e1 (patch)
treee6bd7fad3f6d22193aa01c632e2ed7879d0b5a2f /bundles/org.eclipse.osgi
parenta13c5c99fa3f83e11d6413152a054257a229c52e (diff)
downloadrt.equinox.framework-f8cdf7a660c5e99a4c7c1e149ada3fd308af97e1.tar.gz
rt.equinox.framework-f8cdf7a660c5e99a4c7c1e149ada3fd308af97e1.tar.xz
rt.equinox.framework-f8cdf7a660c5e99a4c7c1e149ada3fd308af97e1.zip
Released changes to ship OGSi plug-in as a JAR.
Diffstat (limited to 'bundles/org.eclipse.osgi')
-rw-r--r--bundles/org.eclipse.osgi/META-INF/MANIFEST.MF6
-rw-r--r--bundles/org.eclipse.osgi/build.properties37
-rw-r--r--bundles/org.eclipse.osgi/eclipse.properties1
3 files changed, 2 insertions, 42 deletions
diff --git a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
index 2c032e531..d6cdec921 100644
--- a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
@@ -37,11 +37,5 @@ Bundle-Vendor: %eclipse.org
Bundle-Version: 3.1.0
Bundle-Localization: systembundle
Bundle-DocUrl: http://www.eclipse.org
-Bundle-ClassPath: osgi.jar,
- core.jar,
- resolver.jar,
- defaultAdaptor.jar,
- eclipseAdaptor.jar,
- console.jar
Eclipse-ExtensibleAPI: true
Eclipse-SystemBundle: true
diff --git a/bundles/org.eclipse.osgi/build.properties b/bundles/org.eclipse.osgi/build.properties
index 4966c04aa..d82b29e6b 100644
--- a/bundles/org.eclipse.osgi/build.properties
+++ b/bundles/org.eclipse.osgi/build.properties
@@ -11,44 +11,11 @@
bin.includes = .options,\
plugin.properties,\
plugin.xml,\
- *.jar,\
+ .,\
about.html,\
eclipse.properties,\
META-INF/,\
systembundle.properties,\
*.profile
src.includes=about.html
-###############################################################################
-# The following configuration splits the framework code into the most
-# fine grain set of jars
-#
-# jars.compile.order = osgi.jar, core.jar, resolver.jar, defaultAdaptor.jar, eclipseAdaptor.jar, console.jar
-#
-# source.osgi.jar = osgi/src
-# source.core.jar = core/adaptor/, core/framework/
-# source.defaultAdaptor.jar = defaultAdaptor/src/
-# source.eclipseAdaptor.jar = eclipseAdaptor/src/
-# source.console.jar = console/src/
-# source.resolver.jar = resolver/src/
-###############################################################################
-
-###############################################################################
-# The following configuration splits the framework code into less code jars
-# the minimal set of code to run a standalone OSGi framework is combined into
-# core.jar. Additional functionality needed by eclipse is contained in
-# eclispeAdaptor.jar. The OSGi console implementation is contained in console.jar
-#
-jars.compile.order = core.jar, eclipseAdaptor.jar, console.jar
-
-source.core.jar = osgi/src, core/adaptor/, core/framework/, resolver/src/, defaultAdaptor/src/
-source.eclipseAdaptor.jar = eclipseAdaptor/src/
-source.console.jar = console/src/
-###############################################################################
-
-###############################################################################
-# The following configuration combines the framework into one core.jar
-#
-# jars.compile.order = core.jar
-#
-# source.core.jar = osgi/src, core/adaptor/, core/framework/, resolver/src/, defaultAdaptor/src/, eclipseAdaptor/src/, console/src/
-###############################################################################
+source.. = osgi/src, core/adaptor/, core/framework/, resolver/src/, defaultAdaptor/src/, eclipseAdaptor/src/, console/src/
diff --git a/bundles/org.eclipse.osgi/eclipse.properties b/bundles/org.eclipse.osgi/eclipse.properties
index 313efdb13..669065413 100644
--- a/bundles/org.eclipse.osgi/eclipse.properties
+++ b/bundles/org.eclipse.osgi/eclipse.properties
@@ -8,7 +8,6 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-osgi.frameworkClassPath = core.jar, console.jar, osgi.jar, resolver.jar, defaultAdaptor.jar, eclipseAdaptor.jar
osgi.bundles=org.eclipse.core.runtime@2:start, org.eclipse.update.configurator@3:start
osgi.bundles.defaultStartLevel=4
eof=eof

Back to the top