Issue/main/update javadoc version

core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gemini-blueprint</artifactId>
         <groupId>org.eclipse.gemini.blueprint</groupId>
-        <version>3.0.0.M01-SNAPSHOT</version>
+        <version>4.0.0-atlassian-5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,43 +36,38 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.spring-aop</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.spring-beans</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.spring-context</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.spring-core</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.spring-expression</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-expression</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.spring-test</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
+            <artifactId>osgi.cmpn</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

core/src/main/java/org/eclipse/gemini/blueprint/blueprint/container/SpringBlueprintConverterService.java

@@ -14,15 +14,11 @@
 
 package org.eclipse.gemini.blueprint.blueprint.container;
 
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.gemini.blueprint.blueprint.container.support.BlueprintEditorRegistrar;
-import org.eclipse.gemini.blueprint.context.support.internal.security.SecurityUtils;
 import org.osgi.service.blueprint.container.Converter;
 import org.osgi.service.blueprint.container.ReifiedType;
 import org.springframework.beans.SimpleTypeConverter;
@@ -93,19 +89,7 @@ public Object convert(final Object source, TypeDescriptor sourceType, TypeDescri
 			return source;
 
 		final ReifiedType type = TypeFactory.getType(targetType);
-		boolean hasSecurity = (System.getSecurityManager() != null);
-		AccessControlContext acc = (hasSecurity ? SecurityUtils.getAccFrom(cbf) : null);
-		Object result;
-
-		if (hasSecurity) {
-			result = AccessController.doPrivileged(new PrivilegedAction<Object>() {
-				public Object run() {
-					return doConvert(source, type);
-				}
-			}, acc);
-		} else {
-			result = doConvert(source, type);
-		}
+		Object result = doConvert(source, type);
 
 		if (result != null) {
 			return result;

core/src/main/java/org/eclipse/gemini/blueprint/blueprint/container/support/BlueprintContainerServicePublisher.java

@@ -14,15 +14,11 @@
 
 package org.eclipse.gemini.blueprint.blueprint.container.support;
 
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.Dictionary;
 import java.util.Hashtable;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.eclipse.gemini.blueprint.context.support.internal.security.SecurityUtils;
 import org.eclipse.gemini.blueprint.util.OsgiBundleUtils;
 import org.eclipse.gemini.blueprint.util.OsgiServiceUtils;
 import org.osgi.framework.Bundle;
@@ -100,18 +96,7 @@ private void registerService(ApplicationContext applicationContext) {
 		if (log.isDebugEnabled())
 			log.debug("Publishing service under classes " + ObjectUtils.nullSafeToString(serviceNames));
 
-		AccessControlContext acc = SecurityUtils.getAccFrom(applicationContext);
-
-		// publish service
-		if (System.getSecurityManager() != null) {
-			registration = AccessController.doPrivileged(new PrivilegedAction<ServiceRegistration>() {
-				public ServiceRegistration run() {
-					return bundleContext.registerService(serviceNames, blueprintContainer, serviceProperties);
-				}
-			}, acc);
-		} else {
-			registration = bundleContext.registerService(serviceNames, blueprintContainer, serviceProperties);
-		}
+		registration = bundleContext.registerService(serviceNames, blueprintContainer, serviceProperties);
 	}
 
 	private void unregisterService() {

core/src/main/java/org/eclipse/gemini/blueprint/compendium/internal/cm/UpdateMethodAdapter.java

@@ -49,8 +49,8 @@ class UpdateMethodAdapter {
 	 * @return
 	 */
 	static Map determineUpdateMethod(final Class<?> target, final String methodName) {
-		Assert.notNull(target);
-		Assert.notNull(methodName);
+		Assert.notNull(target, "required field");
+		Assert.notNull(methodName, "required field");
 
 		final Map methods = new LinkedHashMap(2);
 		final boolean trace = log.isTraceEnabled();

core/src/main/java/org/eclipse/gemini/blueprint/config/internal/AbstractReferenceDefinitionParser.java

@@ -166,7 +166,7 @@ protected AbstractBeanDefinition parseInternal(Element element, ParserContext pa
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition();
 
 		Class<?> beanClass = getBeanClass(element);
-		Assert.notNull(beanClass);
+		Assert.notNull(beanClass, "required field");
 
 		if (beanClass != null) {
 			builder.getRawBeanDefinition().setBeanClass(beanClass);

core/src/main/java/org/eclipse/gemini/blueprint/config/internal/OsgiDefaultsDefinition.java

@@ -44,7 +44,7 @@ public class OsgiDefaultsDefinition {
 	private Availability availability = Availability.MANDATORY;
 
 	public OsgiDefaultsDefinition(Document document, ParserContext parserContext) {
-		Assert.notNull(document);
+		Assert.notNull(document, "required field");
 		Element root = document.getDocumentElement();
 
 		ReferenceParsingUtil.checkAvailabilityAndCardinalityDuplication(root, DEFAULT_AVAILABILITY,

core/src/main/java/org/eclipse/gemini/blueprint/config/internal/adapter/CustomListenerAdapterUtils.java

@@ -71,7 +71,7 @@ static Map<Class<?>, List<Method>> determineCustomMethods(final Class<?> target,
 			return Collections.emptyMap();
 		}
 
-		Assert.notEmpty(possibleArgumentTypes);
+		Assert.notEmpty(possibleArgumentTypes, "required field");
 
 		if (System.getSecurityManager() != null) {
 			return AccessController.doPrivileged(new PrivilegedAction<Map<Class<?>, List<Method>>>() {

core/src/main/java/org/eclipse/gemini/blueprint/config/internal/adapter/OsgiServiceLifecycleListenerAdapter.java

@@ -15,17 +15,12 @@
 package org.eclipse.gemini.blueprint.config.internal.adapter;
 
 import java.lang.reflect.Method;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.eclipse.gemini.blueprint.context.support.internal.security.SecurityUtils;
 import org.eclipse.gemini.blueprint.service.importer.ImportedOsgiServiceProxy;
 import org.eclipse.gemini.blueprint.service.importer.OsgiServiceLifecycleListener;
 import org.eclipse.gemini.blueprint.util.internal.ReflectionUtils;
@@ -80,7 +75,7 @@ public class OsgiServiceLifecycleListenerAdapter implements OsgiServiceLifecycle
 	private boolean initialized;
 
 	public void afterPropertiesSet() {
-		Assert.notNull(beanFactory);
+		Assert.notNull(beanFactory, "required field");
 		Assert.isTrue(target != null || StringUtils.hasText(targetBeanName),
 				"one of 'target' or 'targetBeanName' properties has to be set");
 
@@ -113,20 +108,11 @@ private void initialize() {
 
 		bindMethods = CustomListenerAdapterUtils.determineCustomMethods(clazz, bindMethod, isBlueprintCompliant);
 
-		boolean isSecurityEnabled = System.getSecurityManager() != null;
 		final Class<?> clz = clazz;
 
 		// determine methods using ServiceReference signature
 		if (StringUtils.hasText(bindMethod)) {
-			if (isSecurityEnabled) {
-				bindReference = AccessController.doPrivileged(new PrivilegedAction<Method>() {
-					public Method run() {
-						return findServiceReferenceMethod(clz, bindMethod);
-					}
-				});
-			} else {
-				bindReference = findServiceReferenceMethod(clz, bindMethod);
-			}
+			bindReference = findServiceReferenceMethod(clz, bindMethod);
 
 			if (bindMethods.isEmpty()) {
 				String beanName = (target == null ? "" : " bean [" + targetBeanName + "] ;");
@@ -138,15 +124,7 @@ public Method run() {
 		unbindMethods = CustomListenerAdapterUtils.determineCustomMethods(clazz, unbindMethod, isBlueprintCompliant);
 
 		if (StringUtils.hasText(unbindMethod)) {
-			if (isSecurityEnabled) {
-				unbindReference = AccessController.doPrivileged(new PrivilegedAction<Method>() {
-					public Method run() {
-						return findServiceReferenceMethod(clz, unbindMethod);
-					}
-				});
-			} else {
-				unbindReference = findServiceReferenceMethod(clz, unbindMethod);
-			}
+			unbindReference = findServiceReferenceMethod(clz, unbindMethod);
 
 			if (unbindMethods.isEmpty()) {
 				String beanName = (target == null ? "" : " bean [" + targetBeanName + "] ;");
@@ -227,29 +205,13 @@ public void bind(final Object service, final Map properties) throws Exception {
 		if (!initialized)
 			retrieveTarget();
 
-		boolean isSecurityEnabled = (System.getSecurityManager() != null);
-		AccessControlContext acc = null;
-
-		if (isSecurityEnabled) {
-			acc = SecurityUtils.getAccFrom(beanFactory);
-		}
-
 		// first call interface method (if it exists)
 		if (isLifecycleListener) {
 			if (trace)
 				log.trace("Invoking listener interface methods");
 
 			try {
-				if (isSecurityEnabled) {
-					AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-						public Object run() throws Exception {
-							((OsgiServiceLifecycleListener) target).bind(service, properties);
-							return null;
-						}
-					}, acc);
-				} else {
-					((OsgiServiceLifecycleListener) target).bind(service, properties);
-				}
+				((OsgiServiceLifecycleListener) target).bind(service, properties);
 			} catch (Exception ex) {
 				if (ex instanceof PrivilegedActionException) {
 					ex = ((PrivilegedActionException) ex).getException();
@@ -258,18 +220,8 @@ public Object run() throws Exception {
 			}
 		}
 
-		if (isSecurityEnabled) {
-			AccessController.doPrivileged(new PrivilegedAction<Object>() {
-				public Object run() {
-					CustomListenerAdapterUtils.invokeCustomMethods(target, bindMethods, service, properties);
-					invokeCustomServiceReferenceMethod(target, bindReference, service);
-					return null;
-				}
-			}, acc);
-		} else {
-			CustomListenerAdapterUtils.invokeCustomMethods(target, bindMethods, service, properties);
-			invokeCustomServiceReferenceMethod(target, bindReference, service);
-		}
+		CustomListenerAdapterUtils.invokeCustomMethods(target, bindMethods, service, properties);
+		invokeCustomServiceReferenceMethod(target, bindReference, service);
 	}
 
 	public void unbind(final Object service, final Map properties) throws Exception {
@@ -281,45 +233,19 @@ public void unbind(final Object service, final Map properties) throws Exception
 			log.trace("Invoking unbind method for service " + ObjectUtils.identityToString(service) + " with props="
 					+ properties);
 
-		boolean isSecurityEnabled = (System.getSecurityManager() != null);
-		AccessControlContext acc = null;
-
-		if (isSecurityEnabled) {
-			acc = SecurityUtils.getAccFrom(beanFactory);
-		}
-
 		// first call interface method (if it exists)
 		if (isLifecycleListener) {
 			if (trace)
 				log.trace("Invoking listener interface methods");
 			try {
-				if (isSecurityEnabled) {
-					AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-						public Object run() throws Exception {
-							((OsgiServiceLifecycleListener) target).unbind(service, properties);
-							return null;
-						}
-					}, acc);
-				} else {
-					((OsgiServiceLifecycleListener) target).unbind(service, properties);
-				}
+				((OsgiServiceLifecycleListener) target).unbind(service, properties);
 			} catch (Exception ex) {
 				log.warn("Standard unbind method on [" + target.getClass().getName() + "] threw exception", ex);
 			}
 		}
 
-		if (isSecurityEnabled) {
-			AccessController.doPrivileged(new PrivilegedAction<Object>() {
-				public Object run() {
-					CustomListenerAdapterUtils.invokeCustomMethods(target, unbindMethods, service, properties);
-					invokeCustomServiceReferenceMethod(target, unbindReference, service);
-					return null;
-				}
-			}, acc);
-		} else {
-			CustomListenerAdapterUtils.invokeCustomMethods(target, unbindMethods, service, properties);
-			invokeCustomServiceReferenceMethod(target, unbindReference, service);
-		}
+		CustomListenerAdapterUtils.invokeCustomMethods(target, unbindMethods, service, properties);
+		invokeCustomServiceReferenceMethod(target, unbindReference, service);
 	}
 
 	/**