diff --git a/core/feature-manager/org.wso2.carbon.feature.mgt.core/pom.xml b/core/feature-manager/org.wso2.carbon.feature.mgt.core/pom.xml
index fdbe53c2d06..1f988fa071f 100644
--- a/core/feature-manager/org.wso2.carbon.feature.mgt.core/pom.xml
+++ b/core/feature-manager/org.wso2.carbon.feature.mgt.core/pom.xml
@@ -40,7 +40,7 @@
org.wso2.carbon.utils
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.artifact.repository
@@ -48,7 +48,7 @@
org.eclipse.osgi
- org.wso2.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi.services
@@ -68,7 +68,7 @@
org.eclipse.equinox.http.servlet
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.equinox.jsp.jasper
@@ -90,39 +90,39 @@
org.eclipse.osgi
- org.wso2.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi.services
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.common
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.core
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.director
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.engine
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.metadata
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.metadata.repository
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.repository
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.simpleconfigurator
@@ -162,6 +162,10 @@
org.wso2.carbon.feature.mgt.core.*
+
+
+ osgi.service;objectClass=org.eclipse.equinox.p2.core.IProvisioningAgentProvider
+
diff --git a/core/feature-manager/org.wso2.carbon.feature.mgt.services/pom.xml b/core/feature-manager/org.wso2.carbon.feature.mgt.services/pom.xml
index 5dbe9cdcc6a..029a878ab50 100644
--- a/core/feature-manager/org.wso2.carbon.feature.mgt.services/pom.xml
+++ b/core/feature-manager/org.wso2.carbon.feature.mgt.services/pom.xml
@@ -54,23 +54,23 @@
org.wso2.carbon.feature.mgt.core
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.core
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.engine
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.metadata
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.repository
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.common
diff --git a/core/feature-manager/org.wso2.carbon.p2.touchpoint/pom.xml b/core/feature-manager/org.wso2.carbon.p2.touchpoint/pom.xml
index 092fc6a3513..1b77f11487a 100644
--- a/core/feature-manager/org.wso2.carbon.p2.touchpoint/pom.xml
+++ b/core/feature-manager/org.wso2.carbon.p2.touchpoint/pom.xml
@@ -16,11 +16,11 @@
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.common
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.engine
diff --git a/core/javax.cache/src/main/java/javax/cache/CacheManager.java b/core/javax.cache/src/main/java/javax/cache/CacheManager.java
index ba48b75ecb3..9e8eddda562 100644
--- a/core/javax.cache/src/main/java/javax/cache/CacheManager.java
+++ b/core/javax.cache/src/main/java/javax/cache/CacheManager.java
@@ -7,8 +7,6 @@
package javax.cache;
-import javax.transaction.UserTransaction;
-
/**
* A CacheManager is used for looking up Caches and controls their lifecycle. It represents a collection of caches.
*
@@ -127,13 +125,14 @@ public interface CacheManager {
*/
boolean removeCache(String cacheName);
- /**
- * This method will return a UserTransaction.
- *
- * @return the UserTransaction.
- * @throws UnsupportedOperationException if JTA is not supported
- */
- UserTransaction getUserTransaction();
+ // TODO javax.transaction package is no longer available. Need to find a way to add this back
+// /**
+// * This method will return a UserTransaction.
+// *
+// * @return the UserTransaction.
+// * @throws UnsupportedOperationException if JTA is not supported
+// */
+// UserTransaction getUserTransaction();
/**
* Indicates whether a optional feature is supported by this CacheManager.
diff --git a/core/javax.cache/src/main/java/org/wso2/carbon/caching/impl/CarbonCacheManager.java b/core/javax.cache/src/main/java/org/wso2/carbon/caching/impl/CarbonCacheManager.java
index 66329c8344e..14f27cf9ddc 100644
--- a/core/javax.cache/src/main/java/org/wso2/carbon/caching/impl/CarbonCacheManager.java
+++ b/core/javax.cache/src/main/java/org/wso2/carbon/caching/impl/CarbonCacheManager.java
@@ -17,16 +17,10 @@
*/
package org.wso2.carbon.caching.impl;
-import org.wso2.carbon.context.CarbonContext;
import org.wso2.carbon.base.ServerConfiguration;
+import org.wso2.carbon.context.CarbonContext;
import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
-import javax.cache.Cache;
-import javax.cache.CacheBuilder;
-import javax.cache.CacheException;
-import javax.cache.CacheManager;
-import javax.cache.OptionalFeature;
-import javax.cache.Status;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
@@ -34,6 +28,13 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.cache.Cache;
+import javax.cache.CacheBuilder;
+import javax.cache.CacheException;
+import javax.cache.CacheManager;
+import javax.cache.OptionalFeature;
+import javax.cache.Status;
+
import static org.wso2.carbon.caching.impl.CachingConstants.ILLEGAL_STATE_EXCEPTION_MESSAGE;
/**
@@ -202,13 +203,13 @@ boolean removeLocalCaches() {
return this.caches.isEmpty();
}
- @Override
- public javax.transaction.UserTransaction getUserTransaction() {
- Util.checkAccess(ownerTenantDomain, ownerTenantId);
- checkStatusStarted();
- touch();
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
+// @Override
+// public javax.transaction.UserTransaction getUserTransaction() {
+// Util.checkAccess(ownerTenantDomain, ownerTenantId);
+// checkStatusStarted();
+// touch();
+// return null; //To change body of implemented methods use File | Settings | File Templates.
+// }
@Override
public boolean isSupported(OptionalFeature optionalFeature) {
diff --git a/core/org.wso2.carbon.application.deployer/pom.xml b/core/org.wso2.carbon.application.deployer/pom.xml
index 05d8f27d7cb..42a3b998a44 100644
--- a/core/org.wso2.carbon.application.deployer/pom.xml
+++ b/core/org.wso2.carbon.application.deployer/pom.xml
@@ -37,7 +37,7 @@
org.eclipse.osgi
- org.wso2.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi.services
diff --git a/core/org.wso2.carbon.base/pom.xml b/core/org.wso2.carbon.base/pom.xml
index 1e0fdfb3767..6516397a329 100644
--- a/core/org.wso2.carbon.base/pom.xml
+++ b/core/org.wso2.carbon.base/pom.xml
@@ -36,7 +36,6 @@
org.apache.felix
maven-bundle-plugin
-
true
@@ -48,7 +47,7 @@
org.wso2.carbon.base.*; version="1.0.0"
- javax.activation.*;version="[0.0.0, 1.0.0)",
+ javax.activation.*;version="[1.0.0, 2.0.0)",
javax.servlet; version="${imp.pkg.version.javax.servlet}",
javax.servlet.http; version="${imp.pkg.version.javax.servlet}",
org.wso2.securevault.*,
@@ -59,6 +58,9 @@
*;resolution:=optional
+
+ osgi.service;objectClass=org.wso2.carbon.base.api.ServerConfigurationService
+
@@ -118,6 +120,7 @@
org.eclipse.equinox
javax.servlet
+
org.wso2.orbit.xerces
xercesImpl
diff --git a/core/org.wso2.carbon.base/src/main/java/org/wso2/carbon/base/ServerConfiguration.java b/core/org.wso2.carbon.base/src/main/java/org/wso2/carbon/base/ServerConfiguration.java
index 5066d157711..5048ee00799 100644
--- a/core/org.wso2.carbon.base/src/main/java/org/wso2/carbon/base/ServerConfiguration.java
+++ b/core/org.wso2.carbon.base/src/main/java/org/wso2/carbon/base/ServerConfiguration.java
@@ -21,6 +21,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.xerces.impl.Constants;
import org.apache.xerces.util.SecurityManager;
+import org.osgi.service.component.annotations.Component;
import org.w3c.dom.Element;
import org.wso2.carbon.base.api.ServerConfigurationService;
import org.wso2.carbon.securevault.SecretManagerInitializer;
@@ -55,6 +56,7 @@
* This class stores the configuration of the Carbon Server.
*/
@SuppressWarnings("unused")
+//@Component(service = ServerConfigurationService.class)
public class ServerConfiguration implements ServerConfigurationService {
/**
diff --git a/core/org.wso2.carbon.base/src/main/java/org/wso2/carbon/base/api/ServerConfigurationService.java b/core/org.wso2.carbon.base/src/main/java/org/wso2/carbon/base/api/ServerConfigurationService.java
index 195c0a88faf..122c0351b96 100644
--- a/core/org.wso2.carbon.base/src/main/java/org/wso2/carbon/base/api/ServerConfigurationService.java
+++ b/core/org.wso2.carbon.base/src/main/java/org/wso2/carbon/base/api/ServerConfigurationService.java
@@ -1,5 +1,6 @@
package org.wso2.carbon.base.api;
+import org.osgi.service.component.annotations.Component;
import org.w3c.dom.Element;
public interface ServerConfigurationService {
diff --git a/core/org.wso2.carbon.base/src/main/java/org/wso2/carbon/base/internal/CarbonBaseActivator.java b/core/org.wso2.carbon.base/src/main/java/org/wso2/carbon/base/internal/CarbonBaseActivator.java
index 6d1cec0bbb3..cd53af91503 100644
--- a/core/org.wso2.carbon.base/src/main/java/org/wso2/carbon/base/internal/CarbonBaseActivator.java
+++ b/core/org.wso2.carbon.base/src/main/java/org/wso2/carbon/base/internal/CarbonBaseActivator.java
@@ -22,16 +22,19 @@
import org.apache.commons.logging.LogFactory;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
-import org.wso2.carbon.base.CarbonBaseConstants;
import org.wso2.carbon.base.CarbonBaseUtils;
import org.wso2.carbon.base.ServerConfiguration;
import org.wso2.carbon.base.ServerConfigurationException;
import org.wso2.carbon.base.api.ServerConfigurationService;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+
import javax.servlet.ServletException;
-import java.io.*;
/**
* Activator of the {@link org.wso2.carbon.base} bundle
@@ -52,7 +55,6 @@ public void start(BundleContext bundleContext) throws Exception {
System.setProperty("portOffset", portOffset);
//register carbon server confg as an OSGi service
registration = bundleContext.registerService(ServerConfigurationService.class.getName(), carbonServerConfiguration, null);
-
}
@Override
diff --git a/core/org.wso2.carbon.bootstrap/src/main/java/org/wso2/carbon/bootstrap/CarbonSecurityManager.java b/core/org.wso2.carbon.bootstrap/src/main/java/org/wso2/carbon/bootstrap/CarbonSecurityManager.java
index d1f2977fb74..6cbc8bf2a55 100644
--- a/core/org.wso2.carbon.bootstrap/src/main/java/org/wso2/carbon/bootstrap/CarbonSecurityManager.java
+++ b/core/org.wso2.carbon.bootstrap/src/main/java/org/wso2/carbon/bootstrap/CarbonSecurityManager.java
@@ -18,11 +18,6 @@
package org.wso2.carbon.bootstrap;
-import sun.security.util.SecurityConstants;
-
-import java.security.AccessControlContext;
-import java.security.AccessControlException;
-import java.security.Policy;
import java.util.ArrayList;
import java.util.List;
@@ -32,7 +27,11 @@
*/
public class CarbonSecurityManager extends SecurityManager {
- private List deniedProperties = new ArrayList();
+ private List deniedProperties = new ArrayList<>();
+
+ //TODO check this later sun.security.util is not exported
+ public static final RuntimePermission MODIFY_THREADGROUP_PERMISSION =
+ new RuntimePermission("modifyThreadGroup");
public CarbonSecurityManager() {
super();
@@ -86,7 +85,7 @@ public void checkAccess(ThreadGroup g) {
throw new NullPointerException("thread group can't be null");
}
- checkPermission(SecurityConstants.MODIFY_THREADGROUP_PERMISSION);
+ checkPermission(MODIFY_THREADGROUP_PERMISSION);
}
/**
@@ -100,7 +99,7 @@ public void checkAccess(Thread t) {
throw new NullPointerException("thread can't be null");
}
- checkPermission(SecurityConstants.MODIFY_THREADGROUP_PERMISSION);
+ checkPermission(MODIFY_THREADGROUP_PERMISSION);
}
diff --git a/core/org.wso2.carbon.coordination.core/pom.xml b/core/org.wso2.carbon.coordination.core/pom.xml
index a0e10e81e1d..00ac3d01fb2 100644
--- a/core/org.wso2.carbon.coordination.core/pom.xml
+++ b/core/org.wso2.carbon.coordination.core/pom.xml
@@ -89,7 +89,6 @@
org.apache.felix
maven-bundle-plugin
- 1.4.0
true
diff --git a/core/org.wso2.carbon.core.common/pom.xml b/core/org.wso2.carbon.core.common/pom.xml
index 3027ead5361..f7a0ee47d95 100644
--- a/core/org.wso2.carbon.core.common/pom.xml
+++ b/core/org.wso2.carbon.core.common/pom.xml
@@ -57,7 +57,7 @@
!org.wso2.carbon.core.common.*,
- javax.activation.*;version="[0.0.0, 1.0.0)"
+ javax.activation.*;version="[1.0.0, 2.0.0)"
diff --git a/core/org.wso2.carbon.core.services/pom.xml b/core/org.wso2.carbon.core.services/pom.xml
index b5c4dc70181..1326a02d85d 100644
--- a/core/org.wso2.carbon.core.services/pom.xml
+++ b/core/org.wso2.carbon.core.services/pom.xml
@@ -37,7 +37,7 @@
org.eclipse.osgi
- org.wso2.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi.services
diff --git a/core/org.wso2.carbon.core/pom.xml b/core/org.wso2.carbon.core/pom.xml
index 8663952f005..c5cb23bba04 100644
--- a/core/org.wso2.carbon.core/pom.xml
+++ b/core/org.wso2.carbon.core/pom.xml
@@ -37,12 +37,19 @@
org.eclipse.osgi
- org.wso2.eclipse.osgi
- org.eclipse.osgi.services
+ org.eclipse.equinox
+ javax.servlet
+ ${version.equinox.javax.servlet}
- org.eclipse.equinox
- org.eclipse.equinox.http.helper
+ org.eclipse.platform
+ org.eclipse.osgi.services
+
+
+ org.eclipse.jetty.toolchain
+ jetty-servlet
+
+
junit
@@ -243,6 +250,11 @@
naming-factory|naming-resources|commons-collections;scope=compile|runtime;inline=false
+
+ osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService,
+ osgi.service;objectClass=org.apache.axis2.engine.ListenerManager,
+ osgi.service;objectClass=org.osgi.service.http.HttpService
+
true
*
diff --git a/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/ConfigurationContextServiceImpl.java b/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/ConfigurationContextServiceImpl.java
new file mode 100644
index 00000000000..782bd37b3f9
--- /dev/null
+++ b/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/ConfigurationContextServiceImpl.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2005-2007 WSO2, Inc. (http://wso2.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.wso2.carbon.core;
+
+import org.apache.axis2.context.ConfigurationContext;
+import org.osgi.service.component.annotations.Component;
+import org.wso2.carbon.utils.ConfigurationContextService;
+
+//@Component(service = ConfigurationContextService.class)
+public class ConfigurationContextServiceImpl implements ConfigurationContextService {
+ private ConfigurationContext serverConfigContext;
+ private ConfigurationContext clientConfigContext;
+
+ public ConfigurationContextServiceImpl(ConfigurationContext serverConfigContext, ConfigurationContext clientConfigContext){
+ this.serverConfigContext = serverConfigContext;
+ this.clientConfigContext = clientConfigContext;
+ }
+
+ public ConfigurationContext getServerConfigContext() {
+ return serverConfigContext;
+ }
+
+ public ConfigurationContext getClientConfigContext() {
+ return clientConfigContext;
+ }
+}
diff --git a/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/init/CarbonServerManager.java b/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/init/CarbonServerManager.java
index f9d5dc02b1d..dcd65b8ecfd 100644
--- a/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/init/CarbonServerManager.java
+++ b/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/init/CarbonServerManager.java
@@ -36,7 +36,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.eclipse.core.runtime.adaptor.EclipseStarter;
-import org.eclipse.equinox.http.helper.FilterServletAdaptor;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
@@ -45,14 +44,17 @@
import org.osgi.service.http.HttpContext;
import org.osgi.service.http.HttpService;
import org.osgi.service.http.NamespaceException;
+import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
import org.wso2.carbon.CarbonConstants;
import org.wso2.carbon.base.CarbonBaseConstants;
import org.wso2.carbon.base.CarbonContextHolderBase;
import org.wso2.carbon.base.api.ServerConfigurationService;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.core.CarbonAxisConfigurator;
import org.wso2.carbon.core.CarbonConfigurationContextFactory;
import org.wso2.carbon.core.CarbonThreadCleanup;
import org.wso2.carbon.core.CarbonThreadFactory;
+import org.wso2.carbon.core.ConfigurationContextServiceImpl;
import org.wso2.carbon.core.RegistryResources;
import org.wso2.carbon.core.ServerInitializer;
import org.wso2.carbon.core.ServerManagement;
@@ -61,10 +63,9 @@
import org.wso2.carbon.core.deployment.RegistryBasedRepositoryUpdater;
import org.wso2.carbon.core.internal.CarbonCoreDataHolder;
import org.wso2.carbon.core.internal.CarbonCoreServiceComponent;
-import org.wso2.carbon.core.multitenancy.GenericArtifactUnloader;
import org.wso2.carbon.core.internal.HTTPGetProcessorListener;
+import org.wso2.carbon.core.multitenancy.GenericArtifactUnloader;
import org.wso2.carbon.core.multitenancy.MultitenantServerManager;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.core.multitenancy.utils.TenantAxisUtils;
import org.wso2.carbon.core.security.CarbonJMXAuthenticator;
import org.wso2.carbon.core.transports.CarbonServlet;
@@ -92,8 +93,6 @@
import org.wso2.carbon.utils.deployment.GhostDeployerUtils;
import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
-import javax.servlet.Filter;
-import javax.servlet.ServletException;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
@@ -102,6 +101,7 @@
import java.util.Date;
import java.util.Dictionary;
import java.util.Enumeration;
+import java.util.Hashtable;
import java.util.Map;
import java.util.Timer;
import java.util.TimerTask;
@@ -116,6 +116,9 @@
import java.util.logging.Logger;
import java.util.logging.SimpleFormatter;
+import javax.servlet.Filter;
+import javax.servlet.ServletException;
+
import static org.apache.axis2.transport.TransportListener.HOST_ADDRESS;
/**
@@ -527,7 +530,7 @@ private void initializeCarbon() {
log.debug("Registering ConfigurationContextService...");
}
bundleContext.registerService(ConfigurationContextService.class.getName(),
- new ConfigurationContextService(serverConfigContext,
+ new ConfigurationContextServiceImpl(serverConfigContext,
clientConfigContext),
null);
@@ -554,7 +557,11 @@ private void registerCarbonServlet(HttpService httpService, HttpContext defaultH
ServiceReference filterServiceReference = bundleContext.getServiceReference(Filter.class.getName());
if (filterServiceReference != null) {
Filter filter = (Filter) bundleContext.getService(filterServiceReference);
- httpService.registerServlet(servicePath, new FilterServletAdaptor(filter, null, carbonServlet), null, defaultHttpContext);
+ //todo should this also be registered with the whitebox service?
+ httpService.registerServlet(servicePath, carbonServlet, null, defaultHttpContext);
+ Dictionary props = new Hashtable<>();
+ props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, servicePath);
+ bundleContext.registerService(Filter.class, filter, props);
} else {
httpService.registerServlet(servicePath, carbonServlet, null, defaultHttpContext);
}
diff --git a/core/org.wso2.carbon.http.bridge/pom.xml b/core/org.wso2.carbon.http.bridge/pom.xml
index 9fe4ed39b6c..df0eebdaf60 100644
--- a/core/org.wso2.carbon.http.bridge/pom.xml
+++ b/core/org.wso2.carbon.http.bridge/pom.xml
@@ -54,7 +54,7 @@
org.wso2.carbon.bridge
- org.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.http.servlet
diff --git a/core/org.wso2.carbon.osgi.security/pom.xml b/core/org.wso2.carbon.osgi.security/pom.xml
index 56a9ee64cd0..f98ec7ada6b 100644
--- a/core/org.wso2.carbon.osgi.security/pom.xml
+++ b/core/org.wso2.carbon.osgi.security/pom.xml
@@ -39,13 +39,13 @@
org.eclipse.osgi
- org.wso2.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi.services
-
- org.eclipse.equinox
- org.eclipse.equinox.http.helper
-
+
+
+
+
junit
junit
diff --git a/core/org.wso2.carbon.registry.core/pom.xml b/core/org.wso2.carbon.registry.core/pom.xml
index f9f5837eeef..72aa3fcc37a 100644
--- a/core/org.wso2.carbon.registry.core/pom.xml
+++ b/core/org.wso2.carbon.registry.core/pom.xml
@@ -54,8 +54,7 @@
org.wso2.carbon.user.*,
org.wso2.carbon.utils.*,
!javax.xml.namespace,
- javax.activation.*;version="[0.0.0, 1.0.0)",
- org.apache.abdera.*; version="${imp.pkg.version.abdera}",
+ javax.activation.*;version="[1.0.0, 2.0.0)",
javax.xml.namespace; version=0.0.0,
javax.servlet; version="${imp.pkg.version.javax.servlet}",
javax.servlet.http; version="${imp.pkg.version.javax.servlet}",
@@ -68,6 +67,11 @@
*;resolution:=optional
*
+
+ osgi.service;objectClass=org.wso2.carbon.registry.core.service.RegistryService,
+ osgi.service;objectClass=org.wso2.carbon.registry.api.RegistryService,
+ osgi.service;objectClass=org.wso2.carbon.registry.core.service.TenantRegistryLoader
+
acegi-security;scope=compile|runtime;inline=false
@@ -376,7 +380,7 @@
annotations
- org.wso2.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi.services
diff --git a/core/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/app/RemoteRegistryService.java b/core/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/app/RemoteRegistryService.java
index d4cc7baa286..40a620805a2 100644
--- a/core/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/app/RemoteRegistryService.java
+++ b/core/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/app/RemoteRegistryService.java
@@ -19,6 +19,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.osgi.service.component.annotations.Component;
import org.wso2.carbon.CarbonConstants;
import org.wso2.carbon.registry.core.Registry;
import org.wso2.carbon.registry.core.RegistryConstants;
@@ -42,6 +43,7 @@
* to create remote registry instances for user sessions. The class acts in a manner that is similar
* to an {@link EmbeddedRegistryService}.
*/
+//@Component(service = RegistryService.class)
public class RemoteRegistryService implements RegistryService {
private static final Log log = LogFactory.getLog(RemoteRegistryService.class);
diff --git a/core/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/core/jdbc/EmbeddedRegistryService.java b/core/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/core/jdbc/EmbeddedRegistryService.java
index da4a63516e4..dc38fd42161 100644
--- a/core/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/core/jdbc/EmbeddedRegistryService.java
+++ b/core/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/core/jdbc/EmbeddedRegistryService.java
@@ -18,6 +18,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.osgi.service.component.annotations.Component;
import org.wso2.carbon.CarbonConstants;
import org.wso2.carbon.registry.core.RegistryConstants;
import org.wso2.carbon.registry.core.clustering.NodeGroupLock;
@@ -25,7 +26,6 @@
import org.wso2.carbon.registry.core.config.RegistryContext;
import org.wso2.carbon.registry.core.dataaccess.DataAccessManager;
import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.registry.core.internal.RegistryCoreServiceComponent;
import org.wso2.carbon.registry.core.jdbc.dataaccess.JDBCDataAccessManager;
import org.wso2.carbon.registry.core.jdbc.realm.RegistryRealm;
import org.wso2.carbon.registry.core.jdbc.utils.Transaction;
@@ -35,7 +35,6 @@
import org.wso2.carbon.user.api.UserStoreException;
import org.wso2.carbon.user.core.UserRealm;
import org.wso2.carbon.user.core.service.RealmService;
-import org.wso2.carbon.user.core.util.UserCoreUtil;
import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
@@ -71,6 +70,7 @@
* @see EmbeddedRegistry
* @see UserRegistry
*/
+//@Component(service = RegistryService.class)
public class EmbeddedRegistryService implements RegistryService {
private static final Log log = LogFactory.getLog(EmbeddedRegistryService.class);
diff --git a/core/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/core/jdbc/InMemoryEmbeddedRegistryService.java b/core/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/core/jdbc/InMemoryEmbeddedRegistryService.java
index 27552d76c1f..cb2c9de1a3f 100644
--- a/core/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/core/jdbc/InMemoryEmbeddedRegistryService.java
+++ b/core/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/core/jdbc/InMemoryEmbeddedRegistryService.java
@@ -16,9 +16,11 @@
package org.wso2.carbon.registry.core.jdbc;
+import org.osgi.service.component.annotations.Component;
import org.wso2.carbon.registry.core.config.RegistryContext;
import org.wso2.carbon.registry.core.exceptions.RegistryException;
import org.wso2.carbon.registry.core.jdbc.realm.InMemoryRealmService;
+import org.wso2.carbon.registry.core.service.RegistryService;
import org.wso2.carbon.user.api.RealmConfiguration;
import org.wso2.carbon.user.core.service.RealmService;
@@ -28,6 +30,7 @@
* This is an extension to the {@link EmbeddedRegistryService} which is tailored to expose {@link
* InMemoryEmbeddedRegistry} instances as OSGi services.
*/
+//@Component(service = RegistryService.class)
public class InMemoryEmbeddedRegistryService extends EmbeddedRegistryService {
private RealmService realmService;
diff --git a/core/org.wso2.carbon.registry.xboot/src/main/java/java/sql/NClob.java b/core/org.wso2.carbon.registry.xboot/src/main/java/java/sql/NClob.java
deleted file mode 100644
index 7571e44674a..00000000000
--- a/core/org.wso2.carbon.registry.xboot/src/main/java/java/sql/NClob.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2005-2009, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package java.sql;
-
-/**
- * Dummy implementation of NClob in JDK6
- */
-public interface NClob {
-}
diff --git a/core/org.wso2.carbon.registry.xboot/src/main/java/java/sql/RowId.java b/core/org.wso2.carbon.registry.xboot/src/main/java/java/sql/RowId.java
deleted file mode 100644
index bd125b8bc40..00000000000
--- a/core/org.wso2.carbon.registry.xboot/src/main/java/java/sql/RowId.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2005-2009, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package java.sql;
-
-/**
- * Dummy implementation of RowId in JDK6
- */
-public interface RowId {
-}
diff --git a/core/org.wso2.carbon.registry.xboot/src/main/java/java/sql/SQLXML.java b/core/org.wso2.carbon.registry.xboot/src/main/java/java/sql/SQLXML.java
deleted file mode 100644
index 0947067d332..00000000000
--- a/core/org.wso2.carbon.registry.xboot/src/main/java/java/sql/SQLXML.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2005-2009, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package java.sql;
-
-/**
- * Dummy implementation of SQLXML in JDK6
- */
-public interface SQLXML {
-}
diff --git a/core/org.wso2.carbon.securevault/pom.xml b/core/org.wso2.carbon.securevault/pom.xml
index a8041bf0291..81f6c293ad0 100644
--- a/core/org.wso2.carbon.securevault/pom.xml
+++ b/core/org.wso2.carbon.securevault/pom.xml
@@ -36,7 +36,7 @@
org.eclipse.osgi
- org.wso2.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi.services
@@ -86,6 +86,9 @@
*;resolution:=optional
*
+
+ osgi.service;objectClass=org.wso2.carbon.securevault.SecretCallbackHandlerService
+
diff --git a/core/org.wso2.carbon.tomcat.ext/pom.xml b/core/org.wso2.carbon.tomcat.ext/pom.xml
index 584bba9512e..3beb37cf6b4 100644
--- a/core/org.wso2.carbon.tomcat.ext/pom.xml
+++ b/core/org.wso2.carbon.tomcat.ext/pom.xml
@@ -36,7 +36,7 @@
org.eclipse.osgi
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.common
diff --git a/core/org.wso2.carbon.tomcat/pom.xml b/core/org.wso2.carbon.tomcat/pom.xml
index c1fb69da186..a06b85aec84 100644
--- a/core/org.wso2.carbon.tomcat/pom.xml
+++ b/core/org.wso2.carbon.tomcat/pom.xml
@@ -36,11 +36,11 @@
org.eclipse.osgi
- org.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.http.servlet
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.common
@@ -119,6 +119,9 @@
*;resolution:=optional
*
+
+ osgi.service;objectClass=org.wso2.carbon.tomcat.api.CarbonTomcatService
+
diff --git a/core/org.wso2.carbon.ui/pom.xml b/core/org.wso2.carbon.ui/pom.xml
index 416e0d25542..5adc371c9c3 100644
--- a/core/org.wso2.carbon.ui/pom.xml
+++ b/core/org.wso2.carbon.ui/pom.xml
@@ -37,8 +37,19 @@
org.eclipse.osgi
- org.wso2.eclipse.osgi
+ org.eclipse.equinox
+ javax.servlet
+ ${version.equinox.javax.servlet}
+
+
+ org.eclipse.platform
org.eclipse.osgi.services
+
+
+ org.eclipse.jetty.toolchain
+ jetty-servlet
+
+
org.apache.ws.commons.axiom.wso2
@@ -111,7 +122,7 @@
axis2
- org.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.http.servlet
@@ -146,10 +157,6 @@
-
- org.eclipse.equinox
- javax.servlet
-
commons-lang.wso2
commons-lang
@@ -222,7 +229,6 @@
javax.servlet.http; version="${imp.pkg.version.javax.servlet}",
javax.servlet.jsp; version="${imp.pkg.version.javax.servlet.jsp}"
javax.servlet.jsp.tagext; version="${imp.pkg.version.javax.servlet.jsp}",
- org.eclipse.equinox.http.helper,
org.apache.tiles.*;version="2.0.5",
org.wso2.carbon.registry.core.service,
org.owasp.csrfguard.tag.*; version="${orbit.version.csrfguard}",
diff --git a/core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/BundleEntryHttpContext.java b/core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/BundleEntryHttpContext.java
new file mode 100644
index 00000000000..ef95ef9b9b0
--- /dev/null
+++ b/core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/BundleEntryHttpContext.java
@@ -0,0 +1,113 @@
+package org.wso2.carbon.ui;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Set;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.osgi.framework.Bundle;
+import org.osgi.service.http.HttpContext;
+
+public class BundleEntryHttpContext implements HttpContext {
+ private Bundle bundle;
+ private String bundlePath;
+
+ public BundleEntryHttpContext(Bundle bundle) {
+ this.bundle = bundle;
+ }
+
+ public BundleEntryHttpContext(Bundle b, String bundlePath) {
+ this(b);
+ if (bundlePath != null) {
+ if (bundlePath.endsWith("/")) {
+ bundlePath = bundlePath.substring(0, bundlePath.length() - 1);
+ }
+
+ if (bundlePath.length() == 0) {
+ bundlePath = null;
+ }
+ }
+
+ this.bundlePath = bundlePath;
+ }
+
+ public String getMimeType(String arg0) {
+ return null;
+ }
+
+ public boolean handleSecurity(HttpServletRequest arg0, HttpServletResponse arg1) throws IOException {
+ return true;
+ }
+
+ public URL getResource(String resourceName) {
+ if (this.bundlePath != null) {
+ resourceName = this.bundlePath + resourceName;
+ }
+
+ int lastSlash = resourceName.lastIndexOf(47);
+ if (lastSlash == -1) {
+ return null;
+ } else {
+ String path = resourceName.substring(0, lastSlash);
+ if (path.length() == 0) {
+ path = "/";
+ }
+
+ String file = this.sanitizeEntryName(resourceName.substring(lastSlash + 1));
+ Enumeration entryPaths = this.bundle.findEntries(path, file, false);
+ return entryPaths != null && entryPaths.hasMoreElements() ? (URL)entryPaths.nextElement() : null;
+ }
+ }
+
+ private String sanitizeEntryName(String name) {
+ StringBuffer buffer = null;
+
+ for(int i = 0; i < name.length(); ++i) {
+ char c = name.charAt(i);
+ switch (c) {
+ case '*':
+ case '\\':
+ if (buffer == null) {
+ buffer = new StringBuffer(name.length() + 16);
+ buffer.append(name.substring(0, i));
+ }
+
+ buffer.append('\\').append(c);
+ break;
+ default:
+ if (buffer != null) {
+ buffer.append(c);
+ }
+ }
+ }
+
+ return buffer == null ? name : buffer.toString();
+ }
+
+ public Set getResourcePaths(String path) {
+ if (this.bundlePath != null) {
+ path = this.bundlePath + path;
+ }
+
+ Enumeration entryPaths = this.bundle.findEntries(path, (String)null, false);
+ if (entryPaths == null) {
+ return null;
+ } else {
+ Set result = new HashSet();
+
+ while(entryPaths.hasMoreElements()) {
+ URL entryURL = (URL)entryPaths.nextElement();
+ String entryPath = entryURL.getFile();
+ if (this.bundlePath == null) {
+ result.add(entryPath);
+ } else {
+ result.add(entryPath.substring(this.bundlePath.length()));
+ }
+ }
+
+ return result;
+ }
+ }
+}
diff --git a/core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/DefaultComponentEntryHttpContext.java b/core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/DefaultComponentEntryHttpContext.java
index db7d1999876..b58c3dcfd58 100644
--- a/core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/DefaultComponentEntryHttpContext.java
+++ b/core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/DefaultComponentEntryHttpContext.java
@@ -15,7 +15,6 @@
*/
package org.wso2.carbon.ui;
-import org.eclipse.equinox.http.helper.BundleEntryHttpContext;
import org.osgi.framework.Bundle;
import java.net.MalformedURLException;
diff --git a/core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/SecuredComponentEntryHttpContext.java b/core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/SecuredComponentEntryHttpContext.java
index ca5b2af9f20..c441980904a 100644
--- a/core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/SecuredComponentEntryHttpContext.java
+++ b/core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/SecuredComponentEntryHttpContext.java
@@ -20,7 +20,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.eclipse.equinox.http.helper.BundleEntryHttpContext;
import org.osgi.framework.Bundle;
import org.wso2.carbon.registry.core.Registry;
diff --git a/core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/deployment/UIBundleDeployer.java b/core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/deployment/UIBundleDeployer.java
index 0394aada225..56e44e55c66 100644
--- a/core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/deployment/UIBundleDeployer.java
+++ b/core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/deployment/UIBundleDeployer.java
@@ -17,8 +17,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.eclipse.equinox.http.helper.ContextPathServletAdaptor;
-import org.eclipse.equinox.http.helper.FilterServletAdaptor;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
@@ -30,6 +28,7 @@
import org.osgi.service.http.HttpContext;
import org.osgi.service.http.HttpService;
import org.osgi.service.http.NamespaceException;
+import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
import org.osgi.util.tracker.ServiceTracker;
import org.wso2.carbon.CarbonConstants;
import org.wso2.carbon.CarbonException;
@@ -44,9 +43,6 @@
import org.wso2.carbon.ui.transports.fileupload.FileUploadExecutorManager;
import org.wso2.carbon.ui.util.UIResourceProvider;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Dictionary;
@@ -55,6 +51,10 @@
import java.util.Iterator;
import java.util.List;
+import javax.servlet.Filter;
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
+
public class UIBundleDeployer implements SynchronousBundleListener {
private static Log log = LogFactory.getLog(UIBundleDeployer.class);
@@ -418,17 +418,23 @@ public void registerServlet(Servlet servlet, String urlPattern, Dictionary param
}
try {
if (event == ServiceEvent.REGISTERED) {
- Servlet adaptedJspServlet = new ContextPathServletAdaptor(servlet, urlPattern);
- if (associatedFilter == null) {
- httpService.registerServlet(urlPattern, adaptedJspServlet, params, httpContext);
- } else {
- httpService.registerServlet(urlPattern,
- new FilterServletAdaptor(associatedFilter, null, adaptedJspServlet), params, httpContext);
+// Servlet adaptedJspServlet = new ContextPathServletAdaptor(servlet, urlPattern);
+ Dictionary properties = new Hashtable<>();
+ properties.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, urlPattern);
+ for (Enumeration enm = params.keys(); enm.hasMoreElements();) {
+ String key = (String) enm.nextElement();
+ properties.put("servlet.init." + key, params.get(key));
+ }
+ CarbonUIServiceComponent.getBundleContext().registerService(Servlet.class, servlet, properties);
+ if (associatedFilter != null) {
+ Dictionary props = new Hashtable<>();
+ props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, urlPattern);
+ CarbonUIServiceComponent.getBundleContext().registerService(Filter.class, associatedFilter, props);
}
if (servletAttrs != null) {
for (Enumeration enm = servletAttrs.keys(); enm.hasMoreElements();) {
String key = (String) enm.nextElement();
- adaptedJspServlet.getServletConfig().getServletContext().setAttribute(key, servletAttrs.get(key));
+ servlet.getServletConfig().getServletContext().setAttribute(key, servletAttrs.get(key));
}
}
} else if (event == ServiceEvent.UNREGISTERING) {
diff --git a/core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/internal/CarbonUIServiceComponent.java b/core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/internal/CarbonUIServiceComponent.java
index b2af9a372df..640b11d2c11 100644
--- a/core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/internal/CarbonUIServiceComponent.java
+++ b/core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/internal/CarbonUIServiceComponent.java
@@ -25,7 +25,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.tomcat.InstanceManager;
-import org.eclipse.equinox.http.helper.ContextPathServletAdaptor;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -38,6 +37,7 @@
import org.osgi.service.component.annotations.ReferencePolicy;
import org.osgi.service.http.HttpContext;
import org.osgi.service.http.HttpService;
+import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
import org.osgi.service.packageadmin.PackageAdmin;
import org.osgi.service.url.URLConstants;
import org.osgi.service.url.URLStreamHandlerService;
@@ -108,10 +108,9 @@ public class CarbonUIServiceComponent {
private static ServerConfigurationService serverConfiguration;
private static RealmService realmService;
private static CarbonTomcatService carbonTomcatService;
- private static List authenticationExtenders =
- new LinkedList();
+ private static List authenticationExtenders = new LinkedList<>();
- private BundleContext bundleContext;
+ private static BundleContext bundleContext;
private Servlet adaptedJspServlet;
@@ -201,6 +200,10 @@ public static CarbonTomcatService getCarbonTomcatService() {
return carbonTomcatService;
}
+ public static BundleContext getBundleContext() {
+ return bundleContext;
+ }
+
public void start(BundleContext context) throws Exception {
this.bundleContext = context;
@@ -263,9 +266,11 @@ public void start(BundleContext context) throws Exception {
new CarbonSecuredHttpContext(context.getBundle(), "/web", uiResourceRegistry, registry);
//Registering filedownload servlet
- Servlet fileDownloadServlet = new ContextPathServletAdaptor(new FileDownloadServlet(
- context, getConfigurationContextService()), "/filedownload");
- httpService.registerServlet("/filedownload", fileDownloadServlet, null, commonContext);
+ Servlet fileDownloadServlet = new FileDownloadServlet(context, getConfigurationContextService());
+ Dictionary fileDownloadServletProperties = new Hashtable<>();
+ fileDownloadServletProperties.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/filedownload");
+ context.registerService(Servlet.class, fileDownloadServlet, fileDownloadServletProperties);
+// httpService.registerServlet("/filedownload", fileDownloadServlet, null, commonContext);
fileDownloadServlet.getServletConfig().getServletContext().setAttribute(
CarbonConstants.SERVER_URL, serverURL);
fileDownloadServlet.getServletConfig().getServletContext().setAttribute(
@@ -274,14 +279,15 @@ public void start(BundleContext context) throws Exception {
//Registering fileupload servlet
Servlet fileUploadServlet;
if (isLocalTransportMode) {
- fileUploadServlet = new ContextPathServletAdaptor(new FileUploadServlet(
- context, serverConfigContext, webContext), "/fileupload");
+ fileUploadServlet = new FileUploadServlet(context, serverConfigContext, webContext);
} else {
- fileUploadServlet = new ContextPathServletAdaptor(new FileUploadServlet(
- context, clientConfigContext, webContext), "/fileupload");
+ fileUploadServlet = new FileUploadServlet(context, clientConfigContext, webContext);
}
- httpService.registerServlet("/fileupload", fileUploadServlet, null, commonContext);
+// httpService.registerServlet("/fileupload", fileUploadServlet, null, commonContext);
+ Dictionary fileUploadServletProperties = new Hashtable<>();
+ fileUploadServletProperties.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/fileupload");
+ context.registerService(Servlet.class, fileUploadServlet, fileUploadServletProperties);
fileUploadServlet.getServletConfig().getServletContext().setAttribute(
CarbonConstants.SERVER_URL, serverURL);
fileUploadServlet.getServletConfig().getServletContext().setAttribute(
@@ -290,17 +296,19 @@ public void start(BundleContext context) throws Exception {
uiBundleDeployer.deploy(bundleContext, commonContext);
context.addBundleListener(uiBundleDeployer);
+ // TODO check if they need to be registered with bundle context?
httpService.registerServlet("/", new org.apache.tiles.web.startup.TilesServlet(),
initparams,
commonContext);
httpService.registerResources("/" + webContext, "/", commonContext);
- adaptedJspServlet = new ContextPathServletAdaptor(
- new TilesJspServlet(context.getBundle(), uiResourceRegistry), "/" + webContext);
+ adaptedJspServlet = new TilesJspServlet(context.getBundle(), uiResourceRegistry);
- Dictionary carbonInitparams = new Hashtable();
- carbonInitparams.put("strictQuoteEscaping", "false");
- httpService.registerServlet("/" + webContext + "/*.jsp", adaptedJspServlet, carbonInitparams, commonContext);
+ Dictionary carbonInitparams = new Hashtable<>();
+ carbonInitparams.put("servlet.init.strictQuoteEscaping", "false");
+ carbonInitparams.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/" + webContext + "/*.jsp");
+// httpService.registerServlet("/" + webContext + "/*.jsp", adaptedJspServlet, carbonInitparams, commonContext);
+ context.registerService(Servlet.class, adaptedJspServlet, carbonInitparams);
ServletContext jspServletContext =
adaptedJspServlet.getServletConfig().getServletContext();
diff --git a/core/org.wso2.carbon.user.core/pom.xml b/core/org.wso2.carbon.user.core/pom.xml
index c43415245c1..fa4d7752887 100644
--- a/core/org.wso2.carbon.user.core/pom.xml
+++ b/core/org.wso2.carbon.user.core/pom.xml
@@ -205,6 +205,10 @@
*;resolution:=optional
*
+
+ osgi.service;objectClass=org.wso2.carbon.user.core.service.RealmService,
+ osgi.service;objectClass=org.wso2.carbon.user.api.UserRealmService
+
diff --git a/core/org.wso2.carbon.utils/pom.xml b/core/org.wso2.carbon.utils/pom.xml
index e67a6ad9565..09dba5d028c 100644
--- a/core/org.wso2.carbon.utils/pom.xml
+++ b/core/org.wso2.carbon.utils/pom.xml
@@ -273,6 +273,9 @@
*;resolution:=optional
*
+
+ osgi.service;objectClass=org.wso2.carbon.context.CarbonCoreInitializedEvent
+
diff --git a/core/org.wso2.carbon.utils/src/main/java/org/wso2/carbon/utils/ConfigurationContextService.java b/core/org.wso2.carbon.utils/src/main/java/org/wso2/carbon/utils/ConfigurationContextService.java
index c53a51f1e20..f12a1ad271d 100644
--- a/core/org.wso2.carbon.utils/src/main/java/org/wso2/carbon/utils/ConfigurationContextService.java
+++ b/core/org.wso2.carbon.utils/src/main/java/org/wso2/carbon/utils/ConfigurationContextService.java
@@ -17,20 +17,9 @@
import org.apache.axis2.context.ConfigurationContext;
-public class ConfigurationContextService {
- private ConfigurationContext serverConfigContext;
- private ConfigurationContext clientConfigContext;
+public interface ConfigurationContextService {
- public ConfigurationContextService(ConfigurationContext serverConfigContext, ConfigurationContext clientConfigContext){
- this.serverConfigContext = serverConfigContext;
- this.clientConfigContext = clientConfigContext;
- }
+ public ConfigurationContext getServerConfigContext();
- public ConfigurationContext getServerConfigContext() {
- return serverConfigContext;
- }
-
- public ConfigurationContext getClientConfigContext() {
- return clientConfigContext;
- }
+ public ConfigurationContext getClientConfigContext();
}
diff --git a/core/pom.xml b/core/pom.xml
index d491c17410b..009333f9327 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -113,7 +113,7 @@
org.wso2.carbon.registry.api
org.wso2.carbon.user.api
org.wso2.carbon.osgi.security
- org.wso2.carbon.registry.xboot
+
org.wso2.carbon.queuing
org.wso2.carbon.utils
org.wso2.carbon.securevault
@@ -147,7 +147,7 @@
org.wso2.carbon.ndatasource.common
org.wso2.carbon.ndatasource.core
org.wso2.carbon.ndatasource.rdbms
- org.wso2.carbon.framework.exporter
+
org.wso2.carbon.pax-logging-log4j2-plugins
org.wso2.carbon.logging.correlation
org.wso2.carbon.hazelcast
diff --git a/core/server-role-manager/org.wso2.carbon.roles.mgt/pom.xml b/core/server-role-manager/org.wso2.carbon.roles.mgt/pom.xml
index 2d1cbed3898..058c24e37a9 100644
--- a/core/server-role-manager/org.wso2.carbon.roles.mgt/pom.xml
+++ b/core/server-role-manager/org.wso2.carbon.roles.mgt/pom.xml
@@ -53,7 +53,7 @@
org.eclipse.osgi
- org.wso2.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi.services
diff --git a/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature-licensed/1.0.0/pom.xml b/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature-licensed/1.0.0/pom.xml
index 0b6f33897d9..e6a838d4413 100644
--- a/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature-licensed/1.0.0/pom.xml
+++ b/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature-licensed/1.0.0/pom.xml
@@ -27,6 +27,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
p2-feature-generation
@@ -53,4 +54,4 @@
-
\ No newline at end of file
+
diff --git a/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature-unlicensed/pom.xml b/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature-unlicensed/pom.xml
index c9cf236862e..8388b4c960d 100644
--- a/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature-unlicensed/pom.xml
+++ b/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature-unlicensed/pom.xml
@@ -27,6 +27,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
p2-feature-generation
@@ -58,4 +59,4 @@
-
\ No newline at end of file
+
diff --git a/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature1/1.0.0/pom.xml b/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature1/1.0.0/pom.xml
index 7f8187a9b7b..655aeb45d60 100644
--- a/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature1/1.0.0/pom.xml
+++ b/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature1/1.0.0/pom.xml
@@ -27,6 +27,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
p2-feature-generation
@@ -53,4 +54,4 @@
-
\ No newline at end of file
+
diff --git a/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature1/1.0.1/pom.xml b/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature1/1.0.1/pom.xml
index 25b166f0d72..07684207b5b 100644
--- a/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature1/1.0.1/pom.xml
+++ b/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature1/1.0.1/pom.xml
@@ -27,6 +27,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
p2-feature-generation
@@ -53,4 +54,4 @@
-
\ No newline at end of file
+
diff --git a/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature2/1.0.0/pom.xml b/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature2/1.0.0/pom.xml
index d6e712a36ff..4f40094132f 100644
--- a/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature2/1.0.0/pom.xml
+++ b/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature2/1.0.0/pom.xml
@@ -39,6 +39,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
p2-feature-generation
@@ -68,4 +69,4 @@
-
\ No newline at end of file
+
diff --git a/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature2/1.0.1/pom.xml b/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature2/1.0.1/pom.xml
index d8e43cb522f..d921f2f54b9 100644
--- a/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature2/1.0.1/pom.xml
+++ b/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature2/1.0.1/pom.xml
@@ -39,6 +39,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
p2-feature-generation
@@ -68,4 +69,4 @@
-
\ No newline at end of file
+
diff --git a/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature3/1.0.0/pom.xml b/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature3/1.0.0/pom.xml
index 9fcdcd519c9..795f85abcc1 100644
--- a/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature3/1.0.0/pom.xml
+++ b/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature3/1.0.0/pom.xml
@@ -39,6 +39,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
p2-feature-generation
@@ -70,4 +71,4 @@
-
\ No newline at end of file
+
diff --git a/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature3/1.0.1/pom.xml b/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature3/1.0.1/pom.xml
index 97b2d3d55b1..179530c0d2e 100644
--- a/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature3/1.0.1/pom.xml
+++ b/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/feature3/1.0.1/pom.xml
@@ -39,6 +39,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
p2-feature-generation
@@ -70,4 +71,4 @@
-
\ No newline at end of file
+
diff --git a/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/licensed-unlicensed-features/pom.xml b/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/licensed-unlicensed-features/pom.xml
index 982c6bbe3d1..5836bd93643 100644
--- a/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/licensed-unlicensed-features/pom.xml
+++ b/distribution/integration/test-common/common-artifacts/sample-feature-repo1/features/licensed-unlicensed-features/pom.xml
@@ -33,6 +33,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
p2-feature-generation
@@ -59,4 +60,4 @@
-
\ No newline at end of file
+
diff --git a/distribution/integration/test-common/common-artifacts/sample-feature-repo1/repository/pom.xml b/distribution/integration/test-common/common-artifacts/sample-feature-repo1/repository/pom.xml
index b8b501f7abe..7410b3d5fdc 100644
--- a/distribution/integration/test-common/common-artifacts/sample-feature-repo1/repository/pom.xml
+++ b/distribution/integration/test-common/common-artifacts/sample-feature-repo1/repository/pom.xml
@@ -19,6 +19,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
2-p2-repo-generation
@@ -67,4 +68,4 @@
-
\ No newline at end of file
+
diff --git a/distribution/kernel/pom.xml b/distribution/kernel/pom.xml
index 02c2bf3ad4c..be6ebfc427b 100644
--- a/distribution/kernel/pom.xml
+++ b/distribution/kernel/pom.xml
@@ -161,38 +161,47 @@
org.jvnet.staxex
stax-ex
+
+
+
+
+
+
+
-
- org.apache.maven.plugins
- maven-dependency-plugin
- false
-
-
- unpack-equinox-executable
- test
-
- unpack
-
-
-
-
- org.eclipse.equinox
- org.eclipse.equinox.executable
- 3.5.0.v20110530-7P7NFUFFLWUl76mart
- zip
- true
- target
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
org.wso2.maven
carbon-p2-plugin
+
+ true
p2-repo-generation
@@ -224,9 +233,15 @@
${basedir}/carbon.product
-
- ${basedir}/target/org.eclipse.equinox.executable_3.5.0.v20110530-7P7NFUFFLWUl76mart
-
+
+
+
+
+
+
+
+
+
file:${basedir}/target/p2-repo
file:${basedir}/target/p2-repo
@@ -267,6 +282,13 @@
+
+
+
+
+
+
+
org.apache.maven.plugins
diff --git a/distribution/product/modules/features/org.wso2.carbon.styles.feature/pom.xml b/distribution/product/modules/features/org.wso2.carbon.styles.feature/pom.xml
index e16d8bc8343..ad6840e4a0a 100644
--- a/distribution/product/modules/features/org.wso2.carbon.styles.feature/pom.xml
+++ b/distribution/product/modules/features/org.wso2.carbon.styles.feature/pom.xml
@@ -42,6 +42,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
p2-feature-generation
diff --git a/distribution/product/modules/p2-profile-gen/pom.xml b/distribution/product/modules/p2-profile-gen/pom.xml
index 3869998f690..94d991c47a5 100644
--- a/distribution/product/modules/p2-profile-gen/pom.xml
+++ b/distribution/product/modules/p2-profile-gen/pom.xml
@@ -61,6 +61,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
2-p2-repo-generation
diff --git a/features/org.wso2.carbon.core.common.feature/pom.xml b/features/org.wso2.carbon.core.common.feature/pom.xml
index 6fc304aaeb8..1f3ad02cf20 100644
--- a/features/org.wso2.carbon.core.common.feature/pom.xml
+++ b/features/org.wso2.carbon.core.common.feature/pom.xml
@@ -36,6 +36,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
4-p2-feature-generation
@@ -54,11 +55,11 @@
- org.eclipse.equinox:org.eclipse.equinox.http.servlet:${version.equinox.http.servlet}
-
-
- org.eclipse.equinox:org.eclipse.equinox.http.helper:${version.equinox.http.helper}
+ org.eclipse.platform:org.eclipse.equinox.http.servlet:${version.equinox.http.servlet}
+
+
+
org.wso2.orbit.org.apache.tomcat:tomcat-jsp-api:${orbit.version.tomcat.jsp.api}
org.wso2.orbit.org.apache.tomcat:tomcat-el-api:${orbit.version.tomcat.el.api}
@@ -172,6 +173,11 @@
org.wso2.carbon.crypto:org.wso2.carbon.crypto.provider:${carbon.crypto.version}
org.wso2.orbit.sun.xml.bind:jaxb:${version.org.wso2.orbit.javax.xml.bind.jaxb}
+
+ org.wso2.orbit.javax.activation:activation:1.1.1.wso2v4
+
+
+ javax.xml.soap:javax.xml.soap-api:1.4.0
diff --git a/features/org.wso2.carbon.core.feature/pom.xml b/features/org.wso2.carbon.core.feature/pom.xml
index c7fdb6a3fa2..7ac68f96170 100644
--- a/features/org.wso2.carbon.core.feature/pom.xml
+++ b/features/org.wso2.carbon.core.feature/pom.xml
@@ -49,6 +49,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
4-p2-feature-generation
diff --git a/features/org.wso2.carbon.core.runtime.feature/pom.xml b/features/org.wso2.carbon.core.runtime.feature/pom.xml
index 210969e1682..e8ca0f0b2d9 100644
--- a/features/org.wso2.carbon.core.runtime.feature/pom.xml
+++ b/features/org.wso2.carbon.core.runtime.feature/pom.xml
@@ -38,19 +38,24 @@
org.eclipse.osgi
- org.wso2.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi.services
+
+
+
+
+
- org.wso2.eclipse.equinox
- org.eclipse.equinox.launcher.gtk.linux.x86
+ org.eclipse.platform
+ org.eclipse.equinox.launcher.gtk.linux.x86_64
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.common
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.simpleconfigurator
@@ -58,31 +63,39 @@
org.wso2.carbon.osgi.security
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.util
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.ds
- org.wso2.eclipse.equinox
+ org.eclipse.platform
+ org.eclipse.osgi.util
+
+
+ org.apache.felix
+ org.apache.felix.scr
+
+
+ org.eclipse.platform
org.eclipse.equinox.launcher
- org.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.app
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.concurrent
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.frameworkadmin
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.frameworkadmin.equinox
@@ -102,119 +115,132 @@
org.apache.felix.gogo.runtime
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.artifact.repository
- org.wso2.eclipse.equinox
+ org.tukaani
+ xz
+
+
+ org.eclipse.platform
org.eclipse.equinox.p2.console
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.core
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.director
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.director.app
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.directorywatcher
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.engine
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.extensionlocation
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.garbagecollector
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.jarprocessor
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.metadata
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.metadata.repository
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.reconciler.dropins
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.repository.tools
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.repository
- org.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.touchpoint.eclipse
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.touchpoint.natives
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.updatechecker
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.updatesite
- org.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.publisher.eclipse
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.preferences
- org.wso2.eclipse.equinox
+ org.osgi
+ org.osgi.service.prefs
+
+
+
+ org.bouncycastle
+ bcpg-jdk18on
+
+
+ org.eclipse.platform
org.eclipse.equinox.registry
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.security
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.simpleconfigurator.manipulator
- org.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.publisher
- org.eclipse.core
+ org.eclipse.platform
org.eclipse.core.contenttype
- org.eclipse.core
+ org.eclipse.platform
org.eclipse.core.expressions
- org.eclipse.core
+ org.eclipse.platform
org.eclipse.core.jobs
- org.eclipse.core
+ org.eclipse.platform
org.eclipse.core.runtime
@@ -242,7 +268,7 @@
org.sat4j.pb
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.equinox.p2.transport.ecf
@@ -253,6 +279,63 @@
org.wso2.eclipse.osgi
org.eclipse.osgi.compatibility.state
+
+ org.osgi
+ org.osgi.service.component
+
+
+ org.osgi
+ org.osgi.util.promise
+
+
+ org.osgi
+ org.osgi.util.function
+
+
+ org.osgi
+ org.osgi.service.cm
+
+
+ org.osgi
+ org.osgi.service.upnp
+
+
+ org.osgi
+ org.osgi.service.device
+
+
+ org.osgi
+ org.osgi.service.event
+
+
+ org.osgi
+ org.osgi.service.wireadmin
+
+
+ org.osgi
+ org.osgi.service.provisioning
+
+
+ org.osgi
+ org.osgi.service.useradmin
+
+
+ org.osgi
+ org.osgi.service.metatype
+
+
+ org.osgi
+ org.osgi.service.permissionadmin
+
+
+ org.osgi
+ org.osgi.service.http.whiteboard
+
+
+ org.eclipse.platform
+ org.eclipse.equinox.http.service.api
+
+
@@ -260,6 +343,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
4-p2-feature-generation
@@ -276,62 +360,79 @@
- org.wso2.eclipse.equinox:org.eclipse.equinox.common
- org.wso2.eclipse.equinox:org.eclipse.equinox.simpleconfigurator
+ org.eclipse.platform:org.eclipse.equinox.common
+ org.eclipse.platform:org.eclipse.equinox.simpleconfigurator
org.wso2.carbon:org.wso2.carbon.osgi.security
- org.wso2.eclipse.equinox:org.eclipse.equinox.ds
- org.wso2.eclipse.equinox:org.eclipse.equinox.launcher
- org.wso2.eclipse.equinox:org.eclipse.equinox.util
- org.wso2.eclipse.osgi:org.eclipse.osgi.services
+ org.eclipse.platform:org.eclipse.equinox.ds
+
+ org.eclipse.platform:org.eclipse.equinox.launcher
+ org.eclipse.platform:org.eclipse.equinox.util
+ org.eclipse.platform:org.eclipse.osgi.services
org.eclipse.platform:org.eclipse.osgi
- org.eclipse.equinox:org.eclipse.equinox.app
- org.wso2.eclipse.equinox:org.eclipse.equinox.concurrent
- org.wso2.eclipse.equinox:org.eclipse.equinox.frameworkadmin
- org.wso2.eclipse.equinox:org.eclipse.equinox.frameworkadmin.equinox
- org.wso2.eclipse.equinox:org.eclipse.equinox.preferences
- org.wso2.eclipse.equinox:org.eclipse.equinox.registry
- org.wso2.eclipse.equinox:org.eclipse.equinox.security
- org.wso2.eclipse.equinox:org.eclipse.equinox.simpleconfigurator.manipulator
+ org.eclipse.platform:org.eclipse.equinox.app
+ org.eclipse.platform:org.eclipse.equinox.concurrent
+ org.eclipse.platform:org.eclipse.equinox.frameworkadmin
+ org.eclipse.platform:org.eclipse.equinox.frameworkadmin.equinox
+ org.eclipse.platform:org.eclipse.equinox.preferences
+ org.osgi:org.osgi.service.prefs
+ org.bouncycastle:bcpg-jdk18on
+ org.eclipse.platform:org.eclipse.equinox.registry
+ org.eclipse.platform:org.eclipse.equinox.security
+ org.eclipse.platform:org.eclipse.equinox.simpleconfigurator.manipulator
-
+ org.apache.felix:org.apache.felix.scr
org.eclipse.platform:org.eclipse.equinox.console
org.apache.felix:org.apache.felix.gogo.command
org.apache.felix:org.apache.felix.gogo.runtime
org.apache.felix:org.apache.felix.gogo.shell
- org.eclipse.core:org.eclipse.core.contenttype
- org.eclipse.core:org.eclipse.core.expressions
- org.eclipse.core:org.eclipse.core.jobs
- org.eclipse.core:org.eclipse.core.runtime
+ org.eclipse.platform:org.eclipse.core.contenttype
+ org.eclipse.platform:org.eclipse.core.expressions
+ org.eclipse.platform:org.eclipse.core.jobs
+ org.eclipse.platform:org.eclipse.core.runtime
org.eclipse.ecf:org.eclipse.ecf
org.eclipse.ecf:org.eclipse.ecf.filetransfer
org.eclipse.ecf:org.eclipse.ecf.identity
org.eclipse.ecf:org.eclipse.ecf.provider.filetransfer
org.eclipse:org.sat4j.core
org.eclipse:org.sat4j.pb
- org.wso2.eclipse.equinox:org.eclipse.equinox.p2.artifact.repository
- org.wso2.eclipse.equinox:org.eclipse.equinox.p2.console
- org.wso2.eclipse.equinox:org.eclipse.equinox.p2.core
- org.wso2.eclipse.equinox:org.eclipse.equinox.p2.director
- org.wso2.eclipse.equinox:org.eclipse.equinox.p2.engine
- org.wso2.eclipse.equinox:org.eclipse.equinox.p2.garbagecollector
- org.wso2.eclipse.equinox:org.eclipse.equinox.p2.jarprocessor
- org.wso2.eclipse.equinox:org.eclipse.equinox.p2.metadata
- org.wso2.eclipse.equinox:org.eclipse.equinox.p2.metadata.repository
- org.eclipse.equinox:org.eclipse.equinox.p2.publisher
- org.eclipse.equinox:org.eclipse.equinox.p2.touchpoint.eclipse
- org.wso2.eclipse.equinox:org.eclipse.equinox.p2.touchpoint.natives
- org.wso2.eclipse.equinox:org.eclipse.equinox.p2.updatechecker
- org.wso2.eclipse.equinox:org.eclipse.equinox.p2.director.app
- org.wso2.eclipse.equinox:org.eclipse.equinox.p2.directorywatcher
- org.wso2.eclipse.equinox:org.eclipse.equinox.p2.extensionlocation
- org.wso2.eclipse.equinox:org.eclipse.equinox.p2.repository.tools
- org.wso2.eclipse.equinox:org.eclipse.equinox.p2.repository
- org.wso2.eclipse.equinox:org.eclipse.equinox.p2.updatesite
- org.eclipse.equinox:org.eclipse.equinox.p2.publisher.eclipse
- org.wso2.eclipse.equinox:org.eclipse.equinox.launcher.gtk.linux.x86
- org.eclipse.osgi:org.eclipse.equinox.p2.transport.ecf
+ org.eclipse.platform:org.eclipse.equinox.p2.artifact.repository
+ org.tukaani:xz
+ org.eclipse.platform:org.eclipse.equinox.p2.console
+ org.eclipse.platform:org.eclipse.equinox.p2.core
+ org.eclipse.platform:org.eclipse.equinox.p2.director
+ org.eclipse.platform:org.eclipse.equinox.p2.engine
+ org.eclipse.platform:org.eclipse.equinox.p2.garbagecollector
+ org.eclipse.platform:org.eclipse.equinox.p2.jarprocessor
+ org.eclipse.platform:org.eclipse.equinox.p2.metadata
+ org.eclipse.platform:org.eclipse.equinox.p2.metadata.repository
+ org.eclipse.platform:org.eclipse.equinox.p2.publisher
+ org.eclipse.platform:org.eclipse.equinox.p2.touchpoint.eclipse
+ org.eclipse.platform:org.eclipse.equinox.p2.touchpoint.natives
+ org.eclipse.platform:org.eclipse.equinox.p2.updatechecker
+ org.eclipse.platform:org.eclipse.equinox.p2.director.app
+ org.eclipse.platform:org.eclipse.equinox.p2.directorywatcher
+ org.eclipse.platform:org.eclipse.equinox.p2.extensionlocation
+ org.eclipse.platform:org.eclipse.equinox.p2.repository.tools
+ org.eclipse.platform:org.eclipse.equinox.p2.repository
+ org.eclipse.platform:org.eclipse.equinox.p2.updatesite
+ org.eclipse.platform:org.eclipse.equinox.p2.publisher.eclipse
+ org.eclipse.platform:org.eclipse.equinox.p2.transport.ecf
+ org.eclipse.platform:org.eclipse.equinox.http.service.api
org.eclipse.ecf.provider.filetransfer:httpclient
org.wso2.eclipse.osgi:org.eclipse.osgi.compatibility.state
+ org.osgi:org.osgi.service.component
+ org.osgi:org.osgi.util.promise
+ org.osgi:org.osgi.util.function
+ org.osgi:org.osgi.service.cm
+ org.osgi:org.osgi.service.upnp
+ org.osgi:org.osgi.service.device
+ org.osgi:org.osgi.service.event
+ org.osgi:org.osgi.service.wireadmin
+ org.osgi:org.osgi.service.provisioning
+ org.osgi:org.osgi.service.useradmin
+ org.osgi:org.osgi.service.metatype
+ org.osgi:org.osgi.service.permissionadmin
+ org.osgi:org.osgi.service.http.whiteboard
diff --git a/features/org.wso2.carbon.core.server.feature/pom.xml b/features/org.wso2.carbon.core.server.feature/pom.xml
index db9b07210d0..f02ecee571d 100644
--- a/features/org.wso2.carbon.core.server.feature/pom.xml
+++ b/features/org.wso2.carbon.core.server.feature/pom.xml
@@ -36,6 +36,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
4-p2-feature-generation
diff --git a/features/org.wso2.carbon.core.ui.feature/pom.xml b/features/org.wso2.carbon.core.ui.feature/pom.xml
index 537e0e99803..56049a7d070 100644
--- a/features/org.wso2.carbon.core.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.core.ui.feature/pom.xml
@@ -36,6 +36,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
4-p2-feature-generation
@@ -54,6 +55,7 @@
org.eclipse.platform:org.eclipse.equinox.jsp.jasper:${version.equinox.jsp.jasper}
+ org.glassfish:jakarta.el:3.0.4
org.wso2.carbon:org.wso2.carbon.ui:${carbon.kernel.version}
org.wso2.carbon:org.wso2.carbon.core.commons.stub:${carbon.kernel.version}
org.wso2.carbon:org.wso2.carbon.ui.menu.general:${carbon.kernel.version}
diff --git a/features/org.wso2.carbon.hazelcast.feature/pom.xml b/features/org.wso2.carbon.hazelcast.feature/pom.xml
index 837dd1023ac..a6aa634c50f 100644
--- a/features/org.wso2.carbon.hazelcast.feature/pom.xml
+++ b/features/org.wso2.carbon.hazelcast.feature/pom.xml
@@ -35,6 +35,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
4-p2-feature-generation
diff --git a/parent/pom.xml b/parent/pom.xml
index 2ffeb29b021..2724546650a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -50,7 +50,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
-
+
@@ -108,10 +108,12 @@
org.apache.maven.plugins
maven-compiler-plugin
+ 3.12.1
UTF-8
-
- 1.8
+
+ 17
+
@@ -303,80 +305,79 @@
4.9.27-SNAPSHOT
${carbon.kernel.version}
- [${carbon.kernel.version}, 4.10.0)
+ [${carbon.kernel.version}, 5.0.0)
- 1.1.200.v20160504-1450
- 3.8.0.v20160509-1230
- 1.4.400.v20160226-2036
- 1.3.200.v20160318-1642
- 1.0.500.v20130404-1337
- 1.3.100.v20130327-1442
- 1.1.0.v20130327-1442
- 2.0.300.v20160504-1450
- 1.0.700.v20160102-2223
- 3.6.0.v20160120-1756
- 3.6.0.v20150318-1503
- 1.2.100.v20150423-1356
- 2.0.200.v20160504-1450
- 1.1.400.v20160518-1444
- 3.9.0.v20130326-1255
- 3.5.100.v20160504-1419
- 3.14.0
- 3.4.200.v20130326-1255
- 3.4.500.v20130515-1343
- 3.5.300.v20130429-1813
- 1.3.300
+ 1.5.200
+ 3.19.0
+ 1.6.200
+ 1.6.700
+ 1.1.300
+ 1.7.0
+ 1.3.0
+ 2.3.100
+ 1.3.100
+ 3.11.0
+ 3.12.0
+ 1.4.200
+ 2.3.100
+ 1.1.800
+ 3.31.0
+ 3.12.0
+ 3.19.0
+ 3.9.300
+ 3.9.300
+ 3.15.200
+ 1.4.700
1.0.200.v20160504-1419
- 3.2.0.v20130604-1622
- 5.0.0.v20130604-1622
- 3.2.0.v20130604-1622
- 3.2.0.v20130604-1622
+ 3.11.0
+ 5.1.103
+ 3.10.0
+ 3.3.0
2.3.5.v201308161310
2.3.5.v201308161310
2.3.0.v20110329
[1.9,2.0)
[1.2.0,2.0)
- 1.1.400.v20130418-1354
- 1.1.0.wso2v1
- 1.1.200
+ 1.8.100
+
+ 1.2.0
3.0.0.v201112011016
2.2.0.v201108011116
2.2.0.v201112011158
2.2.2.v201205150955
- 1.1.300.v20131211-1531
- 2.3.0.v20131211-1531
- 2.3.100.v20140224-1921
- 1.0.300.v20150129-0838
- 1.1.0.v20131211-1531
- 2.3.0.v20140506-1720
- 1.0.300.v20131113-1212
+ 1.5.300
+ 2.11.0
+ 2.6.300
+ 1.3.300
+ 1.4.300
+ 2.10.0
+ 1.3.300
- 1.2.100.v20131119-0908
- 1.0.200.v20131115-1210
- 1.0.300.v20131211-1531
- 2.2.0.v20131211-1531
- 1.2.100.v20131209-2144
- 1.1.200.v20131119-0908
- 2.1.0.v20131211-1531
- 2.3.0.v20131211-1531
- 2.1.0.v20110511-wso2v1
-
- 1.1.100.v20140523-0116
- 1.1.200.v20131119-0908
- 1.0.400.v20131211-1531
- 0.10.0.v201212101605
- 0.10.0.v201209301036
- 0.10.0.v201209301215
- 1.0.0.v20110511
- 1.2.0.v20110511
- 1.0.100.v20110902-0807
+ 1.5.300
+ 1.3.200
+ 1.3.300
+ 2.9.0
+ 1.5.300
+ 1.5.300
+ 2.4.300
+ 2.8.100
+ 2.4.200
+ 1.5.200
+ 1.4.200
+ 1.3.200
+ 1.1.4
+ 1.1.6
+ 1.1.2
+ 1.6.0
+ 1.9.100
+ 1.4.200
4.0.200.v20120319-0616
- 5.1.2
+ 5.2.50-SNAPSHOT
- 1.1.13
+ 1.1.14
2.0.4.wso2v5
[2.0.4.wso2v4, 3.1.0)
@@ -409,9 +410,9 @@
1.0-wso2v2
- 1.0.0.wso2v3
- 1.0.0.wso2v3
- [1.0.0.wso2v3, 2)
+ 1.0.0.wso2v4
+ 1.0.0.wso2v4
+ [1.0.0.wso2v4, 2)
1.0.1.wso2v2
@@ -428,7 +429,7 @@
1.0b3
- 5.2.0.wso2v1
+ 3.1.0.wso2v1
1.0.0.M9-wso2v1
@@ -439,12 +440,12 @@
[2.0.4.wso2v4, 3.0.0)
- 1.2.11-wso2v25
+ 1.2.11-wso2v28
[1.2.11, 1.3.0)
- 1.2.11-wso2v25
- 1.2.11-wso2v25
+ 1.2.11-wso2v28
+ 1.2.11-wso2v28
[1.2.11, 1.3.0)
- 1.6.wso2v1
+ 1.10.0.wso2v2
3.4.0.wso2v1
@@ -455,7 +456,7 @@
3.1.0.RELEASE
- 1.6.1-wso2v76
+ 1.6.1-wso2v98-SNAPSHOT
[1.6.1, 1.7.0)
${version.axis2}
${version.axis2}
@@ -470,32 +471,35 @@
3.2.0.wso2v1
- 1.3.4
+ 1.5.4
1.3.4.wso2v1
1.8.0.7wso2v1
+ 1.8.0.wso2v1
5.2.5.wso2v1
5.2.5.wso2v1
5.2.5.wso2v1
2.6.0.wso2v1
3.2.2.wso2v1
- 2.15.1.wso2v1
+ 2.11.0.wso2v1
3.0.4.wso2v1
1.5.7-wso2v1
1.1.1.wso2v1
1.1.2.wso2v1
+ 2.1.0-wso2v5
+ 2.3.2
9.0.85
- ${version.tomcat}.wso2v1
- ${version.tomcat}.wso2v1
- ${version.tomcat}.wso2v1
+ ${version.tomcat}.wso2v2
+ ${version.tomcat}.wso2v2
+ ${version.tomcat}.wso2v2
${version.tomcat}.wso2v1
${version.tomcat}.wso2v1
3.28.0
- 4.2.6.wso2v1
+ 5.3.6.wso2v1
0.9.18
@@ -539,7 +543,7 @@
1.16.0.wso2v1
0.1.0.wso2v1
3.1.0.wso2v1
- 1.5.0.wso2v2
+ 1.5.0.wso2v3
1.5.0.wso2v2
1.8.wso2v1
@@ -548,7 +552,7 @@
3.1.0.wso2v6
1.5.6.wso2v1
- 1.2.0.wso2v1
+ 1.2.0.wso2v3
5.1.1.wso2v1
@@ -588,7 +592,7 @@
1.3
1.7.4
- 3.2.0
+ 5.1.9
2.1.2
2.4
1.7
@@ -605,6 +609,7 @@
9.0.65.wso2v1
+ 1.5.10
1.0M9
2.4.1
2.10.1
@@ -621,7 +626,7 @@
2.0.2
- 3.1.0.wso2v4
+ 3.1.0.wso2v5
[1.2.0,1.3.0)
@@ -639,8 +644,9 @@
0.5.0
7.8.2
2.16.1
- 2.16.0
- 2.16.0
+ 2.16.1
+ 2.16.1
+ 1.15.3
33.0.0-jre
1.1.0
2.6.2
@@ -650,10 +656,10 @@
1.0.23
1.8.3
1.5.0
- 4.3.6.wso2v2
-
- [4.3.1.wso2v2,5.0.0)
-
+
+ 4.5.13.wso2v1
+ [4.3.1.wso2v2,5.0.0)
+
@@ -669,193 +675,223 @@
${version.equinox.osgi}
- org.wso2.eclipse.osgi
+ org.eclipse.platform
org.eclipse.osgi.services
${version.equinox.osgi.services}
+
+
+ org.eclipse.platform
+ org.eclipse.osgi.util
+ 3.7.300
+
+
+
+ org.apache.felix
+ org.apache.felix.scr
+ 2.2.10
+
+
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.common
${version.equinox.common}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.simpleconfigurator
${version.equinox.simpleconfigurator}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.util
${version.equinox.util}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.ds
${version.equinox.ds}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.launcher
${version.equinox.launcher}
- org.wso2.eclipse.equinox
- org.eclipse.equinox.launcher.gtk.linux.x86
- ${version.equinox.launcher.gtk.linux.x86}
+ org.eclipse.platform
+ org.eclipse.equinox.launcher.gtk.linux.x86_64
+ 1.2.900
- org.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.app
${version.equinox.app}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.concurrent
${version.equinox.concurrent}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.frameworkadmin
${version.equinox.frameworkadmin}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.frameworkadmin.equinox
${version.equinox.frameworkadmin.equinox}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.artifact.repository
${version.equinox.p2.artifact.repository}
- org.wso2.eclipse.equinox
+ org.tukaani
+ xz
+ 1.9
+
+
+ org.eclipse.platform
org.eclipse.equinox.p2.console
${version.equinox.p2.console}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.core
${version.equinox.p2.core}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.director
${version.equinox.p2.director}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.director.app
${version.equinox.p2.director.app}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.directorywatcher
${version.equinox.p2.directorywatcher}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.engine
${version.equinox.p2.engine}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.extensionlocation
${version.equinox.p2.extensionlocation}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.garbagecollector
${version.equinox.p2.garbagecollector}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.jarprocessor
${version.equinox.p2.jarprocessor}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.metadata
${version.equinox.p2.metadata}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.metadata.repository
${version.equinox.p2.metadata.repository}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.reconciler.dropins
${version.equinox.p2.reconciler.dropins}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.repository.tools
${version.equinox.p2.repository.tools}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.repository
${version.equinox.p2.repository}
- org.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.touchpoint.eclipse
${version.equinox.p2.touchpoint.eclipse}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.touchpoint.natives
${version.equinox.p2.touchpoint.natives}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.updatechecker
${version.equinox.p2.updatechecker}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.updatesite
${version.equinox.p2.updatesite}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.preferences
${version.equinox.preferences}
+
- org.wso2.eclipse.equinox
+ org.osgi
+ org.osgi.service.prefs
+ 1.1.2
+
+
+
+ org.bouncycastle
+ bcpg-jdk18on
+ 1.77
+
+
+ org.eclipse.platform
org.eclipse.equinox.registry
${version.equinox.registry}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.security
${version.equinox.security}
- org.wso2.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.simpleconfigurator.manipulator
${version.equinox.simpleconfigurator.manipulator}
- org.eclipse.core
+ org.eclipse.platform
org.eclipse.core.contenttype
${version.equinox.core.contenttype}
- org.eclipse.core
+ org.eclipse.platform
org.eclipse.core.expressions
${version.equinox.core.expressions}
- org.eclipse.core
+ org.eclipse.platform
org.eclipse.core.jobs
${version.equinox.core.jobs}
- org.eclipse.core
+ org.eclipse.platform
org.eclipse.core.runtime
${version.equinox.core.runtime}
@@ -901,14 +937,14 @@
${version.eclipse.ecj}
- org.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.http.servlet
${version.equinox.http.servlet}
- org.eclipse.equinox
- org.eclipse.equinox.http.helper
- ${version.equinox.http.helper}
+ org.eclipse.platform
+ org.eclipse.equinox.http.service.api
+ 1.2.2
org.eclipse.platform
@@ -916,27 +952,22 @@
${version.equinox.jsp.jasper}
- org.eclipse.equinox
- javax.servlet.jsp
- ${version.equinox.javax.servlet.jsp}
-
-
- org.eclipse.equinox
- org.apache.jasper.glassfish
- ${version.equinox.jasper}
+ org.glassfish
+ jakarta.el
+ 3.0.4
org.eclipse.equinox
- javax.el
- ${version.javax.el}
+ javax.servlet.jsp
+ ${version.equinox.javax.servlet.jsp}
- org.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.publisher
${version.equinox.p2.publisher}
- org.eclipse.equinox
+ org.eclipse.platform
org.eclipse.equinox.p2.publisher.eclipse
${version.equinox.p2.publisher.eclipse}
@@ -956,7 +987,7 @@
${version.apache.felix.gogo.runtime}
- org.eclipse.osgi
+ org.eclipse.platform
org.eclipse.equinox.p2.transport.ecf
${version.equinox.p2.transport.ecf}
@@ -990,6 +1021,11 @@
bcpkix-jdk18on
${bouncycastle.pkix.version}
+
+ org.bouncycastle
+ bcpg-jdk18on
+ 1.77
+
org.compass-project.wso2
compass
@@ -1102,6 +1138,11 @@
xalan
${version.xalan}
+
+ org.wso2.orbit.xalan
+ serializer
+ ${version.xalan.serializer}
+
xml-apis
xml-apis
@@ -1243,6 +1284,11 @@
commons-lang
${orbit.version.commons.lang}
+
+ org.wso2.orbit.org.apache.commons
+ commons-lang3
+ ${commons-lang3.orbit.version}
+
ws-commons
tcpmon
@@ -1284,6 +1330,11 @@
smack
${orbit.version.smack}
+
+ org.apache.lucene
+ lucene-core
+ ${version.lucene.core}
+
commons-modeler
commons-modeler
@@ -1826,6 +1877,11 @@
jackson-dataformat-yaml
${version.jackson.dataformat}
+
+ org.jsoup
+ jsoup
+ ${version.jsoup}
+
com.google.guava
guava
@@ -1856,6 +1912,80 @@
org.osgi.service.component.annotations
${version.org.osgi.service.component.annotations}
+
+
+ org.osgi
+ org.osgi.service.component
+ 1.5.1
+
+
+
+ org.osgi
+ org.osgi.util.promise
+ 1.3.0
+
+
+
+ org.osgi
+ org.osgi.util.function
+ 1.2.0
+
+
+
+ org.osgi
+ org.osgi.service.cm
+ 1.6.1
+
+
+
+ org.osgi
+ org.osgi.service.upnp
+ 1.2.1
+
+
+
+ org.osgi
+ org.osgi.service.device
+ 1.1.1
+
+
+
+ org.osgi
+ org.osgi.service.event
+ 1.4.1
+
+
+
+ org.osgi
+ org.osgi.service.wireadmin
+ 1.0.2
+
+
+ org.osgi
+ org.osgi.service.provisioning
+ 1.2.0
+
+
+ org.osgi
+ org.osgi.service.useradmin
+ 1.1.1
+
+
+ org.osgi
+ org.osgi.service.metatype
+ 1.4.1
+
+
+ org.osgi
+ org.osgi.service.permissionadmin
+ 1.2.1
+
+
+ org.osgi
+ org.osgi.service.http.whiteboard
+ 1.1.1
+
+
org.osgi
org.osgi.annotation
@@ -1902,11 +2032,6 @@
${version.log4j.core}
true
-
- org.wso2.orbit.org.apache.httpcomponents
- httpclient
- ${httpcomponents-httpclient.wso2.version}
-
com.sun.xml.messaging.saaj
saaj-impl
@@ -1917,6 +2042,21 @@
stax-ex
${version.stax.ex}
+
+ org.wso2.orbit.org.apache.httpcomponents
+ httpclient
+ ${httpcomponents-httpclient.wso2.version}
+
+
+ org.wso2.orbit.javax.activation
+ activation
+ 1.1.1.wso2v4
+
+
+ javax.xml.soap
+ javax.xml.soap-api
+ 1.4.0
+
diff --git a/samples/pom.xml b/samples/pom.xml
index 6901995aeb2..18fb81c1897 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -26,7 +26,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
-
+
diff --git a/samples/student-manager/components/org.wso2.carbon.student.mgt.ui/pom.xml b/samples/student-manager/components/org.wso2.carbon.student.mgt.ui/pom.xml
index a41f0af3dfa..5780021f555 100644
--- a/samples/student-manager/components/org.wso2.carbon.student.mgt.ui/pom.xml
+++ b/samples/student-manager/components/org.wso2.carbon.student.mgt.ui/pom.xml
@@ -82,7 +82,6 @@
org.apache.felix
maven-bundle-plugin
- ${maven.bundle.plugin.version}
true
s
diff --git a/samples/student-manager/features/org.wso2.carbon.student.mgt.feature/pom.xml b/samples/student-manager/features/org.wso2.carbon.student.mgt.feature/pom.xml
index 9129d262c25..a086e75231b 100644
--- a/samples/student-manager/features/org.wso2.carbon.student.mgt.feature/pom.xml
+++ b/samples/student-manager/features/org.wso2.carbon.student.mgt.feature/pom.xml
@@ -36,6 +36,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
${carbon.p2.plugin.version}
@@ -53,10 +54,8 @@
- org.wso2.carbon:org.wso2.carbon.student.mgt.server.feature
-
- org.wso2.carbon:org.wso2.carbon.student.mgt.ui.feature
-
+ org.wso2.carbon:org.wso2.carbon.student.mgt.server.feature:${student.manager.version}
+ org.wso2.carbon:org.wso2.carbon.student.mgt.ui.feature:${student.manager.version}
diff --git a/samples/student-manager/features/org.wso2.carbon.student.mgt.server.feature/pom.xml b/samples/student-manager/features/org.wso2.carbon.student.mgt.server.feature/pom.xml
index 4ecac08221a..7473f2932ed 100644
--- a/samples/student-manager/features/org.wso2.carbon.student.mgt.server.feature/pom.xml
+++ b/samples/student-manager/features/org.wso2.carbon.student.mgt.server.feature/pom.xml
@@ -27,6 +27,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
${carbon.p2.plugin.version}
@@ -45,7 +46,7 @@
- org.wso2.carbon:org.wso2.carbon.student.mgt
+ org.wso2.carbon:org.wso2.carbon.student.mgt:${student.manager.version}
diff --git a/samples/student-manager/features/org.wso2.carbon.student.mgt.ui.feature/pom.xml b/samples/student-manager/features/org.wso2.carbon.student.mgt.ui.feature/pom.xml
index 5d72883cf72..a6d0fe0592d 100644
--- a/samples/student-manager/features/org.wso2.carbon.student.mgt.ui.feature/pom.xml
+++ b/samples/student-manager/features/org.wso2.carbon.student.mgt.ui.feature/pom.xml
@@ -25,6 +25,7 @@
org.wso2.maven
carbon-p2-plugin
+ true
${carbon.p2.plugin.version}
@@ -43,7 +44,7 @@
- org.wso2.carbon:org.wso2.carbon.student.mgt.ui
+ org.wso2.carbon:org.wso2.carbon.student.mgt.ui:${student.manager.version}
diff --git a/samples/student-manager/features/pom.xml b/samples/student-manager/features/pom.xml
index 91cf9ea3e55..39c5446ced8 100644
--- a/samples/student-manager/features/pom.xml
+++ b/samples/student-manager/features/pom.xml
@@ -18,8 +18,4 @@
org.wso2.carbon.student.mgt.ui.feature
org.wso2.carbon.student.mgt.feature
-
-
-
-
diff --git a/samples/student-manager/pom.xml b/samples/student-manager/pom.xml
index e3acf41cb5f..abdc3f79b66 100644
--- a/samples/student-manager/pom.xml
+++ b/samples/student-manager/pom.xml
@@ -16,7 +16,7 @@
4.9.27-SNAPSHOT
- 5.1.2
+ 5.2.50-SNAPSHOT
2.3.5
1.6.1-wso2v29
diff --git a/samples/student-manager/repository/pom.xml b/samples/student-manager/repository/pom.xml
index 083af72f9e5..f893ed5c019 100644
--- a/samples/student-manager/repository/pom.xml
+++ b/samples/student-manager/repository/pom.xml
@@ -20,6 +20,7 @@
org.wso2.maven
carbon-p2-plugin
${carbon.p2.plugin.version}
+ true
2-p2-repo-generation
diff --git a/tests/caching/pom.xml b/tests/caching/pom.xml
index 5300f882ccc..e15ae108a12 100644
--- a/tests/caching/pom.xml
+++ b/tests/caching/pom.xml
@@ -23,8 +23,8 @@
org.apache.maven.plugins
maven-compiler-plugin
-
- 8
+
+ 17