You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ja...@apache.org on 2014/12/05 10:20:42 UTC
svn commit: r1643202 [2/2] - in /felix/trunk/deploymentadmin:
deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/
deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/
deploymentadmin/src/test/java/org/apache/felix/deploymenta...
Modified: felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/InstallFixPackageTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/InstallFixPackageTest.java?rev=1643202&r1=1643201&r2=1643202&view=diff
==============================================================================
--- felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/InstallFixPackageTest.java (original)
+++ felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/InstallFixPackageTest.java Fri Dec 5 09:20:42 2014
@@ -46,7 +46,7 @@ public class InstallFixPackageTest exten
public void testInstallBundleWithDependencyInFixPackageUpdateOk() throws Exception
{
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle2")));
DeploymentPackage dp1 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp1);
@@ -59,7 +59,7 @@ public class InstallFixPackageTest exten
assertEquals(Bundle.INSTALLED, bundle.getState());
dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
- dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1"))).add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")).setMissing());
+ dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1"))).add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle2")).setMissing());
DeploymentPackage dp2 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp2);
@@ -82,7 +82,7 @@ public class InstallFixPackageTest exten
public void testInstallFixPackageOutsideLowerTargetRangeFail() throws Exception
{
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle2")));
DeploymentPackage dp1 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp1);
@@ -96,7 +96,7 @@ public class InstallFixPackageTest exten
dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
dpBuilder.setFixPackage("(1.0,2.0)") // should not include version 1.0.0!
- .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1"))).add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")).setMissing());
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1"))).add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle2")).setMissing());
try
{
@@ -117,7 +117,7 @@ public class InstallFixPackageTest exten
public void testInstallFixPackageOutsideUpperTargetRangeFail() throws Exception
{
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle2")));
DeploymentPackage dp1 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp1);
@@ -131,7 +131,7 @@ public class InstallFixPackageTest exten
dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
dpBuilder.setFixPackage("[0.9,1.0)") // should not include version 1.0.0!
- .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1"))).add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")).setMissing());
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1"))).add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle2")).setMissing());
try
{
@@ -152,7 +152,7 @@ public class InstallFixPackageTest exten
public void testInstallFixPackageWithoutTargetFail() throws Exception
{
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
- dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1"))).add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+ dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1"))).add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle2")));
try
{
@@ -173,7 +173,7 @@ public class InstallFixPackageTest exten
public void testInstallFixPackageReplacesOriginalTargetPackageOk() throws Exception
{
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle2")));
DeploymentPackage dp1 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp1);
@@ -183,7 +183,7 @@ public class InstallFixPackageTest exten
awaitRefreshPackagesEvent();
dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
- dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1"))).add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")).setMissing());
+ dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1"))).add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle2")).setMissing());
DeploymentPackage dp2 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp2);
@@ -201,7 +201,7 @@ public class InstallFixPackageTest exten
{
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
// missed valid-bundle1 as dependency...
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1")));
DeploymentPackage dp1 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp1);
@@ -211,7 +211,7 @@ public class InstallFixPackageTest exten
awaitRefreshPackagesEvent();
dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
- dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle3"))).add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")).setMissing());
+ dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle3"))).add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle2")).setMissing());
try
{
@@ -231,7 +231,7 @@ public class InstallFixPackageTest exten
public void testInstallFixPackageWithMissingTargetResourceFail() throws Exception
{
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1")));
DeploymentPackage dp1 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp1);
@@ -241,7 +241,7 @@ public class InstallFixPackageTest exten
awaitRefreshPackagesEvent();
dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
- dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1"))).add(
+ dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundleURL("rp1"))).add(
dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1).setUrl(getTestResource("test-config1.xml")).setMissing());
try
@@ -262,7 +262,7 @@ public class InstallFixPackageTest exten
public void testInstallFixPackageWithMissingTargetResourceProcessorFail() throws Exception
{
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1")));
DeploymentPackage dp1 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp1);
@@ -272,7 +272,7 @@ public class InstallFixPackageTest exten
awaitRefreshPackagesEvent();
dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
- dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")).setMissing()).add(
+ dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundleURL("rp1")).setMissing()).add(
dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1).setUrl(getTestResource("test-config1.xml")));
try
@@ -293,7 +293,7 @@ public class InstallFixPackageTest exten
public void testInstallFixPackageWithMissingTargetBundleFromOtherPackageFail() throws Exception
{
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1")));
DeploymentPackage dp1 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp1);
@@ -303,7 +303,7 @@ public class InstallFixPackageTest exten
assertEquals("Expected only a single deployment package?!", 1, countDeploymentPackages());
dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle2")));
DeploymentPackage dp2 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp2);
@@ -313,7 +313,7 @@ public class InstallFixPackageTest exten
assertEquals("Expected only a single deployment package?!", 2, countDeploymentPackages());
dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
- dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")).setMissing()).add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle3")));
+ dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1")).setMissing()).add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle3")));
try
{
@@ -333,7 +333,7 @@ public class InstallFixPackageTest exten
public void testMissingBundlesOnlyInFixPackageFail() throws Exception
{
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle2")));
DeploymentPackage dp1 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp1);
@@ -346,7 +346,7 @@ public class InstallFixPackageTest exten
assertEquals(Bundle.INSTALLED, bundle.getState());
dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
- dpBuilder.disableVerification().add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1"))).add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")).setMissing());
+ dpBuilder.disableVerification().add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1"))).add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle2")).setMissing());
try
{
@@ -367,7 +367,7 @@ public class InstallFixPackageTest exten
public void testRemoveBundleInFixPackageUpdateOk() throws Exception
{
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1"))).add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1"))).add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle2")));
DeploymentPackage dp1 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp1);
@@ -381,7 +381,7 @@ public class InstallFixPackageTest exten
// valid-bundle2 is to be removed by this fix package...
dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
- dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")).setMissing());
+ dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1")).setMissing());
DeploymentPackage dp2 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp2);
@@ -399,7 +399,7 @@ public class InstallFixPackageTest exten
public void testUninstallBundleAddedInFixPackageOk() throws Exception
{
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle2")));
DeploymentPackage dp1 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp1);
@@ -408,7 +408,7 @@ public class InstallFixPackageTest exten
// Add valid-bundle1 through fix-package...
dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
- dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1"))).add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")).setMissing());
+ dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1"))).add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle2")).setMissing());
DeploymentPackage dp2 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp2);
@@ -439,7 +439,7 @@ public class InstallFixPackageTest exten
public void testUninstallBundleRemovedInFixPackageOk() throws Exception
{
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1"))).add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1"))).add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle2")));
DeploymentPackage dp1 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp1);
@@ -448,7 +448,7 @@ public class InstallFixPackageTest exten
// remove valid-bundle1 through fix package...
dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
- dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")));
+ dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1")));
DeploymentPackage dp2 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp2);
@@ -479,7 +479,7 @@ public class InstallFixPackageTest exten
public void testUninstallFixPackageOnlyRemovesOwnArtifactsOk() throws Exception
{
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1")));
DeploymentPackage dp1 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp1);
@@ -487,7 +487,7 @@ public class InstallFixPackageTest exten
assertEquals("Expected a single deployment package?!", 1, countDeploymentPackages());
dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle2")));
DeploymentPackage dp2 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp2);
@@ -498,7 +498,7 @@ public class InstallFixPackageTest exten
// add bundle2 through fix package...
dpBuilder = createDeploymentPackageBuilder(dpBuilder.getSymbolicName(), "1.0.1");
- dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle3"))).add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle2")).setMissing());
+ dpBuilder.setFixPackage("[1.0,2.0)").add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle3"))).add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle2")).setMissing());
DeploymentPackage dp3 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp3);
@@ -533,8 +533,8 @@ public class InstallFixPackageTest exten
// first, install a deployment package with implementation and api bundles in version 1.0.0
DeploymentPackageBuilder dpBuilder = createDeploymentPackageBuilder("a", "1.0.0");
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundleimpl1", "bundleimpl1", "1.0.0")));
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundleapi1", "bundleapi1", "1.0.0")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundleimpl1", "bundleimpl1", "1.0.0")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundleapi1", "bundleapi1", "1.0.0")));
DeploymentPackage dp1 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp1);
@@ -543,8 +543,8 @@ public class InstallFixPackageTest exten
// then, install a fix package with implementation and api bundles in version 2.0.0
dpBuilder = createDeploymentPackageBuilder("a", "2.0.0").setFixPackage("[1.0.0,2.0.0]");
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundleimpl2", "bundleimpl2", "2.0.0")));
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundleapi2", "bundleapi2", "2.0.0")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundleimpl2", "bundleimpl2", "2.0.0")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundleapi2", "bundleapi2", "2.0.0")));
DeploymentPackage dp2 = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp2);
@@ -569,8 +569,8 @@ public class InstallFixPackageTest exten
public void testUpdateWithDuplicateBundleFail() throws Exception
{
DeploymentPackageBuilder dpBuilder = createDeploymentPackageBuilder("c", "1.0.0");
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundleimpl1", "bundleimpl1", "1.0.0")));
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundleapi1", "bundleapi1", "1.0.0")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundleimpl1", "bundleimpl1", "1.0.0")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundleapi1", "bundleapi1", "1.0.0")));
// Should succeed, as the DP is correct...
DeploymentPackage dp1 = installDeploymentPackage(dpBuilder);
@@ -579,9 +579,9 @@ public class InstallFixPackageTest exten
// then, install a fix package with implementation and api bundles in version 2.0.0, but *also* containing the original implementation
// bundle, which is incorrect (no bundles with the same BSN may exist in a DP)...
dpBuilder = createDeploymentPackageBuilder("c", "2.0.0").setFixPackage("[1.0.0,2.0.0]");
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundleapi1", "bundleapi1", "1.0.0")));
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundleimpl2", "bundleimpl2", "2.0.0")));
- dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundleimpl1", "bundleimpl1", "1.0.0")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundleapi1", "bundleapi1", "1.0.0")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundleimpl2", "bundleimpl2", "2.0.0")));
+ dpBuilder.add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundleimpl1", "bundleimpl1", "1.0.0")));
try
{
Modified: felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/ResourceSharingTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/ResourceSharingTest.java?rev=1643202&r1=1643201&r2=1643202&view=diff
==============================================================================
--- felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/ResourceSharingTest.java (original)
+++ felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/ResourceSharingTest.java Fri Dec 5 09:20:42 2014
@@ -39,16 +39,16 @@ public class ResourceSharingTest extends
DeploymentPackageBuilder dpBuilder1 = createNewDeploymentPackageBuilder("1.0.0");
dpBuilder1
.add(dpBuilder1.createBundleResource()
- .setUrl(getTestBundle("bundle1"))
+ .setUrl(getTestBundleURL("bundle1"))
)
.add(dpBuilder1.createBundleResource()
- .setUrl(getTestBundle("bundle2"))
+ .setUrl(getTestBundleURL("bundle2"))
);
DeploymentPackageBuilder dpBuilder2 = createNewDeploymentPackageBuilder("0.8.0");
dpBuilder2
.add(dpBuilder2.createBundleResource()
- .setUrl(getTestBundle("bundle1"))
+ .setUrl(getTestBundleURL("bundle1"))
);
DeploymentPackage dp1 = installDeploymentPackage(dpBuilder1);
@@ -70,7 +70,7 @@ public class ResourceSharingTest extends
@Test
public void testBundleCannotBeSharedWithNonDeploymentPackagedBundle() throws Exception {
// Manually install a bundle...
- Bundle result = m_context.installBundle(getTestBundle("bundle1").toExternalForm());
+ Bundle result = m_context.installBundle(getTestBundleURL("bundle1").toExternalForm());
assertNotNull(result);
assertBundleExists(getSymbolicName("bundle1"), "1.0.0");
@@ -78,10 +78,10 @@ public class ResourceSharingTest extends
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
dpBuilder
.add(dpBuilder.createBundleResource()
- .setUrl(getTestBundle("bundle1"))
+ .setUrl(getTestBundleURL("bundle1"))
)
.add(dpBuilder.createBundleResource()
- .setUrl(getTestBundle("bundle2"))
+ .setUrl(getTestBundleURL("bundle2"))
);
try {
@@ -98,7 +98,7 @@ public class ResourceSharingTest extends
@Test
public void testForeignBundleCanCoexistWithPackagedBundleIfVersionsDiffer() throws Exception {
// Manually install a bundle...
- Bundle result = m_context.installBundle(getTestBundle("bundle1").toExternalForm());
+ Bundle result = m_context.installBundle(getTestBundleURL("bundle1").toExternalForm());
assertNotNull(result);
long bundleId = result.getBundleId();
@@ -110,11 +110,11 @@ public class ResourceSharingTest extends
dpBuilder
.add(dpBuilder.createBundleResource()
.setVersion("1.1.0")
- .setUrl(getTestBundle("bundle1"))
+ .setUrl(getTestBundleURL("bundle1"))
.setFilter(new JarManifestManipulatingFilter("Bundle-Version", "1.1.0"))
)
.add(dpBuilder.createBundleResource()
- .setUrl(getTestBundle("bundle2"))
+ .setUrl(getTestBundleURL("bundle2"))
);
// should succeed: valid-bundle1 is installed, but has a different version than the one in our DP...
Modified: felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/UninstallDeploymentPackageTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/UninstallDeploymentPackageTest.java?rev=1643202&r1=1643201&r2=1643202&view=diff
==============================================================================
--- felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/UninstallDeploymentPackageTest.java (original)
+++ felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/UninstallDeploymentPackageTest.java Fri Dec 5 09:20:42 2014
@@ -43,8 +43,8 @@ public class UninstallDeploymentPackageT
public void testForcedUninstallDeploymentPackageWithMissingResourceProcessorSucceeds() throws Exception {
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
dpBuilder
- .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
- .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1")))
+ .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundleURL("rp1")))
.add(dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1).setUrl(getTestResource("test-config1.xml")));
DeploymentPackage dp = installDeploymentPackage(dpBuilder);
@@ -78,8 +78,8 @@ public class UninstallDeploymentPackageT
public void testUninstallBundleWithFragmentOk() throws Exception {
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
dpBuilder
- .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
- .add(dpBuilder.createBundleResource().setUrl(getTestBundle("fragment1")));
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("fragment1")));
DeploymentPackage dp = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp);
@@ -109,11 +109,11 @@ public class UninstallDeploymentPackageT
public void testUninstallBundleWithOtherArtifactsOk() throws Exception {
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
dpBuilder
- .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")))
+ .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundleURL("rp1")))
.add(
dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1)
.setUrl(getTestResource("test-config1.xml")))
- .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle3")));
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle3")));
DeploymentPackage dp = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp);
@@ -142,8 +142,8 @@ public class UninstallDeploymentPackageT
public void testUninstallDeploymentPackageWithExceptionThrowingInCommitCausesNoRollbackOk() throws Exception {
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
dpBuilder
- .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
- .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1")))
+ .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundleURL("rp1")))
.add(dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1).setUrl(getTestResource("test-config1.xml")));
DeploymentPackage dp = installDeploymentPackage(dpBuilder);
@@ -171,8 +171,8 @@ public class UninstallDeploymentPackageT
public void testUninstallDeploymentPackageWithExceptionThrowingInDropAllResourcesCausesRollbackOk() throws Exception {
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
dpBuilder
- .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
- .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1")))
+ .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundleURL("rp1")))
.add(dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1).setUrl(getTestResource("test-config1.xml")));
DeploymentPackage dp = installDeploymentPackage(dpBuilder);
@@ -210,8 +210,8 @@ public class UninstallDeploymentPackageT
public void testUninstallDeploymentPackageWithExceptionThrowingInPrepareCausesRollbackOk() throws Exception {
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
dpBuilder
- .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
- .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1")))
+ .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundleURL("rp1")))
.add(dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1).setUrl(getTestResource("test-config1.xml")));
DeploymentPackage dp = installDeploymentPackage(dpBuilder);
@@ -246,8 +246,8 @@ public class UninstallDeploymentPackageT
public void testUninstallDeploymentPackageWithExceptionThrownInStopCauseNoRollbackOk() throws Exception {
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
dpBuilder
- .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
- .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle3")));
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle3")));
DeploymentPackage dp = installDeploymentPackage(dpBuilder);
assertNotNull("No deployment package returned?!", dp);
@@ -277,8 +277,8 @@ public class UninstallDeploymentPackageT
public void testUninstallDeploymentPackageWithMissingResourceProcessorCausesRollback() throws Exception {
DeploymentPackageBuilder dpBuilder = createNewDeploymentPackageBuilder("1.0.0");
dpBuilder
- .add(dpBuilder.createBundleResource().setUrl(getTestBundle("bundle1")))
- .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundle("rp1")))
+ .add(dpBuilder.createBundleResource().setUrl(getTestBundleURL("bundle1")))
+ .add(dpBuilder.createResourceProcessorResource().setUrl(getTestBundleURL("rp1")))
.add(dpBuilder.createResource().setResourceProcessorPID(TEST_FAILING_BUNDLE_RP1).setUrl(getTestResource("test-config1.xml")));
DeploymentPackage dp = installDeploymentPackage(dpBuilder);
Modified: felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/util/ArtifactData.java
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/util/ArtifactData.java?rev=1643202&r1=1643201&r2=1643202&view=diff
==============================================================================
--- felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/util/ArtifactData.java (original)
+++ felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/util/ArtifactData.java Fri Dec 5 09:20:42 2014
@@ -28,6 +28,7 @@ public class ArtifactData {
private String m_bundleSymbolicName;
private String m_bundleVersion;
private boolean m_isCustomizer;
+ private boolean m_needRP;
private String m_processorPID;
private boolean m_missing;
private ResourceFilter m_filter;
@@ -72,6 +73,10 @@ public class ArtifactData {
public boolean isMissing() {
return m_missing;
}
+
+ public boolean isResourceProcessorNeeded() {
+ return m_needRP;
+ }
void setArtifactResourceProcessor(String processorPID) {
m_processorPID = processorPID;
@@ -91,6 +96,10 @@ public class ArtifactData {
m_missing = missing;
}
+ void setNeedResourceProcessor(boolean needRP) {
+ m_needRP = needRP;
+ }
+
void setResourceProcessor(String processorPID) {
m_isCustomizer = true;
m_processorPID = processorPID;
Modified: felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/util/DeploymentPackageBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/util/DeploymentPackageBuilder.java?rev=1643202&r1=1643201&r2=1643202&view=diff
==============================================================================
--- felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/util/DeploymentPackageBuilder.java (original)
+++ felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/util/DeploymentPackageBuilder.java Fri Dec 5 09:20:42 2014
@@ -69,16 +69,16 @@ public class DeploymentPackageBuilder {
return new ByteArrayInputStream(baos.toByteArray());
}
-
+
protected abstract Manifest filterManifest(Manifest manifest);
}
-
+
/**
* Simple manifest JAR manipulator implementation.
*/
public static class JarManifestManipulatingFilter extends JarManifestFilter {
private final String[] m_replacementEntries;
-
+
public JarManifestManipulatingFilter(String... replacementEntries) {
if (replacementEntries == null || ((replacementEntries.length) % 2 != 0)) {
throw new IllegalArgumentException("Entries must be a multiple of two!");
@@ -90,13 +90,13 @@ public class DeploymentPackageBuilder {
protected Manifest filterManifest(Manifest manifest) {
for (int i = 0; i < m_replacementEntries.length; i += 2) {
String key = m_replacementEntries[i];
- String value = m_replacementEntries[i+1];
+ String value = m_replacementEntries[i + 1];
manifest.getMainAttributes().putValue(key, value);
}
return manifest;
}
}
-
+
private static final int BUFFER_SIZE = 32 * 1024;
private final String m_symbolicName;
@@ -112,7 +112,7 @@ public class DeploymentPackageBuilder {
private DeploymentPackageBuilder(String symbolicName, String version) {
m_symbolicName = symbolicName;
m_version = version;
-
+
m_verification = true;
}
@@ -172,8 +172,9 @@ public class DeploymentPackageBuilder {
}
/**
- * Disables the verification of the generated deployment package, potentially causing an erroneous result to be generated.
- *
+ * Disables the verification of the generated deployment package, potentially causing an erroneous result to be
+ * generated.
+ *
* @return this builder.
*/
public DeploymentPackageBuilder disableVerification() {
@@ -209,12 +210,12 @@ public class DeploymentPackageBuilder {
artifacts.addAll(m_bundles);
artifacts.addAll(m_processors);
artifacts.addAll(m_artifacts);
-
+
if (m_verification) {
validateProcessedArtifacts();
validateMissingArtifacts(artifacts);
}
-
+
Manifest m = createManifest(artifacts);
writeStream(artifacts, m, output);
}
@@ -284,7 +285,7 @@ public class DeploymentPackageBuilder {
a.putValue("Deployment-ProvidesResourceProcessor", file.getProcessorPid());
}
}
- else {
+ else if (file.isResourceProcessorNeeded()) {
a.putValue("Resource-Processor", file.getProcessorPid());
}
@@ -297,19 +298,19 @@ public class DeploymentPackageBuilder {
return manifest;
}
-
+
private void validateMissingArtifacts(List<ArtifactData> files) throws Exception {
boolean missing = false;
-
+
Iterator<ArtifactData> artifactIter = files.iterator();
while (artifactIter.hasNext() && !missing) {
ArtifactData data = artifactIter.next();
-
+
if (data.isMissing()) {
missing = true;
}
}
-
+
if (missing && (m_fixPackageVersion == null || "".equals(m_fixPackageVersion))) {
throw new Exception("Artifact cannot be missing without a fix package version!");
}
@@ -320,20 +321,18 @@ public class DeploymentPackageBuilder {
while (artifactIter.hasNext()) {
ArtifactData data = artifactIter.next();
String pid = data.getProcessorPid();
- boolean found = false;
+ boolean found = pid == null;
Iterator<ArtifactData> processorIter = m_processors.iterator();
- while (processorIter.hasNext()) {
+ while (!found && processorIter.hasNext()) {
ArtifactData processor = processorIter.next();
if (pid.equals(processor.getProcessorPid())) {
found = true;
- break;
}
}
- if (!found) {
- throw new Exception("No resource processor found for artifact " + data.getURL()
- + " with processor PID " + pid);
+ if (!found && data.isResourceProcessorNeeded()) {
+ throw new Exception("No resource processor found for artifact " + data.getURL() + " with processor PID " + pid);
}
}
}
Modified: felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/util/ResourceDataBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/util/ResourceDataBuilder.java?rev=1643202&r1=1643201&r2=1643202&view=diff
==============================================================================
--- felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/util/ResourceDataBuilder.java (original)
+++ felix/trunk/deploymentadmin/itest/src/test/java/org/apache/felix/deploymentadmin/itest/util/ResourceDataBuilder.java Fri Dec 5 09:20:42 2014
@@ -24,11 +24,16 @@ import java.io.File;
* Provides a resource data builder.
*/
public class ResourceDataBuilder extends ArtifactDataBuilder<ResourceDataBuilder> {
-
+ private boolean m_needRP;
private String m_resourceProcessorPID;
public ResourceDataBuilder() {
- super();
+ m_needRP = true;
+ }
+
+ public ResourceDataBuilder setNeedResourceProcessor(boolean needRP) {
+ m_needRP = needRP;
+ return this;
}
public ResourceDataBuilder setResourceProcessorPID(String resourceProcessorPID) {
@@ -39,6 +44,7 @@ public class ResourceDataBuilder extends
@Override ArtifactData build() {
ArtifactData result = super.build();
result.setArtifactResourceProcessor(m_resourceProcessorPID);
+ result.setNeedResourceProcessor(m_needRP);
return result;
}
@@ -49,7 +55,7 @@ public class ResourceDataBuilder extends
@Override
void validate() throws RuntimeException {
- if (m_resourceProcessorPID == null || "".equals(m_resourceProcessorPID.trim())) {
+ if (m_needRP && ((m_resourceProcessorPID == null || "".equals(m_resourceProcessorPID.trim())))) {
throw new RuntimeException("Artifact resource processor PID is missing!");
}
Added: felix/trunk/deploymentadmin/itest/src/test/resources/LICENSE
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/itest/src/test/resources/LICENSE?rev=1643202&view=auto
==============================================================================
--- felix/trunk/deploymentadmin/itest/src/test/resources/LICENSE (added)
+++ felix/trunk/deploymentadmin/itest/src/test/resources/LICENSE Fri Dec 5 09:20:42 2014
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
Propchange: felix/trunk/deploymentadmin/itest/src/test/resources/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Added: felix/trunk/deploymentadmin/itest/src/test/resources/logo.png
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/itest/src/test/resources/logo.png?rev=1643202&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/trunk/deploymentadmin/itest/src/test/resources/logo.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: felix/trunk/deploymentadmin/testbundles/bundleimpl1/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/testbundles/bundleimpl1/pom.xml?rev=1643202&r1=1643201&r2=1643202&view=diff
==============================================================================
--- felix/trunk/deploymentadmin/testbundles/bundleimpl1/pom.xml (original)
+++ felix/trunk/deploymentadmin/testbundles/bundleimpl1/pom.xml Fri Dec 5 09:20:42 2014
@@ -29,7 +29,7 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.deploymentadmin.test.bundleapi</artifactId>
+ <artifactId>org.apache.felix.deploymentadmin.test.bundleapi1</artifactId>
<version>1.0.0</version>
</dependency>
</dependencies>
Modified: felix/trunk/deploymentadmin/testbundles/bundleimpl2/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/testbundles/bundleimpl2/pom.xml?rev=1643202&r1=1643201&r2=1643202&view=diff
==============================================================================
--- felix/trunk/deploymentadmin/testbundles/bundleimpl2/pom.xml (original)
+++ felix/trunk/deploymentadmin/testbundles/bundleimpl2/pom.xml Fri Dec 5 09:20:42 2014
@@ -29,7 +29,7 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.deploymentadmin.test.bundleapi</artifactId>
+ <artifactId>org.apache.felix.deploymentadmin.test.bundleapi2</artifactId>
<version>2.0.0</version>
</dependency>
</dependencies>