Author: tjwatson
Date: Tue May 31 16:23:20 2016
New Revision: 1746298
URL: http://svn.apache.org/viewvc?rev=1746298&view=rev
Log:
Merge ^/aries/trunk/subsystem Merging r1741051 through r1746297 into
java6support branch.
Modified:
aries/branches/java6support/subsystem/ (props changed)
aries/branches/java6support/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml
aries/branches/java6support/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1522Test.java
aries/branches/java6support/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1523Test.java
aries/branches/java6support/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/FelixResourceAdapter.java
Propchange: aries/branches/java6support/subsystem/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 31 16:23:20 2016
@@ -1,2 +1,2 @@
/aries/branches/1.0-prototype/subsystem:1306564-1337594
-/aries/trunk/subsystem:1728111-1741050
+/aries/trunk/subsystem:1728111-1746297
Modified:
aries/branches/java6support/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml
URL:
http://svn.apache.org/viewvc/aries/branches/java6support/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml?rev=1746298&r1=1746297&r2=1746298&view=diff
==============================================================================
---
aries/branches/java6support/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml
(original)
+++
aries/branches/java6support/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml
Tue May 31 16:23:20 2016
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.apache.aries.subsystem</groupId>
<artifactId>org.apache.aries.subsystem.example.helloIsolation</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified:
aries/branches/java6support/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1522Test.java
URL:
http://svn.apache.org/viewvc/aries/branches/java6support/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1522Test.java?rev=1746298&r1=1746297&r2=1746298&view=diff
==============================================================================
---
aries/branches/java6support/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1522Test.java
(original)
+++
aries/branches/java6support/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1522Test.java
Tue May 31 16:23:20 2016
@@ -117,14 +117,15 @@ public class Aries1522Test extends Subsy
private URL createRepositoryXml(DataModelHelper helper) throws
Exception {
File dir;
- if (new File("").getAbsolutePath().endsWith("/target")) {
+ String cwd = new File("").getAbsolutePath();
+ if (cwd.endsWith(File.separator + "target")) {
dir = new File("test-classes/aries1523");
}
else {
dir = new File("target/test-classes/aries1523");
}
File jar = new File(dir, "aries1523fragment.jar");
- assertTrue("The fragment jar does not exist", jar.exists());
+ assertTrue("The fragment jar does not exist: " +
jar.getAbsolutePath(), jar.exists());
Resource resource = helper.createResource(jar.toURI().toURL());
Repository repository = helper.repository(new Resource[]
{resource});
File file = new File(dir, "repository.xml");
Modified:
aries/branches/java6support/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1523Test.java
URL:
http://svn.apache.org/viewvc/aries/branches/java6support/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1523Test.java?rev=1746298&r1=1746297&r2=1746298&view=diff
==============================================================================
---
aries/branches/java6support/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1523Test.java
(original)
+++
aries/branches/java6support/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1523Test.java
Tue May 31 16:23:20 2016
@@ -117,14 +117,15 @@ public class Aries1523Test extends Subsy
private URL createRepositoryXml(DataModelHelper helper) throws
Exception {
File dir;
- if (new File("").getAbsolutePath().endsWith("/target")) {
+ String cwd = new File("").getAbsolutePath();
+ if (cwd.endsWith(File.separator + "target")) {
dir = new File("test-classes/aries1523");
}
else {
dir = new File("target/test-classes/aries1523");
}
File jar = new File(dir, "aries1523host.jar");
- assertTrue("The host jar does not exist", jar.exists());
+ assertTrue("The host jar does not exist: " +
jar.getAbsolutePath(), jar.exists());
Resource resource = helper.createResource(jar.toURI().toURL());
Repository repository = helper.repository(new Resource[]
{resource});
File file = new File(dir, "repository.xml");
Modified:
aries/branches/java6support/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/FelixResourceAdapter.java
URL:
http://svn.apache.org/viewvc/aries/branches/java6support/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/FelixResourceAdapter.java?rev=1746298&r1=1746297&r2=1746298&view=diff
==============================================================================
---
aries/branches/java6support/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/FelixResourceAdapter.java
(original)
+++
aries/branches/java6support/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/FelixResourceAdapter.java
Tue May 31 16:23:20 2016
@@ -39,9 +39,9 @@ public class FelixResourceAdapter implem
public boolean equals(Object o) {
if (o == this)
return true;
- if (!(o instanceof Resource))
+ if (!(o instanceof FelixResourceAdapter))
return false;
- Resource that = (Resource)o;
+ FelixResourceAdapter that = (FelixResourceAdapter)o;
if
(!ResourceHelper.getTypeAttribute(that).equals(ResourceHelper.getTypeAttribute(this)))
return false;
if
(!ResourceHelper.getSymbolicNameAttribute(that).equals(ResourceHelper.getSymbolicNameAttribute(this)))
