aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject svn commit: r1778318 - in /aries/trunk/proxy: ./ proxy-bundle/ proxy-impl/ proxy-itests/ proxy-itests/src/test/java/org/apache/aries/proxy/itests/
Date Wed, 11 Jan 2017 15:55:58 GMT
Author: cschneider
Date: Wed Jan 11 15:55:57 2017
New Revision: 1778318

URL: http://svn.apache.org/viewvc?rev=1778318&view=rev
Log:
[ARIES-1659] Only produce the combined bundle

Added:
    aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/BasicProxyTest.java
      - copied, changed from r1778312, aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractBasicProxyTest.java
    aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyTest.java
      - copied, changed from r1778312, aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractWeavingProxyTest.java
Removed:
    aries/trunk/proxy/proxy-bundle/LICENSE
    aries/trunk/proxy/proxy-bundle/NOTICE
    aries/trunk/proxy/proxy-bundle/pom.xml
    aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractBasicProxyTest.java
    aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractWeavingProxyTest.java
    aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/BasicProxyBundlesTest.java
    aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/BasicProxyUberBundleTest.java
    aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyBundlesTest.java
    aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyUberBundleTest.java
Modified:
    aries/trunk/proxy/pom.xml
    aries/trunk/proxy/proxy-impl/pom.xml
    aries/trunk/proxy/proxy-itests/pom.xml
    aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java

Modified: aries/trunk/proxy/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/pom.xml?rev=1778318&r1=1778317&r2=1778318&view=diff
==============================================================================
--- aries/trunk/proxy/pom.xml (original)
+++ aries/trunk/proxy/pom.xml Wed Jan 11 15:55:57 2017
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.aries.proxy</groupId>
     <artifactId>proxy</artifactId>
-    <name>Apache Aries Class Proxy</name>
+    <name>Apache Aries Proxy Parent</name>
     <packaging>pom</packaging>
     <version>1.0.1-SNAPSHOT</version>
     <description>
@@ -40,7 +40,6 @@
     <modules>
         <module>proxy-api</module>
         <module>proxy-impl</module>
-        <module>proxy-bundle</module>
         <module>proxy-itests</module>
     </modules>
 

Modified: aries/trunk/proxy/proxy-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-impl/pom.xml?rev=1778318&r1=1778317&r2=1778318&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-impl/pom.xml (original)
+++ aries/trunk/proxy/proxy-impl/pom.xml Wed Jan 11 15:55:57 2017
@@ -29,7 +29,7 @@
     </parent>
 
     <groupId>org.apache.aries.proxy</groupId>
-    <artifactId>org.apache.aries.proxy.impl</artifactId>
+    <artifactId>org.apache.aries.proxy</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Aries Proxy Service</name>
     <version>1.0.7-SNAPSHOT</version>
@@ -45,7 +45,9 @@
 
     <properties>
         <aries.osgi.export.pkg>
-            org.apache.aries.proxy.weaving;
+            org.apache.aries.proxy;,
+            org.apache.aries.proxy.weaving;,
+            org.apache.aries.proxy.weavinghook;
         </aries.osgi.export.pkg>
         <aries.osgi.activator>
             org.apache.aries.proxy.impl.ProxyManagerActivator
@@ -63,7 +65,7 @@
         <aries.osgi.export.service>
             org.apache.aries.proxy.ProxyManager
         </aries.osgi.export.service>
-        <lastReleaseVersion>1.0.2</lastReleaseVersion>
+        <lastReleaseVersion>1.0.1</lastReleaseVersion>
     </properties>
 
     <dependencies>

Modified: aries/trunk/proxy/proxy-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests/pom.xml?rev=1778318&r1=1778317&r2=1778318&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-itests/pom.xml (original)
+++ aries/trunk/proxy/proxy-itests/pom.xml Wed Jan 11 15:55:57 2017
@@ -61,30 +61,16 @@
         </dependency>
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
-            <artifactId>org.apache.aries.proxy</artifactId>
-            <scope>test</scope>
-            <version>1.0.2-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.proxy</groupId>
             <artifactId>org.apache.aries.proxy.api</artifactId>
             <scope>test</scope>
             <version>1.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
