Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Thoms2017-11-17 06:08:56 -0500
committerKarsten Thoms2017-11-17 06:08:56 -0500
commit7616607bf4083a5750ad5928934a2d4a7fbaa1de (patch)
tree256589d273214e8fd0a8e35c776144bfd91cface
parent89e94a9ec99c460407f2f2c11fd6143cca93c213 (diff)
downloadrt.equinox.bundles-I20171201-0345.tar.gz
rt.equinox.bundles-I20171201-0345.tar.xz
rt.equinox.bundles-I20171201-0345.zip
Change-Id: I6ce98a572aca8a6e0b06d6fa224bc24c508fc5d3 Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
-rw-r--r--bundles/org.eclipse.equinox.ds.tests/All DS Tests.launch1
-rw-r--r--bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.weaving.hook/config.ini2
-rw-r--r--bundles/org.eclipse.equinox.weaving.hook/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/adaptors/WeavingAdaptorFactory.java41
-rw-r--r--bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/SupplementerRegistry.java3
6 files changed, 25 insertions, 26 deletions
diff --git a/bundles/org.eclipse.equinox.ds.tests/All DS Tests.launch b/bundles/org.eclipse.equinox.ds.tests/All DS Tests.launch
index 31539f47..32d46e37 100644
--- a/bundles/org.eclipse.equinox.ds.tests/All DS Tests.launch
+++ b/bundles/org.eclipse.equinox.ds.tests/All DS Tests.launch
@@ -349,7 +349,6 @@
<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
<mapEntry key="org.eclipse.ui/trace/sources" value="false"/>
-<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
<mapEntry key="org.eclipse.wst.common.environment/debug" value="true"/>
<mapEntry key="org.eclipse.wst.common.environment/trace/command" value="true"/>
<mapEntry key="org.eclipse.wst.common.environment/trace/data" value="true"/>
diff --git a/bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF
index 30c902d4..cf04a3c4 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Aspect Weaving Hooks Plug-in
Bundle-SymbolicName: org.eclipse.equinox.weaving.hook
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.100.qualifier
Fragment-Host: org.eclipse.osgi;bundle-version="[3.10.0,4.0.0)"
Bundle-Vendor: Eclipse.org - Equinox
Export-Package: org.eclipse.equinox.service.weaving,
diff --git a/bundles/org.eclipse.equinox.weaving.hook/config.ini b/bundles/org.eclipse.equinox.weaving.hook/config.ini
index 63a0e87d..60c80770 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/config.ini
+++ b/bundles/org.eclipse.equinox.weaving.hook/config.ini
@@ -1,4 +1,4 @@
-osgi.bundles=org.eclipse.equinox.weaving.aspectj@1\:start,org.eclipse.equinox.common@2\:start,org.eclipse.update.configurator@3\:start,org.eclipse.core.runtime@start
+osgi.bundles=org.eclipse.equinox.weaving.aspectj@1\:start,org.eclipse.equinox.common@2\:start,org.eclipse.core.runtime@start
osgi.bundles.defaultStartLevel=4
osgi.framework=org.eclipse.osgi
osgi.configuration.cascaded=false
diff --git a/bundles/org.eclipse.equinox.weaving.hook/pom.xml b/bundles/org.eclipse.equinox.weaving.hook/pom.xml
index a6383273..9a695aa1 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/pom.xml
+++ b/bundles/org.eclipse.equinox.weaving.hook/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.weaving.hook</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/adaptors/WeavingAdaptorFactory.java b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/adaptors/WeavingAdaptorFactory.java
index fbd427e9..0f25697f 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/adaptors/WeavingAdaptorFactory.java
+++ b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/adaptors/WeavingAdaptorFactory.java
@@ -1,14 +1,14 @@
/*******************************************************************************
- * Copyright (c) 2006, 2013 IBM Corporation and others.
+ * Copyright (c) 2006, 2017 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
- * David Knibb initial implementation
+ * David Knibb initial implementation
* Matthew Webster Eclipse 3.2 changes
- * Heiko Seeberger Enhancements for service dynamics
+ * Heiko Seeberger Enhancements for service dynamics
* Martin Lippert extracted weaving and caching service factories
*******************************************************************************/
@@ -46,7 +46,6 @@ public class WeavingAdaptorFactory {
.asList(new String[] { "org.eclipse.equinox.weaving.aspectj", //$NON-NLS-1$
"org.eclipse.equinox.weaving.caching", //$NON-NLS-1$
"org.eclipse.equinox.weaving.caching.j9", //$NON-NLS-1$
- "org.eclipse.update.configurator", //$NON-NLS-1$
"org.eclipse.equinox.simpleconfigurator", //$NON-NLS-1$
"org.eclipse.equinox.common" }); //$NON-NLS-1$
@@ -96,8 +95,8 @@ public class WeavingAdaptorFactory {
final ICachingServiceFactory cachingServiceFactory = cachingServiceFactoryTracker
.getService();
if (cachingServiceFactory != null) {
- service = cachingServiceFactory.createCachingService(loader,
- bundle, key);
+ service = cachingServiceFactory.createCachingService(loader, bundle,
+ key);
}
if (Debug.DEBUG_CACHE)
Debug.println("< WeavingAdaptorFactory.getCachingService() service=" //$NON-NLS-1$
@@ -106,8 +105,8 @@ public class WeavingAdaptorFactory {
}
public Bundle getHost(final Bundle fragment) {
- if (Debug.DEBUG_GENERAL)
- Debug.println("> WeavingAdaptorFactory.getHost() fragment=" + fragment); //$NON-NLS-1$
+ if (Debug.DEBUG_GENERAL) Debug.println(
+ "> WeavingAdaptorFactory.getHost() fragment=" + fragment); //$NON-NLS-1$
Bundle host = null;
if (packageAdminService != null)
@@ -118,17 +117,19 @@ public class WeavingAdaptorFactory {
return host;
}
- protected IWeavingService getWeavingService(final ModuleClassLoader loader) {
- if (Debug.DEBUG_WEAVE)
- Debug.println("> WeavingAdaptorFactory.getWeavingService() baseClassLoader=" //$NON-NLS-1$
- + loader);
+ protected IWeavingService getWeavingService(
+ final ModuleClassLoader loader) {
+ if (Debug.DEBUG_WEAVE) Debug.println(
+ "> WeavingAdaptorFactory.getWeavingService() baseClassLoader=" //$NON-NLS-1$
+ + loader);
final Generation generation = loader.getClasspathManager()
.getGeneration();
final Bundle bundle = loader.getBundle();
IWeavingService weavingService = null;
- if (!IGNORE_WEAVING_SERVICE_BUNDLES.contains(bundle.getSymbolicName())) {
+ if (!IGNORE_WEAVING_SERVICE_BUNDLES
+ .contains(bundle.getSymbolicName())) {
final IWeavingServiceFactory weavingServiceFactory = weavingServiceFactoryTracker
.getService();
if (weavingServiceFactory != null) {
@@ -233,9 +234,9 @@ public class WeavingAdaptorFactory {
}
private void initializePackageAdminService(final BundleContext context) {
- if (Debug.DEBUG_GENERAL)
- Debug.println("> AdaptorFactory.initializePackageAdminService() context=" //$NON-NLS-1$
- + context);
+ if (Debug.DEBUG_GENERAL) Debug.println(
+ "> AdaptorFactory.initializePackageAdminService() context=" //$NON-NLS-1$
+ + context);
final ServiceReference<PackageAdmin> ref = context
.getServiceReference(PackageAdmin.class);
@@ -249,9 +250,9 @@ public class WeavingAdaptorFactory {
}
private void initializeStartLevelService(final BundleContext context) {
- if (Debug.DEBUG_GENERAL)
- Debug.println("> AdaptorFactory.initializeStartLevelService() context=" //$NON-NLS-1$
- + context);
+ if (Debug.DEBUG_GENERAL) Debug.println(
+ "> AdaptorFactory.initializeStartLevelService() context=" //$NON-NLS-1$
+ + context);
final ServiceReference<StartLevel> ref = context
.getServiceReference(StartLevel.class);
diff --git a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/SupplementerRegistry.java b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/SupplementerRegistry.java
index aeee5aa1..c196fb69 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/SupplementerRegistry.java
+++ b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/SupplementerRegistry.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 Martin Lippert and others.
+ * Copyright (c) 2008, 2017 Martin Lippert and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -100,7 +100,6 @@ public class SupplementerRegistry implements ISupplementerRegistry {
this.dontWeaveTheseBundles = new HashSet<String>();
this.dontWeaveTheseBundles.add("org.eclipse.osgi");
- this.dontWeaveTheseBundles.add("org.eclipse.update.configurator");
this.dontWeaveTheseBundles.add("org.eclipse.core.runtime");
this.dontWeaveTheseBundles.add("org.eclipse.equinox.common");
this.dontWeaveTheseBundles.add("org.eclipse.equinox.weaving.hook");

Back to the top