You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by hu...@apache.org on 2011/10/26 13:06:37 UTC
svn commit: r1189134 - in /aries/branches/oct-2011-release: ./
application/application-api/src/main/java/org/apache/aries/application/management/
application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/
application...
Author: hughesj
Date: Wed Oct 26 11:06:35 2011
New Revision: 1189134
URL: http://svn.apache.org/viewvc?rev=1189134&view=rev
Log:
Merging in trunk up to r1189121
Modified:
aries/branches/oct-2011-release/ (props changed)
aries/branches/oct-2011-release/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java (props changed)
aries/branches/oct-2011-release/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java (props changed)
aries/branches/oct-2011-release/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java (props changed)
aries/branches/oct-2011-release/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java (props changed)
aries/branches/oct-2011-release/application/application-runtime-framework-management/src/main/resources/OSGI-INF/blueprint/bundle-framework-management.xml
aries/branches/oct-2011-release/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java (props changed)
aries/branches/oct-2011-release/blueprint/blueprint-cm/src/main/java/org/apache/aries/ (props changed)
aries/branches/oct-2011-release/blueprint/blueprint-cm/src/main/resources/org/apache/aries/ (props changed)
aries/branches/oct-2011-release/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java (props changed)
aries/branches/oct-2011-release/blueprint/blueprint-core/src/main/resources/org/apache/aries/ (props changed)
aries/branches/oct-2011-release/blueprint/blueprint-itests/src/test/java/org/apache/aries/ (props changed)
aries/branches/oct-2011-release/ejb/openejb-extender/src/main/java/org/apache/aries/ejb/openejb/extender/EJBExtender.java
aries/branches/oct-2011-release/ejb/openejb-extender/src/main/java/org/apache/aries/ejb/openejb/extender/RunningApplication.java
aries/branches/oct-2011-release/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java (props changed)
aries/branches/oct-2011-release/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java (props changed)
aries/branches/oct-2011-release/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java (props changed)
aries/branches/oct-2011-release/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java (props changed)
aries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java (props changed)
aries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java (props changed)
aries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java (props changed)
aries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java (props changed)
aries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java (props changed)
aries/branches/oct-2011-release/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java (props changed)
aries/branches/oct-2011-release/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ (props changed)
aries/branches/oct-2011-release/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ (props changed)
aries/branches/oct-2011-release/jndi/jndi-core/src/main/java/org/apache/aries/jndi/Utils.java
aries/branches/oct-2011-release/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java (props changed)
aries/branches/oct-2011-release/jndi/jndi-url/src/main/java/org/apache/aries/jndi/ (props changed)
aries/branches/oct-2011-release/jndi/jndi-url/src/test/java/org/apache/aries/jndi/ (props changed)
aries/branches/oct-2011-release/proxy/proxy-bundle/pom.xml
aries/branches/oct-2011-release/subsystem/pom.xml
aries/branches/oct-2011-release/subsystem/readme.txt
aries/branches/oct-2011-release/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/SubsystemContentHeader.java
aries/branches/oct-2011-release/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/VersionRangeAttribute.java
aries/branches/oct-2011-release/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/OsgiIdentityRequirement.java
aries/branches/oct-2011-release/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/ (props changed)
aries/branches/oct-2011-release/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/ (props changed)
aries/branches/oct-2011-release/util/src/test/java/org/apache/aries/util/VersionRangeTest.java (props changed)
Propchange: aries/branches/oct-2011-release/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk:1185252-1186822
+/aries/trunk:1185252-1189121
Propchange: aries/branches/oct-2011-release/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java:1185252-1186822
+/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java:1185252-1189121
Propchange: aries/branches/oct-2011-release/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java:1185252-1186822
+/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java:1185252-1189121
Propchange: aries/branches/oct-2011-release/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java:1185252-1186822
+/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java:1185252-1189121
Propchange: aries/branches/oct-2011-release/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java:1185252-1186822
+/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java:1185252-1189121
Modified: aries/branches/oct-2011-release/application/application-runtime-framework-management/src/main/resources/OSGI-INF/blueprint/bundle-framework-management.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/application/application-runtime-framework-management/src/main/resources/OSGI-INF/blueprint/bundle-framework-management.xml?rev=1189134&r1=1189133&r2=1189134&view=diff
==============================================================================
--- aries/branches/oct-2011-release/application/application-runtime-framework-management/src/main/resources/OSGI-INF/blueprint/bundle-framework-management.xml (original)
+++ aries/branches/oct-2011-release/application/application-runtime-framework-management/src/main/resources/OSGI-INF/blueprint/bundle-framework-management.xml Wed Oct 26 11:06:35 2011
@@ -19,7 +19,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0">
- <bean id="equinox-bundle-framework-manager" class="org.apache.aries.application.runtime.framework.management.BundleFrameworkManagerImpl" init-method="init" destroy-method="close">
+ <bean id="equinox-bundle-framework-manager" class="org.apache.aries.application.runtime.framework.management.BundleFrameworkManagerImpl" init-method="init" destroy-method="close" activation="lazy">
<property name="bundleFrameworkFactory" ref="bundle-framework-factory"/>
<property name="bundleFrameworkConfigurationFactory" ref="bundle-framework-configuration-factory"/>
<property name="bundleContext" ref="blueprintBundleContext"/>
Propchange: aries/branches/oct-2011-release/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java:1185252-1186822
+/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java:1185252-1189121
Propchange: aries/branches/oct-2011-release/blueprint/blueprint-cm/src/main/java/org/apache/aries/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries:1185252-1186822
+/aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries:1185252-1189121
Propchange: aries/branches/oct-2011-release/blueprint/blueprint-cm/src/main/resources/org/apache/aries/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/blueprint/blueprint-cm/src/main/resources/org/apache/aries:1185252-1186822
+/aries/trunk/blueprint/blueprint-cm/src/main/resources/org/apache/aries:1185252-1189121
Propchange: aries/branches/oct-2011-release/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java:1185252-1186822
+/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java:1185252-1189121
Propchange: aries/branches/oct-2011-release/blueprint/blueprint-core/src/main/resources/org/apache/aries/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries:1185252-1186822
+/aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries:1185252-1189121
Propchange: aries/branches/oct-2011-release/blueprint/blueprint-itests/src/test/java/org/apache/aries/
('svn:mergeinfo' removed)
Modified: aries/branches/oct-2011-release/ejb/openejb-extender/src/main/java/org/apache/aries/ejb/openejb/extender/EJBExtender.java
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/ejb/openejb-extender/src/main/java/org/apache/aries/ejb/openejb/extender/EJBExtender.java?rev=1189134&r1=1189133&r2=1189134&view=diff
==============================================================================
--- aries/branches/oct-2011-release/ejb/openejb-extender/src/main/java/org/apache/aries/ejb/openejb/extender/EJBExtender.java (original)
+++ aries/branches/oct-2011-release/ejb/openejb-extender/src/main/java/org/apache/aries/ejb/openejb/extender/EJBExtender.java Wed Oct 26 11:06:35 2011
@@ -34,7 +34,11 @@ import org.apache.aries.util.tracker.Rec
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.EjbJarInfo;
+import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
+import org.apache.openejb.assembler.classic.PersistenceContextReferenceInfo;
+import org.apache.openejb.assembler.classic.PersistenceUnitReferenceInfo;
import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
+import org.apache.openejb.assembler.classic.ReferenceLocationInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
import org.apache.openejb.assembler.dynamic.PassthroughFactory;
@@ -230,6 +234,8 @@ public class EJBExtender implements Bund
Thread.currentThread().setContextClassLoader(cl);
}
+ processJPAMappings(ejbInfo);
+
Assembler assembler = (Assembler) SystemInstance.get().getComponent(Assembler.class);
RunningApplication app = null;
@@ -266,6 +272,22 @@ public class EJBExtender implements Bund
}
}
+ private void processJPAMappings(EjbJarInfo ejbInfo) {
+ for(EnterpriseBeanInfo ebi : ejbInfo.enterpriseBeans){
+
+ for(PersistenceUnitReferenceInfo pui : ebi.jndiEnc.persistenceUnitRefs) {
+ pui.location = new ReferenceLocationInfo();
+ pui.location.jndiName = "aries/integration/unit/" + pui.persistenceUnitName;
+ }
+
+ for(PersistenceContextReferenceInfo pci : ebi.jndiEnc.persistenceContextRefs) {
+ pci.location = new ReferenceLocationInfo();
+ pci.location.jndiName = "aries/integration/context/" + pci.persistenceUnitName;
+ }
+ }
+
+ }
+
private void addAltDDs(EjbModule ejbModule, Bundle bundle) {
Map<String, Object> altDDs = ejbModule.getAltDDs();
Modified: aries/branches/oct-2011-release/ejb/openejb-extender/src/main/java/org/apache/aries/ejb/openejb/extender/RunningApplication.java
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/ejb/openejb-extender/src/main/java/org/apache/aries/ejb/openejb/extender/RunningApplication.java?rev=1189134&r1=1189133&r2=1189134&view=diff
==============================================================================
--- aries/branches/oct-2011-release/ejb/openejb-extender/src/main/java/org/apache/aries/ejb/openejb/extender/RunningApplication.java (original)
+++ aries/branches/oct-2011-release/ejb/openejb-extender/src/main/java/org/apache/aries/ejb/openejb/extender/RunningApplication.java Wed Oct 26 11:06:35 2011
@@ -44,6 +44,7 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.PersistenceContextReferenceInfo;
import org.apache.openejb.assembler.classic.PersistenceUnitReferenceInfo;
import org.apache.openejb.assembler.classic.ProxyInterfaceResolver;
+import org.apache.openejb.assembler.classic.ReferenceLocationInfo;
import org.apache.openejb.jee.EnterpriseBean;
import org.apache.openejb.persistence.JtaEntityManager;
import org.osgi.framework.Bundle;
@@ -64,8 +65,8 @@ public class RunningApplication implemen
private ServiceTracker tracker;
- private final ConcurrentMap<String, ConcurrentMap<Context, String>> unitRegistrations =
- new ConcurrentHashMap<String, ConcurrentMap<Context, String>>();
+ private final ConcurrentMap<String, ConcurrentMap<Context, PersistenceUnitReferenceInfo>>
+ unitRegistrations = new ConcurrentHashMap<String, ConcurrentMap<Context, PersistenceUnitReferenceInfo>>();
private final ConcurrentMap<String, ConcurrentMap<Context, PersistenceContextReferenceInfo>>
contextRegistrations = new ConcurrentHashMap<String, ConcurrentMap<Context, PersistenceContextReferenceInfo>>();
@@ -76,16 +77,17 @@ public class RunningApplication implemen
for(EnterpriseBeanInfo bean : enterpriseBeans) {
for(PersistenceUnitReferenceInfo pui : bean.jndiEnc.persistenceUnitRefs) {
- ConcurrentMap<Context, String> map = unitRegistrations.get(pui.persistenceUnitName);
+ ConcurrentMap<Context, PersistenceUnitReferenceInfo> map = unitRegistrations.
+ get(pui.persistenceUnitName);
if(map == null) {
- map = new ConcurrentHashMap<Context, String>();
+ map = new ConcurrentHashMap<Context, PersistenceUnitReferenceInfo>();
unitRegistrations.put(pui.persistenceUnitName, map);
}
for(BeanContext eb : ctx.getBeanContexts()) {
if(eb.getEjbName().equals(bean.ejbName)){
- map.put(eb.getJndiContext(), pui.referenceName);
+ map.put(eb.getJndiContext(), pui);
continue;
}
}
@@ -223,13 +225,13 @@ public class RunningApplication implemen
if(isTrue(reference, PersistenceUnitConstants.CONTAINER_MANAGED_PERSISTENCE_UNIT) &&
!!!isTrue(reference, PersistenceContextProvider.PROXY_FACTORY_EMF_ATTRIBUTE)) {
- Map<Context, String> pUnitRefs = unitRegistrations.
+ Map<Context, PersistenceUnitReferenceInfo> pUnitRefs = unitRegistrations.
get(reference.getProperty(PersistenceUnitConstants.OSGI_UNIT_NAME));
Map<Context, PersistenceContextReferenceInfo> pCtxRefs = contextRegistrations.
get(reference.getProperty(PersistenceUnitConstants.OSGI_UNIT_NAME));
if(pUnitRefs == null) {
- pUnitRefs = new HashMap<Context, String>();
+ pUnitRefs = new HashMap<Context, PersistenceUnitReferenceInfo>();
}
if(pCtxRefs == null) {
pCtxRefs = new HashMap<Context, PersistenceContextReferenceInfo>();
@@ -239,9 +241,9 @@ public class RunningApplication implemen
EntityManagerFactory emf = (EntityManagerFactory)bundle.getBundleContext().getService(reference);
- for(Entry<Context, String> e : pUnitRefs.entrySet()) {
+ for(Entry<Context, PersistenceUnitReferenceInfo> e : pUnitRefs.entrySet()) {
try {
- e.getKey().bind(e.getValue(), emf);
+ e.getKey().bind(e.getValue().referenceName, emf);
} catch (NamingException ex) {
// TODO Auto-generated catch block
ex.printStackTrace();
@@ -276,13 +278,13 @@ public class RunningApplication implemen
public void removedService(ServiceReference reference, Object service) {
- Map<Context, String> pUnitRefs = unitRegistrations.
+ Map<Context, PersistenceUnitReferenceInfo> pUnitRefs = unitRegistrations.
get(reference.getProperty(PersistenceUnitConstants.OSGI_UNIT_NAME));
Map<Context, PersistenceContextReferenceInfo> pCtxRefs = contextRegistrations.
get(reference.getProperty(PersistenceUnitConstants.OSGI_UNIT_NAME));
if(pUnitRefs == null) {
- pUnitRefs = new HashMap<Context, String>();
+ pUnitRefs = new HashMap<Context, PersistenceUnitReferenceInfo>();
}
if(pCtxRefs == null) {
pCtxRefs = new HashMap<Context, PersistenceContextReferenceInfo>();
@@ -290,9 +292,9 @@ public class RunningApplication implemen
if(pUnitRefs.size() > 0 || pCtxRefs.size() > 0) {
- for(Entry<Context, String> e : pUnitRefs.entrySet()) {
+ for(Entry<Context, PersistenceUnitReferenceInfo> e : pUnitRefs.entrySet()) {
try {
- e.getKey().unbind(e.getValue());
+ e.getKey().unbind(e.getValue().referenceName);
} catch (NamingException ex) {
// TODO Auto-generated catch block
ex.printStackTrace();
Propchange: aries/branches/oct-2011-release/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java:1185252-1186822
+/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java:1185252-1189121
Propchange: aries/branches/oct-2011-release/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java:1185252-1186822
+/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java:1185252-1189121
Propchange: aries/branches/oct-2011-release/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java:1185252-1186822
+/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java:1185252-1189121
Propchange: aries/branches/oct-2011-release/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java:1185252-1186822
+/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java:1185252-1189121
Propchange: aries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java:1185252-1186822
+/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java:1185252-1189121
Propchange: aries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java:1185252-1186822
+/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java:1185252-1189121
Propchange: aries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java:1185252-1186822
+/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java:1185252-1189121
Propchange: aries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java:1185252-1186822
+/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java:1185252-1189121
Propchange: aries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java:1185252-1186822
+/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java:1185252-1189121
Propchange: aries/branches/oct-2011-release/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java:1185252-1186822
+/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java:1185252-1189121
Propchange: aries/branches/oct-2011-release/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework:1185252-1186822
+/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework:1185252-1189121
Propchange: aries/branches/oct-2011-release/jndi/jndi-core/src/main/java/org/apache/aries/jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi:1185252-1186822
+/aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi:1185252-1189121
Modified: aries/branches/oct-2011-release/jndi/jndi-core/src/main/java/org/apache/aries/jndi/Utils.java
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/jndi/jndi-core/src/main/java/org/apache/aries/jndi/Utils.java?rev=1189134&r1=1189133&r2=1189134&view=diff
==============================================================================
--- aries/branches/oct-2011-release/jndi/jndi-core/src/main/java/org/apache/aries/jndi/Utils.java (original)
+++ aries/branches/oct-2011-release/jndi/jndi-core/src/main/java/org/apache/aries/jndi/Utils.java Wed Oct 26 11:06:35 2011
@@ -31,7 +31,9 @@ import javax.naming.NamingException;
import org.apache.aries.jndi.spi.EnvironmentAugmentation;
import org.apache.aries.jndi.startup.Activator;
import org.apache.aries.util.nls.MessageUtil;
+import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
import org.osgi.framework.BundleReference;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
@@ -108,7 +110,16 @@ public final class Utils {
BundleContext result = null;
while (result == null && cl != null) {
if (cl instanceof BundleReference) {
- result = ((BundleReference) cl).getBundle().getBundleContext();
+ Bundle b = ((BundleReference)cl).getBundle();
+ result = b.getBundleContext();
+ if (result == null) {
+ try {
+ b.start();
+ result = b.getBundleContext();
+ } catch (BundleException e) {
+ }
+ break;
+ }
} else if (cl != null) {
cl = cl.getParent();
}
Propchange: aries/branches/oct-2011-release/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java:1185252-1186822
+/aries/trunk/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java:1185252-1189121
Propchange: aries/branches/oct-2011-release/jndi/jndi-url/src/main/java/org/apache/aries/jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi:1185252-1186822
+/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi:1185252-1189121
Propchange: aries/branches/oct-2011-release/jndi/jndi-url/src/test/java/org/apache/aries/jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/jndi/jndi-url/src/test/java/org/apache/aries/jndi:1185252-1186822
+/aries/trunk/jndi/jndi-url/src/test/java/org/apache/aries/jndi:1185252-1189121
Modified: aries/branches/oct-2011-release/proxy/proxy-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/proxy/proxy-bundle/pom.xml?rev=1189134&r1=1189133&r2=1189134&view=diff
==============================================================================
--- aries/branches/oct-2011-release/proxy/proxy-bundle/pom.xml (original)
+++ aries/branches/oct-2011-release/proxy/proxy-bundle/pom.xml Wed Oct 26 11:06:35 2011
@@ -83,6 +83,12 @@
<version>4.3.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <optional>true</optional>
+ <version>3.2</version>
+ </dependency>
</dependencies>
</project>
Modified: aries/branches/oct-2011-release/subsystem/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/subsystem/pom.xml?rev=1189134&r1=1189133&r2=1189134&view=diff
==============================================================================
--- aries/branches/oct-2011-release/subsystem/pom.xml (original)
+++ aries/branches/oct-2011-release/subsystem/pom.xml Wed Oct 26 11:06:35 2011
@@ -1,141 +1,218 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF 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.
- --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>0.4</version>
- <relativePath />
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.aries.subsystem</groupId>
- <artifactId>subsystem</artifactId>
- <name>Apache Aries Subsystem</name>
- <packaging>pom</packaging>
-
- <description>Subsystems support for Aries</description>
-
-<!--
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/subsystem</url>
- </scm>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.aries.subsystem</groupId>
- <artifactId>org.apache.aries.subsystem.api</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.subsystem</groupId>
- <artifactId>org.apache.aries.subsystem.core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.subsystem</groupId>
- <artifactId>org.apache.aries.subsystem.scope.api</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.subsystem</groupId>
- <artifactId>org.apache.aries.subsystem.scope.impl</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.testsupport</groupId>
- <artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.application</groupId>
- <artifactId>org.apache.aries.application.api</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.application</groupId>
- <artifactId>org.apache.aries.application.utils</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.utils</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.2.4</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.service.obr</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
- <version>1.0.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.6.4</version>
- </dependency>
-
-
- </dependencies>
- </dependencyManagement>
--->
- <modules>
- <module>subsystem-api</module>
- <module>subsystem-core</module>
- <module>subsystem-scope-api</module>
- <module>subsystem-scope-impl</module>
- <module>subsystem-scope-itests</module>
- <module>subsystem-obr</module>
- <module>subsystem-install</module>
- <module>subsystem-executor</module>
- <module>subsystem-example</module>
- <module>subsystem-itests</module>
- </modules>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath/>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.aries.subsystem</groupId>
+ <artifactId>subsystem</artifactId>
+ <name>Apache Aries Subsystem</name>
+ <packaging>pom</packaging>
+
+ <description>Subsystems support for Aries</description>
+
+ <!--
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/subsystem</url>
+ </scm>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.aries.subsystem</groupId>
+ <artifactId>org.apache.aries.subsystem.api</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.subsystem</groupId>
+ <artifactId>org.apache.aries.subsystem.core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.subsystem</groupId>
+ <artifactId>org.apache.aries.subsystem.scope.api</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.subsystem</groupId>
+ <artifactId>org.apache.aries.subsystem.scope.impl</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.testsupport</groupId>
+ <artifactId>org.apache.aries.testsupport.unit</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.api</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.utils</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.utils</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.2.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.service.obr</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ </exclusions>
+ <version>1.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.bundlerepository</artifactId>
+ <version>1.6.4</version>
+ </dependency>
+
+
+ </dependencies>
+ </dependencyManagement>
+ -->
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>subsystem-api</module>
+ <module>subsystem-core</module>
+ <module>subsystem-executor</module>
+ <module>subsystem-itests</module>
+ </modules>
+
+ </profile>
+
+ <profile>
+ <id>fetch-external</id>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>ossrh</id>
+ <name>Sonatype OSS Repository</name>
+ <url>http://oss.sonatype.org/content/groups/public</url>
+ <layout>default</layout>
+ </pluginRepository>
+ </pluginRepositories>
+
+
+ <build>
+ <plugins>
+
+ <!-- EXTERNAL DEPENDENCY RESOLVER -->
+
+ <plugin>
+ <groupId>com.savage7.maven.plugins</groupId>
+ <artifactId>maven-external-dependency-plugin</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ <inherited>false</inherited>
+ <configuration>
+ <createChecksum>true</createChecksum>
+ <skipChecksumVerification>false</skipChecksumVerification>
+ <force>false</force>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ <version>3.8.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <downloadUrl>http://www.eclipse.org/downloads/download.php?file=/equinox/drops/I20111018-0850/org.eclipse.osgi_3.8.0.v20111017-1643.jar&url=http://download.eclipse.org/equinox/drops/I20111018-0850/org.eclipse.osgi_3.8.0.v20111017-1643.jar&mirror_id=1</downloadUrl>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>coordinator</artifactId>
+ <version>1.0.0.v20110314</version>
+ <packaging>jar</packaging>
+ <downloadUrl>http://ftp.osuosl.org/pub/eclipse/equinox/drops/R-3.7.1-201109091335/org.eclipse.equinox.coordinator_1.0.0.v20110502.jar</downloadUrl>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>region</artifactId>
+ <version>1.0.0.v20110506</version>
+ <packaging>jar</packaging>
+ <downloadUrl>http://ftp.osuosl.org/pub/eclipse/equinox/drops/R-3.7.1-201109091335/org.eclipse.equinox.region_1.0.0.v20110524.jar</downloadUrl>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ <executions>
+ <execution>
+ <id>clean-external-dependencies</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean-external</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>resolve-install-external-dependencies</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>resolve-external</goal>
+ <goal>install-external</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+
+</project>
Modified: aries/branches/oct-2011-release/subsystem/readme.txt
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/subsystem/readme.txt?rev=1189134&r1=1189133&r2=1189134&view=diff
==============================================================================
--- aries/branches/oct-2011-release/subsystem/readme.txt (original)
+++ aries/branches/oct-2011-release/subsystem/readme.txt Wed Oct 26 11:06:35 2011
@@ -1,11 +1,15 @@
-The Subsystems subproject uses RFC 138(Framework hooks).
-You need to download the implementation jar at:
- http://download.eclipse.org/equinox/
-You need to copy it in your local m2 repository:
- ~/.m2/repository/org/eclipse/osgi/3.7.0.v20100910/osgi-3.7.0.v20100910.jar
+The Subsystems subproject uses some unreleased and difficult to find equinox artifacts.
-I tested using the 3.7M2 stable builds.
+There's a profile to download them automatically like this:
-Also, you need to run the following command to index your local m2 repo to ~/.m2/repository/repository.xml file.
+mvn clean install -Pfetch-external
-mvn org.apache.felix:maven-bundle-plugin:2.1.0:index -DurlTemplate=maven
+The normal build is now in the default profile so if you are running any other profiles you will need
+
+mvn clean install -Pdefault,<your other profiles>
+
+PLEASE if you change the version of these jars used in subsystems UPDATE THE DOWNLOAD INFO in the subsystem root pom.
+
+The downloader is from here:
+
+http://code.google.com/p/maven-external-dependency-plugin/
Modified: aries/branches/oct-2011-release/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/SubsystemContentHeader.java
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/SubsystemContentHeader.java?rev=1189134&r1=1189133&r2=1189134&view=diff
==============================================================================
--- aries/branches/oct-2011-release/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/SubsystemContentHeader.java (original)
+++ aries/branches/oct-2011-release/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/SubsystemContentHeader.java Wed Oct 26 11:06:35 2011
@@ -19,9 +19,9 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import org.apache.aries.util.VersionRange;
import org.osgi.framework.Constants;
import org.osgi.framework.Version;
-import org.osgi.framework.VersionRange;
public class SubsystemContentHeader extends AbstractHeader {
public static class Content {
Modified: aries/branches/oct-2011-release/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/VersionRangeAttribute.java
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/VersionRangeAttribute.java?rev=1189134&r1=1189133&r2=1189134&view=diff
==============================================================================
--- aries/branches/oct-2011-release/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/VersionRangeAttribute.java (original)
+++ aries/branches/oct-2011-release/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/VersionRangeAttribute.java Wed Oct 26 11:06:35 2011
@@ -13,11 +13,32 @@
*/
package org.apache.aries.subsystem.core.archive;
+import org.apache.aries.util.VersionRange;
import org.osgi.framework.Constants;
import org.osgi.framework.Version;
-import org.osgi.framework.VersionRange;
public class VersionRangeAttribute extends AbstractAttribute {
+ public static String toFilterString(VersionRange range) {
+ String version = Constants.VERSION_ATTRIBUTE;
+ Version min = range.getMinimumVersion();
+ Version max = range.getMaximumVersion();
+ StringBuilder sb = new StringBuilder();
+ if (max != null)
+ sb.append("(&");
+ if (range.isMinimumExclusive())
+ sb.append("(!(").append(version).append("<=").append(min).append("))");
+ else
+ sb.append('(').append(version).append(">=").append(min).append(')');
+ if (max != null) {
+ if (range.isMaximumExclusive())
+ sb.append("(!(").append(version).append(">=").append(range.getMaximumVersion()).append("))");
+ else
+ sb.append('(').append(version).append("<=").append(max).append(')');
+ sb.append(')');
+ }
+ return sb.toString();
+ }
+
private final VersionRange range;
public VersionRangeAttribute() {
@@ -31,7 +52,7 @@ public class VersionRangeAttribute exten
}
public StringBuilder appendToFilter(StringBuilder builder) {
- return builder.append(range.toFilterString(Constants.VERSION_ATTRIBUTE));
+ return builder.append(toFilterString(range));
}
public VersionRange getVersionRange() {
Modified: aries/branches/oct-2011-release/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/OsgiIdentityRequirement.java
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/OsgiIdentityRequirement.java?rev=1189134&r1=1189133&r2=1189134&view=diff
==============================================================================
--- aries/branches/oct-2011-release/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/OsgiIdentityRequirement.java (original)
+++ aries/branches/oct-2011-release/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/OsgiIdentityRequirement.java Wed Oct 26 11:06:35 2011
@@ -17,12 +17,13 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.apache.aries.subsystem.core.archive.VersionRangeAttribute;
+import org.apache.aries.util.VersionRange;
import org.osgi.framework.Constants;
import org.osgi.framework.Filter;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.Version;
-import org.osgi.framework.VersionRange;
import org.osgi.framework.resource.Capability;
import org.osgi.framework.resource.Requirement;
import org.osgi.framework.resource.Resource;
@@ -46,7 +47,7 @@ public class OsgiIdentityRequirement imp
private static Filter createFilter(String symbolicName, VersionRange versionRange, String type) {
return createFilter(
symbolicName,
- versionRange.toFilterString(ResourceConstants.IDENTITY_VERSION_ATTRIBUTE),
+ VersionRangeAttribute.toFilterString(versionRange),
type);
}
Propchange: aries/branches/oct-2011-release/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks:1185252-1186822
+/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks:1185252-1189121
Propchange: aries/branches/oct-2011-release/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest:1185252-1186822
+/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest:1185252-1189121
Propchange: aries/branches/oct-2011-release/util/src/test/java/org/apache/aries/util/VersionRangeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 26 11:06:35 2011
@@ -1 +1 @@
-/aries/trunk/util/src/test/java/org/apache/aries/util/VersionRangeTest.java:1185252-1186822
+/aries/trunk/util/src/test/java/org/apache/aries/util/VersionRangeTest.java:1185252-1189121