/[Apache-SVN]
ViewVC logotype

Revision 1190552


Jump to revision: Previous Next
Author: hughesj
Date: Fri Oct 28 20:40:12 2011 UTC (12 years, 6 months ago)
Changed paths: 1111 (showing only 100; show all)
Log Message:
Merging in trunk up to r1190455 to pull in fix to issue 771

Changed paths

Path Details
Directoryaries/branches/oct-2011-release/ modified , props changed
Directoryaries/branches/oct-2011-release/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java modified , props changed
Directoryaries/branches/oct-2011-release/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java modified , props changed
Directoryaries/branches/oct-2011-release/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java modified , props changed
Directoryaries/branches/oct-2011-release/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java modified , props changed
Directoryaries/branches/oct-2011-release/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextImpl.java modified , text changed
Directoryaries/branches/oct-2011-release/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextManagerImpl.java modified , text changed
Directoryaries/branches/oct-2011-release/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java modified , props changed
Directoryaries/branches/oct-2011-release/blueprint/blueprint-cm/pom.xml modified , text changed
Directoryaries/branches/oct-2011-release/blueprint/blueprint-cm/src/main/java/org/apache/aries/ modified , props changed
Directoryaries/branches/oct-2011-release/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedServiceFactory.java 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/java/org/apache/aries/blueprint/compendium/cm/CmPropertyPlaceholder.java modified , text changed
Directoryaries/branches/oct-2011-release/blueprint/blueprint-cm/src/main/resources/org/apache/aries/ modified , props changed
Directoryaries/branches/oct-2011-release/blueprint/blueprint-core/pom.xml modified , text changed
Directoryaries/branches/oct-2011-release/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java modified , text changed , props changed
Directoryaries/branches/oct-2011-release/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceListener.java deleted
Directoryaries/branches/oct-2011-release/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java modified , text changed
Directoryaries/branches/oct-2011-release/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java modified , text changed
Directoryaries/branches/oct-2011-release/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PlaceholdersUtils.java deleted
Directoryaries/branches/oct-2011-release/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java deleted
Directoryaries/branches/oct-2011-release/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/packageinfo modified , text changed
Directoryaries/branches/oct-2011-release/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PlaceholdersUtils.java
(Copied from aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PlaceholdersUtils.java, r1190455)
added
Directoryaries/branches/oct-2011-release/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PropertyPlaceholder.java
(Copied from aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/PropertyPlaceholder.java, r1190455)
added
Directoryaries/branches/oct-2011-release/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/ServiceListener.java
(Copied from aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/ServiceListener.java, r1190455)
added
Directoryaries/branches/oct-2011-release/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/packageinfo modified , text changed
Directoryaries/branches/oct-2011-release/blueprint/blueprint-core/src/main/resources/org/apache/aries/ modified , props changed
Directoryaries/branches/oct-2011-release/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java modified , text changed
Directoryaries/branches/oct-2011-release/blueprint/blueprint-distro/pom.xml modified , text changed
Directoryaries/branches/oct-2011-release/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java modified , props changed
Directoryaries/branches/oct-2011-release/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java modified , props changed
Directoryaries/branches/oct-2011-release/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java modified , props changed
Directoryaries/branches/oct-2011-release/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java modified , props changed
Directoryaries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java modified , props changed
Directoryaries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java modified , props changed
Directoryaries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java modified , props changed
Directoryaries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java modified , props changed
Directoryaries/branches/oct-2011-release/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java modified , props changed
Directoryaries/branches/oct-2011-release/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java modified , text changed
Directoryaries/branches/oct-2011-release/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java modified , props changed
Directoryaries/branches/oct-2011-release/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ modified , props changed
Directoryaries/branches/oct-2011-release/jmx/jmx-itests/src/test/java/org/ops4j/
(Copied from aries/trunk/jmx/jmx-itests/src/test/java/org/ops4j, r1190455)
added
Directoryaries/branches/oct-2011-release/jmx/jmx-itests/src/test/java/org/ops4j/pax/
(Copied from aries/trunk/jmx/jmx-itests/src/test/java/org/ops4j/pax, r1190455)
replaced
Directoryaries/branches/oct-2011-release/jmx/jmx-itests/src/test/java/org/ops4j/pax/runner/
(Copied from aries/trunk/jmx/jmx-itests/src/test/java/org/ops4j/pax/runner, r1190455)
replaced
Directoryaries/branches/oct-2011-release/jmx/jmx-itests/src/test/java/org/ops4j/pax/runner/platform/
(Copied from aries/trunk/jmx/jmx-itests/src/test/java/org/ops4j/pax/runner/platform, r1190455)
replaced
Directoryaries/branches/oct-2011-release/jmx/jmx-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/
(Copied from aries/trunk/jmx/jmx-itests/src/test/java/org/ops4j/pax/runner/platform/equinox, r1190455)
replaced
Directoryaries/branches/oct-2011-release/jmx/jmx-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/
(Copied from aries/trunk/jmx/jmx-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal, r1190455)
replaced
Directoryaries/branches/oct-2011-release/jmx/jmx-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
(Copied from aries/trunk/jmx/jmx-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java, r1190455)
replaced
Directoryaries/branches/oct-2011-release/jmx/jmx-itests/src/test/resources/META-INF/
(Copied from aries/trunk/jmx/jmx-itests/src/test/resources/META-INF, r1190455)
added
Directoryaries/branches/oct-2011-release/jmx/jmx-itests/src/test/resources/META-INF/platform-equinox/
(Copied from aries/trunk/jmx/jmx-itests/src/test/resources/META-INF/platform-equinox, r1190455)
replaced
Directoryaries/branches/oct-2011-release/jmx/jmx-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110613.xml
(Copied from aries/trunk/jmx/jmx-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110613.xml, r1190455)
replaced
Directoryaries/branches/oct-2011-release/jmx/jmx-itests/src/test/resources/ss-runner.properties
(Copied from aries/trunk/jmx/jmx-itests/src/test/resources/ss-runner.properties, r1190455)
added
Directoryaries/branches/oct-2011-release/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ modified , props changed
Directoryaries/branches/oct-2011-release/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java modified , props changed
Directoryaries/branches/oct-2011-release/jndi/jndi-url/src/main/java/org/apache/aries/jndi/ modified , props changed
Directoryaries/branches/oct-2011-release/jndi/jndi-url/src/test/java/org/apache/aries/jndi/ modified , props changed
Directoryaries/branches/oct-2011-release/samples-sandbox/ deleted
Directoryaries/branches/oct-2011-release/sandbox/
(Copied from aries/trunk/sandbox, r1190455)
added
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/
(Copied from aries/trunk/sandbox/jmx-next, r1190455)
replaced , props changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/LICENSE
(Copied from aries/trunk/sandbox/jmx-next/LICENSE, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/NOTICE
(Copied from aries/trunk/sandbox/jmx-next/NOTICE, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/
(Copied from aries/trunk/sandbox/jmx-next/jmx-api, r1190455)
replaced , props changed
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/LICENSE
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/LICENSE, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/NOTICE
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/NOTICE, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/pom.xml
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/pom.xml, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/appended-resources/
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/appended-resources, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/appended-resources/META-INF/
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/appended-resources/META-INF, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/appended-resources/META-INF/NOTICE.vm
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/appended-resources/META-INF/NOTICE.vm, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/Item.java
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/Item.java, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/JmxConstants.java
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/JmxConstants.java, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/BundleRevisionsStateMBean.java
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/BundleRevisionsStateMBean.java, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/BundleStateMBean.java
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/BundleStateMBean.java, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/FrameworkMBean.java
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/FrameworkMBean.java, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/PackageStateMBean.java
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/PackageStateMBean.java, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/ServiceStateMBean.java
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/ServiceStateMBean.java, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/package.html
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/package.html, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/packageinfo
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/packageinfo, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/package.html
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/package.html, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/packageinfo
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/packageinfo, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/cm/
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/cm, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/cm/ConfigurationAdminMBean.java
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/cm/ConfigurationAdminMBean.java, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/cm/package.html
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/cm/package.html, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/cm/packageinfo
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/cm/packageinfo, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/permissionadmin/
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/permissionadmin, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/permissionadmin/PermissionAdminMBean.java
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/permissionadmin/PermissionAdminMBean.java, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/permissionadmin/package.html
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/permissionadmin/package.html, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/permissionadmin/packageinfo
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/permissionadmin/packageinfo, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/provisioning/
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/provisioning, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/provisioning/ProvisioningServiceMBean.java
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/provisioning/ProvisioningServiceMBean.java, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/provisioning/package.html
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/provisioning/package.html, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/provisioning/packageinfo
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/provisioning/packageinfo, r1190455)
replaced
Directoryaries/branches/oct-2011-release/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/useradmin/
(Copied from aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/service/useradmin, r1190455)
replaced
[...]

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26