You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ej...@apache.org on 2012/01/27 19:59:47 UTC
svn commit: r1236824 - in /aries/trunk: proxy/proxy-itests/
proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/
samples/blog/blog-itests/
samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/
samples/blueprint/hellowo...
Author: ejiang
Date: Fri Jan 27 18:59:46 2012
New Revision: 1236824
URL: http://svn.apache.org/viewvc?rev=1236824&view=rev
Log:
ARIES-817: Upgrade to ASM4
Modified:
aries/trunk/proxy/proxy-itests/pom.xml
aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/BasicProxyTest.java
aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyTest.java
aries/trunk/samples/blog/blog-itests/pom.xml
aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java
aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java
aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java
aries/trunk/samples/blueprint/helloworld/helloworld-itests/pom.xml
aries/trunk/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java
aries/trunk/samples/twitter/twitter-itests/pom.xml
aries/trunk/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java
aries/trunk/transaction/transaction-blueprint/pom.xml
aries/trunk/transaction/transaction-itests/pom.xml
aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java
Modified: aries/trunk/proxy/proxy-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests/pom.xml?rev=1236824&r1=1236823&r2=1236824&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-itests/pom.xml (original)
+++ aries/trunk/proxy/proxy-itests/pom.xml Fri Jan 27 18:59:46 2012
@@ -66,7 +66,7 @@
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
<scope>test</scope>
- <version>0.4</version>
+ <version>0.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
@@ -140,10 +140,11 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>asm</groupId>
+ <groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
+ <version>4.0</version>
<scope>test</scope>
- <version>3.2</version>
+
</dependency>
</dependencies>
Modified: aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/BasicProxyTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/BasicProxyTest.java?rev=1236824&r1=1236823&r2=1236824&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/BasicProxyTest.java (original)
+++ aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/BasicProxyTest.java Fri Jan 27 18:59:46 2012
@@ -36,6 +36,8 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.osgi.framework.Bundle;
import org.osgi.framework.FrameworkUtil;
+import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
@RunWith(JUnit4TestRunner.class)
public class BasicProxyTest extends AbstractProxyTest
@@ -93,12 +95,15 @@ public class BasicProxyTest extends Abst
// Bundles
mavenBundle("org.apache.aries", "org.apache.aries.util"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
- mavenBundle("asm", "asm-all"),
+ mavenBundle("org.ow2.asm", "asm-all"),
// don't install the blueprint sample here as it will be installed onto the same framework as the blueprint core bundle
// mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample").noStart(),
mavenBundle("org.osgi", "org.osgi.compendium"),
-// org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
-
+ /* vmOption ("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
+ waitForFrameworkStartup(),*/
+
+
+
equinox().version("3.5.0")
);
}
Modified: aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyTest.java?rev=1236824&r1=1236823&r2=1236824&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyTest.java (original)
+++ aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyTest.java Fri Jan 27 18:59:46 2012
@@ -95,7 +95,7 @@ public class WeavingProxyTest extends Ab
// Bundles
mavenBundle("org.apache.aries", "org.apache.aries.util"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
- mavenBundle("asm", "asm-all"),
+ mavenBundle("org.ow2.asm", "asm-all"),
// don't install the blueprint sample here as it will be installed onto the same framework as the blueprint core bundle
// mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample").noStart(),
mavenBundle("org.osgi", "org.osgi.compendium"),
Modified: aries/trunk/samples/blog/blog-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-itests/pom.xml?rev=1236824&r1=1236823&r2=1236824&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-itests/pom.xml (original)
+++ aries/trunk/samples/blog/blog-itests/pom.xml Fri Jan 27 18:59:46 2012
@@ -58,6 +58,7 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
+ <version>0.4.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
@@ -188,8 +189,9 @@
</dependency>
<dependency>
- <groupId>asm</groupId>
+ <groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
+ <version>4.0</version>
<scope>test</scope>
</dependency>
Modified: aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java?rev=1236824&r1=1236823&r2=1236824&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java (original)
+++ aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java Fri Jan 27 18:59:46 2012
@@ -160,7 +160,7 @@ public class JdbcBlogSampleWithEbaTest e
mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager" ),
mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint" ),
mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.wrappers" ),
- mavenBundle("asm", "asm-all" ),
+ mavenBundle("org.ow2.asm", "asm-all" ),
/* For debugging, uncomment the next two lines */
/*vmOption ("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7777"),
waitForFrameworkStartup(),
Modified: aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java?rev=1236824&r1=1236823&r2=1236824&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java (original)
+++ aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java Fri Jan 27 18:59:46 2012
@@ -179,7 +179,7 @@ bootDelegationPackages("javax.transactio
mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint" ),
mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.wrappers" ),
mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.datasource" ),
- mavenBundle("asm", "asm-all" ),
+ mavenBundle("org.ow2.asm", "asm-all" ),
equinox().version("3.5.0")
);
options = updateOptions(options);
Modified: aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java?rev=1236824&r1=1236823&r2=1236824&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java (original)
+++ aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java Fri Jan 27 18:59:46 2012
@@ -243,7 +243,7 @@ bootDelegationPackages("javax.transactio
mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.datasource" ),
- mavenBundle("asm", "asm-all" ),
+ mavenBundle("org.ow2.asm", "asm-all" ),
equinox().version("3.5.0")
);
Modified: aries/trunk/samples/blueprint/helloworld/helloworld-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/helloworld/helloworld-itests/pom.xml?rev=1236824&r1=1236823&r2=1236824&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/helloworld/helloworld-itests/pom.xml (original)
+++ aries/trunk/samples/blueprint/helloworld/helloworld-itests/pom.xml Fri Jan 27 18:59:46 2012
@@ -59,6 +59,7 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
+ <version>0.4.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
@@ -157,8 +158,9 @@
</dependency>
<dependency>
- <groupId>asm</groupId>
+ <groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
+ <version>4.0</version>
<scope>test</scope>
</dependency>
Modified: aries/trunk/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java?rev=1236824&r1=1236823&r2=1236824&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java (original)
+++ aries/trunk/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java Fri Jan 27 18:59:46 2012
@@ -91,7 +91,7 @@ public class HelloworldSampleTest extend
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint" ),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
mavenBundle("org.apache.aries", "org.apache.aries.util" ),
- mavenBundle("asm", "asm-all" ),
+ mavenBundle("org.ow2.asm", "asm-all" ),
mavenBundle("org.apache.aries.samples.blueprint.helloworld", "org.apache.aries.samples.blueprint.helloworld.api"),
mavenBundle("org.apache.aries.samples.blueprint.helloworld", "org.apache.aries.samples.blueprint.helloworld.server"),
mavenBundle("org.apache.aries.samples.blueprint.helloworld", "org.apache.aries.samples.blueprint.helloworld.client"),
Modified: aries/trunk/samples/twitter/twitter-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/twitter/twitter-itests/pom.xml?rev=1236824&r1=1236823&r2=1236824&view=diff
==============================================================================
--- aries/trunk/samples/twitter/twitter-itests/pom.xml (original)
+++ aries/trunk/samples/twitter/twitter-itests/pom.xml Fri Jan 27 18:59:46 2012
@@ -57,11 +57,13 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
+ <version>0.4.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <version>4.0</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java?rev=1236824&r1=1236823&r2=1236824&view=diff
==============================================================================
--- aries/trunk/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java (original)
+++ aries/trunk/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java Fri Jan 27 18:59:46 2012
@@ -148,7 +148,7 @@ public class TwitterTest extends Abstrac
mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
- mavenBundle("asm", "asm-all"),
+ mavenBundle("org.ow2.asm", "asm-all"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
mavenBundle("org.osgi", "org.osgi.compendium"),
mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),
Modified: aries/trunk/transaction/transaction-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/pom.xml?rev=1236824&r1=1236823&r2=1236824&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-blueprint/pom.xml (original)
+++ aries/trunk/transaction/transaction-blueprint/pom.xml Fri Jan 27 18:59:46 2012
@@ -20,8 +20,8 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.5</version>
- <relativePath />
+ <version>0.4-SNAPSHOT</version>
+ <relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: aries/trunk/transaction/transaction-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/pom.xml?rev=1236824&r1=1236823&r2=1236824&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-itests/pom.xml (original)
+++ aries/trunk/transaction/transaction-itests/pom.xml Fri Jan 27 18:59:46 2012
@@ -96,7 +96,7 @@
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
<scope>test</scope>
- <version>0.4</version>
+ <version>0.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.transaction</groupId>
@@ -140,10 +140,10 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
<scope>test</scope>
- <version>3.2</version>
+ <version>4.0</version>
</dependency>
</dependencies>
<build>
Modified: aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java?rev=1236824&r1=1236823&r2=1236824&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java (original)
+++ aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java Fri Jan 27 18:59:46 2012
@@ -49,12 +49,12 @@ public abstract class AbstractIntegratio
// Bundles
mavenBundle("org.osgi", "org.osgi.compendium"),
- mavenBundle("asm", "asm-all"),
+ mavenBundle("org.ow2.asm", "asm-all"),
mavenBundle("org.apache.derby", "derby"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
- mavenBundle("asm", "asm-all"),
+ // mavenBundle("asm", "asm-all"),
mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager"),
mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint"),
mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.wrappers"),