Author: jwross
Date: Sat Apr 13 02:37:16 2013
New Revision: 1467539
URL: http://svn.apache.org/r1467539
Log:
Remove .class files and replace with .java files.
The itests used a few, simple .class files for creating test bundles. Although
this does not cause issues
for Aries, it can create issues for folks who are hosting copies of our
repository that are configured to
ignore .class files.
Added:
aries/trunk/subsystem/subsystem-itests/src/test/classes/
aries/trunk/subsystem/subsystem-itests/src/test/classes/a/
aries/trunk/subsystem/subsystem-itests/src/test/classes/a/A.java
aries/trunk/subsystem/subsystem-itests/src/test/classes/b/
aries/trunk/subsystem/subsystem-itests/src/test/classes/b/B.java
Removed:
aries/trunk/subsystem/subsystem-itests/src/test/resources/compositeDir/a.jar/a/A.class
aries/trunk/subsystem/subsystem-itests/src/test/resources/compositeDir/applicationDir/b.jar/b/B.class
aries/trunk/subsystem/subsystem-itests/src/test/resources/compositeDir/applicationDir/featureDir/a.jar/a/A.class
aries/trunk/subsystem/subsystem-itests/src/test/resources/compositeDir/applicationDir/featureDir/b.jar/b/B.class
Modified:
aries/trunk/subsystem/subsystem-itests/pom.xml
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/InstallTest.java
Modified: aries/trunk/subsystem/subsystem-itests/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/pom.xml?rev=1467539&r1=1467538&r2=1467539&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-itests/pom.xml Sat Apr 13 02:37:16 2013
@@ -581,6 +581,19 @@
</configuration>
</execution>
+ <execution>
+ <id>add-source-classes</id>
+ <phase>generate-sources</phase>
+ <goals>
+
<goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+
<source>src/test/classes</source>
+ </sources>
+ </configuration>
+ </execution>
+
</executions>
</plugin>
<plugin>
Added: aries/trunk/subsystem/subsystem-itests/src/test/classes/a/A.java
URL:
http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/classes/a/A.java?rev=1467539&view=auto
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/classes/a/A.java (added)
+++ aries/trunk/subsystem/subsystem-itests/src/test/classes/a/A.java Sat Apr 13
02:37:16 2013
@@ -0,0 +1,5 @@
+package a;
+
+public class A {
+
+}
Added: aries/trunk/subsystem/subsystem-itests/src/test/classes/b/B.java
URL:
http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/classes/b/B.java?rev=1467539&view=auto
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/classes/b/B.java (added)
+++ aries/trunk/subsystem/subsystem-itests/src/test/classes/b/B.java Sat Apr 13
02:37:16 2013
@@ -0,0 +1,5 @@
+package b;
+
+public class B {
+
+}
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=1467539&r1=1467538&r2=1467539&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
Sat Apr 13 02:37:16 2013
@@ -60,7 +60,7 @@ public class InstallTest extends Subsyst
"compositeDir"
+ "/a.jar/META-INF/MANIFEST.MF"))
.binary("a.jar/a/A.class",
SubsystemTest.class.getClassLoader().getResourceAsStream(
- "compositeDir"
+ "/a.jar/a/A.class"))
+ "a/A.class"))
.binary("applicationDir.esa/OSGI-INF/SUBSYSTEM.MF",
SubsystemTest.class.getClassLoader().getResourceAsStream(
"compositeDir"
+ "/applicationDir/OSGI-INF/SUBSYSTEM.MF"))
@@ -69,7 +69,7 @@ public class InstallTest extends Subsyst
"compositeDir"
+ "/applicationDir/b.jar/META-INF/MANIFEST.MF"))
.binary("applicationDir.esa/b.jar/b/B.class",
SubsystemTest.class.getClassLoader().getResourceAsStream(
- "compositeDir"
+ "/applicationDir/b.jar/b/B.class"))
+ "b/B.class"))
.binary("applicationDir.esa/featureDir.esa/OSGI-INF/SUBSYSTEM.MF",
SubsystemTest.class.getClassLoader().getResourceAsStream(
"compositeDir"
+ "/applicationDir/featureDir/OSGI-INF/SUBSYSTEM.MF"))
@@ -78,13 +78,13 @@ public class InstallTest extends Subsyst
"compositeDir"
+ "/applicationDir/featureDir/a.jar/META-INF/MANIFEST.MF"))
.binary("applicationDir.esa/featureDir.esa/a.jar/a/A.class",
SubsystemTest.class.getClassLoader().getResourceAsStream(
- "compositeDir"
+ "/applicationDir/featureDir/a.jar/a/A.class"))
+ "a/A.class"))
.binary("applicationDir.esa/featureDir.esa/b.jar/META-INF/MANIFEST.MF",
SubsystemTest.class.getClassLoader().getResourceAsStream(
"compositeDir"
+ "/applicationDir/featureDir/b.jar/META-INF/MANIFEST.MF"))
.binary("applicationDir.esa/featureDir.esa/b.jar/b/B.class",
SubsystemTest.class.getClassLoader().getResourceAsStream(
- "compositeDir"
+ "/applicationDir/featureDir/b.jar/b/B.class"));
+ "b/B.class"));
feature.end();
FileOutputStream fos = new FileOutputStream("compositeDir" +
".esa");
try {