-            <artifactId>org.apache.aries.proxy.impl</artifactId>
+            <artifactId>org.apache.aries.proxy</artifactId>
             <scope>test</scope>
             <version>1.0.7-SNAPSHOT</version>
         </dependency>
-        <!-- 
-        <dependency>
-            <groupId>org.apache.aries.testsupport</groupId>
-            <artifactId>org.apache.aries.testsupport.unit</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-         -->
 
         <!-- pax exam -->
         <dependency>

Modified: aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java?rev=1778318&r1=1778317&r2=1778318&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java
(original)
+++ aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java
Wed Jan 11 15:55:57 2017
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertTru
 import static org.junit.Assert.fail;
 import static org.ops4j.pax.exam.CoreOptions.composite;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 import static org.ops4j.pax.exam.CoreOptions.when;
 
@@ -289,7 +288,7 @@ public abstract class AbstractProxyTest
     assertEquals(ex, listener.postInvokeExceptionalReturn);
   }
   
-  protected Option generalOptions() {
+  protected Option proxyOptions() {
 	  String localRepo = System.getProperty("maven.repo.local");
       if (localRepo == null) {
           localRepo = System.getProperty("org.ops4j.pax.url.mvn.localRepository");
@@ -300,26 +299,11 @@ public abstract class AbstractProxyTest
               when(localRepo != null).useOptions(CoreOptions.vmOption("-Dorg.ops4j.pax.url.mvn.localRepository="
+ localRepo)),
               mavenBundle("org.ow2.asm", "asm-debug-all").versionAsInProject(),
               mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
-              mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject()
+              mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
+              mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject()
               /* vmOption ("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
               waitForFrameworkStartup(),*/
      );
   }
 
-  protected Option[] proxyBundles()
-  {
-    return options(
-      generalOptions(),
-      mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api").versionAsInProject(),
-      mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl").versionAsInProject()
-    );
-  }
-
-    protected Option[] proxyUberBundle() {
-      return options(
-        generalOptions(),
-        mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject()
-      );
-    }
-
 }

Copied: aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/BasicProxyTest.java
(from r1778312, aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractBasicProxyTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/BasicProxyTest.java?p2=aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/BasicProxyTest.java&p1=aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractBasicProxyTest.java&r1=1778312&r2=1778318&rev=1778318&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractBasicProxyTest.java
(original)
+++ aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/BasicProxyTest.java
Wed Jan 11 15:55:57 2017
@@ -28,10 +28,20 @@ import java.util.concurrent.Callable;
 import org.apache.aries.proxy.FinalModifierException;
 import org.apache.aries.proxy.UnableToProxyException;
 import org.junit.Test;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
 import org.osgi.framework.Bundle;
 
-public abstract class AbstractBasicProxyTest extends AbstractProxyTest
+public class BasicProxyTest extends AbstractProxyTest
 {
+  @Configuration
+  public Option[] configuration() {
+    return new Option[] //
+    {
+     proxyOptions()
+    };
+  }
+    
   /**
    * This test does two things. First of all it checks that we throw a FinalModifierException
if we
    * try to proxy a final class. It also validates that the message and toString in the exception

Copied: aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyTest.java
(from r1778312, aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractWeavingProxyTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyTest.java?p2=aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyTest.java&p1=aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractWeavingProxyTest.java&r1=1778312&r2=1778318&rev=1778318&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractWeavingProxyTest.java
(original)
+++ aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyTest.java
Wed Jan 11 15:55:57 2017
@@ -31,15 +31,25 @@ import org.apache.aries.proxy.weaving.Wo
 import org.apache.aries.proxy.weavinghook.ProxyWeavingController;
 import org.apache.aries.proxy.weavinghook.WeavingHelper;
 import org.junit.Test;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerMethod;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.hooks.weaving.WovenClass;
 
 @ExamReactorStrategy(PerMethod.class)
-public abstract class AbstractWeavingProxyTest extends AbstractProxyTest
+public class WeavingProxyTest extends AbstractProxyTest
 {
 
+    @Configuration
+    public Option[] configuration() {
+      return new Option[] //
+      {
+       proxyOptions()
+      };
+    }
+    
   /**
    * This test does two things. First of all it checks that we can proxy a final 
    * class. It also validates that the class implements WovenProxy, and that the



Mime
View raw message