You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jw...@apache.org on 2012/02/16 23:57:56 UTC
svn commit: r1245240 - in /aries/trunk/subsystem:
subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/
subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/
subsystem-core/src/main/java/org/apache/aries/subsystem/core/...
Author: jwross
Date: Thu Feb 16 22:57:55 2012
New Revision: 1245240
URL: http://svn.apache.org/viewvc?rev=1245240&view=rev
Log:
ARIES-825: Update subsystems to latest Subsystem, Resolver, and Repository APIs.
subsystem archive extension changed from .ssa to .esa
Modified:
aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/SubsystemArchive.java
aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/AriesSubsystem.java
aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/resource/SubsystemFileResource.java
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/BasicTest.java
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/FeatureTest.java
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/InstallTest.java
Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/SubsystemArchive.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/SubsystemArchive.java?rev=1245240&r1=1245239&r2=1245240&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/SubsystemArchive.java (original)
+++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/SubsystemArchive.java Thu Feb 16 22:57:55 2012
@@ -135,7 +135,8 @@ public class SubsystemArchive implements
URL url = file.toURI().toURL();
resources.put(BundleResource.newInstance(url), url);
}
- else if (name.endsWith(".ssa") && !name.startsWith("subsystem"))
+ // TODO Add to constants.
+ else if (name.endsWith(".esa") && !name.startsWith("subsystem"))
resources.put(new SubsystemFileResource(file), file.toURI().toURL());
}
}
Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/AriesSubsystem.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/AriesSubsystem.java?rev=1245240&r1=1245239&r2=1245240&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/AriesSubsystem.java (original)
+++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/AriesSubsystem.java Thu Feb 16 22:57:55 2012
@@ -298,7 +298,8 @@ public class AriesSubsystem implements S
this.parents.add(parent);
id = getNextId();
String directoryName = "subsystem" + id;
- String fileName = directoryName + ".ssa";
+ // TODO Add to constants.
+ String fileName = directoryName + ".esa";
File zipFile = new File(parent.directory, fileName);
directory = new File(parent.directory, directoryName);
if (!directory.mkdir())
Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/resource/SubsystemFileResource.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/resource/SubsystemFileResource.java?rev=1245240&r1=1245239&r2=1245240&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/resource/SubsystemFileResource.java (original)
+++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/resource/SubsystemFileResource.java Thu Feb 16 22:57:55 2012
@@ -25,7 +25,7 @@ import org.osgi.service.repository.Repos
import org.osgi.service.subsystem.SubsystemConstants;
public class SubsystemFileResource implements Resource, RepositoryContent {
- private static final String REGEX = "([^@]+)(?:@(.+))?.ssa";
+ private static final String REGEX = "([^@]+)(?:@(.+))?.esa"; // TODO Add .esa to constants.
private static final Pattern PATTERN = Pattern.compile(REGEX);
private final List<Capability> capabilities;
Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/BasicTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/BasicTest.java?rev=1245240&r1=1245239&r2=1245240&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/BasicTest.java (original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/BasicTest.java Thu Feb 16 22:57:55 2012
@@ -57,7 +57,7 @@ public class BasicTest extends Subsystem
}
}
feature.end();
- FileOutputStream fos = new FileOutputStream(name + ".ssa");
+ FileOutputStream fos = new FileOutputStream(name + ".esa");
try {
feature.writeOut(fos);
} finally {
@@ -98,7 +98,7 @@ public class BasicTest extends Subsystem
@Test
public void testEmptyFeature() throws Exception {
- Subsystem emptyFeature = installSubsystemFromFile("emptyFeature.ssa");
+ Subsystem emptyFeature = installSubsystemFromFile("emptyFeature.esa");
AssertionError error = null;
try {
assertSymbolicName("org.apache.aries.subsystem.itests.feature.empty", emptyFeature);
@@ -131,7 +131,7 @@ public class BasicTest extends Subsystem
*/
@Test
public void testEmptySubsystem() throws Exception {
- Subsystem emptySubsystem = installSubsystemFromFile("emptySubsystem.ssa");
+ Subsystem emptySubsystem = installSubsystemFromFile("emptySubsystem.esa");
AssertionError error = null;
try {
assertSymbolicName("org.apache.aries.subsystem.itests.subsystem.empty", emptySubsystem);
Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/FeatureTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/FeatureTest.java?rev=1245240&r1=1245239&r2=1245240&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/FeatureTest.java (original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/FeatureTest.java Thu Feb 16 22:57:55 2012
@@ -59,7 +59,7 @@ public class FeatureTest extends Subsyst
}
}
feature.end();
- FileOutputStream fos = new FileOutputStream(name + ".ssa");
+ FileOutputStream fos = new FileOutputStream(name + ".esa");
try {
feature.writeOut(fos);
} finally {
@@ -73,14 +73,14 @@ public class FeatureTest extends Subsyst
return;
}
createApplication("feature2", new String[]{"tb2.jar", "tb3.jar"});
- createApplication("feature1", new String[]{"tb1.jar", "feature2.ssa", "tb3.jar"});
+ createApplication("feature1", new String[]{"tb1.jar", "feature2.esa", "tb3.jar"});
createApplication("feature3", new String[]{"tb3.jar"});
createdApplications = true;
}
@Test
public void testFeature1() throws Exception {
- Subsystem feature1 = installSubsystemFromFile("feature1.ssa");
+ Subsystem feature1 = installSubsystemFromFile("feature1.esa");
Subsystem feature2 = null;
AssertionError error = null;
try {
@@ -129,14 +129,14 @@ public class FeatureTest extends Subsyst
@Test
public void testPersistence() throws Exception {
- Subsystem feature3Before = installSubsystemFromFile("feature3.ssa");
+ Subsystem feature3Before = installSubsystemFromFile("feature3.esa");
Subsystem feature3After = null;
AssertionError error = null;
try {
assertFeature3(feature3Before);
// Uninstall then reinstall the subsystem for a more robust test of the subsystem ID persistence.
uninstallUnscopedSubsystem(feature3Before);
- feature3Before = installSubsystemFromFile("feature3.ssa");
+ feature3Before = installSubsystemFromFile("feature3.esa");
assertLastId(2);
assertFeature3(feature3Before);
Bundle bundle = getSubsystemCoreBundle();
@@ -169,7 +169,7 @@ public class FeatureTest extends Subsyst
@Test
public void testSharedContent() throws Exception {
- Subsystem feature1 = installSubsystemFromFile("feature1.ssa");
+ Subsystem feature1 = installSubsystemFromFile("feature1.esa");
AssertionError error = null;
try {
assertConstituent(feature1, "org.apache.aries.subsystem.itests.tb3", Version.parseVersion("1.0.0"), ResourceConstants.IDENTITY_TYPE_BUNDLE);
Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/InstallTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/InstallTest.java?rev=1245240&r1=1245239&r2=1245240&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/InstallTest.java (original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/InstallTest.java Thu Feb 16 22:57:55 2012
@@ -52,7 +52,7 @@ public class InstallTest extends Subsyst
}
}
feature.end();
- FileOutputStream fos = new FileOutputStream(name + ".ssa");
+ FileOutputStream fos = new FileOutputStream(name + ".esa");
try {
feature.writeOut(fos);
} finally {
@@ -71,7 +71,7 @@ public class InstallTest extends Subsyst
@Test
public void testReturnExistingSubsystemWithSameLocation() throws Exception {
- Subsystem subsystem1 = installSubsystemFromFile("feature3.ssa");
+ Subsystem subsystem1 = installSubsystemFromFile("feature3.esa");
try {
Subsystem subsystem2 = subsystem1.install(subsystem1.getLocation());
assertSame(subsystem1, subsystem2);