/[Apache-SVN]
ViewVC logotype

Revision 1199354


Jump to revision: Previous Next
Author: hughesj
Date: Tue Nov 8 17:27:34 2011 UTC (12 years, 4 months ago)
Changed paths: 81
Log Message:
Merging trunk into the branch from r1189798-1199347 in preparation to reintegration


Changed paths

Path Details
Directoryaries/branches/oct-2011-release/ modified , props changed
Directoryaries/branches/oct-2011-release/application/application-itests/pom.xml modified , text changed
Directoryaries/branches/oct-2011-release/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/util/IsolationTestUtils.java modified , text changed
Directoryaries/branches/oct-2011-release/application/application-itests/src/test/java/org/apache/aries/isolated/config/
(Copied from aries/trunk/application/application-itests/src/test/java/org/apache/aries/isolated/config, r1199347)
added
Directoryaries/branches/oct-2011-release/application/application-itests/src/test/java/org/apache/aries/isolated/config/HelloWorldManagedServiceImpl.java
(Copied from aries/trunk/application/application-itests/src/test/java/org/apache/aries/isolated/config/HelloWorldManagedServiceImpl.java, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-itests/src/test/resources/isolated/config/
(Copied from aries/trunk/application/application-itests/src/test/resources/isolated/config, r1199347)
added
Directoryaries/branches/oct-2011-release/application/application-itests/src/test/resources/isolated/config/APPLICATION-BP.MF
(Copied from aries/trunk/application/application-itests/src/test/resources/isolated/config/APPLICATION-BP.MF, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-itests/src/test/resources/isolated/config/APPLICATION-MN.MF
(Copied from aries/trunk/application/application-itests/src/test/resources/isolated/config/APPLICATION-MN.MF, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-itests/src/test/resources/isolated/config/blueprint.xml
(Copied from aries/trunk/application/application-itests/src/test/resources/isolated/config/blueprint.xml, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/AbstractParserProxy.java modified , text changed
Directoryaries/branches/oct-2011-release/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java modified , text changed
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm/
(Copied from aries/trunk/application/application-resolve-transform-cm, r1199347)
added
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm/LICENSE
(Copied from aries/trunk/application/application-resolve-transform-cm/LICENSE, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm/NOTICE
(Copied from aries/trunk/application/application-resolve-transform-cm/NOTICE, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm/pom.xml
(Copied from aries/trunk/application/application-resolve-transform-cm/pom.xml, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm/src/
(Copied from aries/trunk/application/application-resolve-transform-cm/src, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm/src/main/
(Copied from aries/trunk/application/application-resolve-transform-cm/src/main, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm/src/main/java/
(Copied from aries/trunk/application/application-resolve-transform-cm/src/main/java, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm/src/main/java/org/
(Copied from aries/trunk/application/application-resolve-transform-cm/src/main/java/org, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm/src/main/java/org/apache/
(Copied from aries/trunk/application/application-resolve-transform-cm/src/main/java/org/apache, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm/src/main/java/org/apache/aries/
(Copied from aries/trunk/application/application-resolve-transform-cm/src/main/java/org/apache/aries, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm/src/main/java/org/apache/aries/application/
(Copied from aries/trunk/application/application-resolve-transform-cm/src/main/java/org/apache/aries/application, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm/src/main/java/org/apache/aries/application/resolve/
(Copied from aries/trunk/application/application-resolve-transform-cm/src/main/java/org/apache/aries/application/resolve, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm/src/main/java/org/apache/aries/application/resolve/transform/
(Copied from aries/trunk/application/application-resolve-transform-cm/src/main/java/org/apache/aries/application/resolve/transform, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm/src/main/java/org/apache/aries/application/resolve/transform/cm/
(Copied from aries/trunk/application/application-resolve-transform-cm/src/main/java/org/apache/aries/application/resolve/transform/cm, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm/src/main/java/org/apache/aries/application/resolve/transform/cm/ConfigurationPostResolveTransformerImpl.java
(Copied from aries/trunk/application/application-resolve-transform-cm/src/main/java/org/apache/aries/application/resolve/transform/cm/ConfigurationPostResolveTransformerImpl.java, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm/src/main/resources/
(Copied from aries/trunk/application/application-resolve-transform-cm/src/main/resources, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm/src/main/resources/OSGI-INF/
(Copied from aries/trunk/application/application-resolve-transform-cm/src/main/resources/OSGI-INF, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm/src/main/resources/OSGI-INF/blueprint/
(Copied from aries/trunk/application/application-resolve-transform-cm/src/main/resources/OSGI-INF/blueprint, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm/src/main/resources/OSGI-INF/blueprint/blueprint.xml
(Copied from aries/trunk/application/application-resolve-transform-cm/src/main/resources/OSGI-INF/blueprint/blueprint.xml, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm-itests/
(Copied from aries/trunk/application/application-resolve-transform-cm-itests, r1199347)
added
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm-itests/LICENSE
(Copied from aries/trunk/application/application-resolve-transform-cm-itests/LICENSE, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm-itests/NOTICE
(Copied from aries/trunk/application/application-resolve-transform-cm-itests/NOTICE, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm-itests/pom.xml
(Copied from aries/trunk/application/application-resolve-transform-cm-itests/pom.xml, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm-itests/src/
(Copied from aries/trunk/application/application-resolve-transform-cm-itests/src, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm-itests/src/test/
(Copied from aries/trunk/application/application-resolve-transform-cm-itests/src/test, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm-itests/src/test/java/
(Copied from aries/trunk/application/application-resolve-transform-cm-itests/src/test/java, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm-itests/src/test/java/org/
(Copied from aries/trunk/application/application-resolve-transform-cm-itests/src/test/java/org, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm-itests/src/test/java/org/apache/
(Copied from aries/trunk/application/application-resolve-transform-cm-itests/src/test/java/org/apache, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/
(Copied from aries/trunk/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/
(Copied from aries/trunk/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/
(Copied from aries/trunk/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/
(Copied from aries/trunk/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/
(Copied from aries/trunk/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/
(Copied from aries/trunk/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java
(Copied from aries/trunk/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java, r1199347)
replaced
Directoryaries/branches/oct-2011-release/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/SharedBundleFramework.java modified , text changed
Directoryaries/branches/oct-2011-release/application/pom.xml modified , text changed
Directoryaries/branches/oct-2011-release/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java modified , text changed
Directoryaries/branches/oct-2011-release/blueprint/blueprint-cm/src/main/resources/OSGI-INF/blueprint/blueprint-cm.xml modified , text changed
Directoryaries/branches/oct-2011-release/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java modified , text changed
Directoryaries/branches/oct-2011-release/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BaseBlueprintContainerBTCustomizerTest.java
(Copied from aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BaseBlueprintContainerBTCustomizerTest.java, r1199347)
added
Directoryaries/branches/oct-2011-release/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java modified , text changed
Directoryaries/branches/oct-2011-release/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java modified , text changed
Directoryaries/branches/oct-2011-release/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyAdapter.java modified , text changed
Directoryaries/branches/oct-2011-release/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/ConstructorFinder.java
(Copied from aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/ConstructorFinder.java, r1199347)
added
Directoryaries/branches/oct-2011-release/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/ProxyTestClassStaticInitOfChild.java
(Copied from aries/trunk/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/ProxyTestClassStaticInitOfChild.java, r1199347)
added
Directoryaries/branches/oct-2011-release/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/ProxyTestClassStaticInitOfChildParent.java
(Copied from aries/trunk/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/ProxyTestClassStaticInitOfChildParent.java, r1199347)
added
Directoryaries/branches/oct-2011-release/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/WovenProxyGeneratorTest.java modified , text changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/JmxConstants.java modified , text changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/BundleStateMBean.java modified , text changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/ServiceStateMBean.java modified , text changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java modified , props changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java modified , props changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java modified , props changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java modified , props changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java modified , props changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java modified , props changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java modified , props changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java modified , props changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java modified , props changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/codec/BundleWiringData.java modified , text changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/codec/ServiceData.java modified , text changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleState.java modified , text changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/framework/ServiceState.java modified , text changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/util/TypeUtils.java modified , text changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleRevisionsStateMBeanTest.java modified , text changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java modified , text changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java modified , text changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java modified , props changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ modified , props changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26