commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jcar...@apache.org
Subject svn commit: r965013 - in /commons/proper/proxy/branches/version-2.0-work: ./ cglib/ cglib/src/main/resources/META-INF/services/ core/ core/src/test/java/org/apache/commons/proxy2/ javassist/ javassist/src/main/resources/META-INF/services/ jdk/ jdk/src/...
Date Sat, 17 Jul 2010 04:50:38 GMT
Author: jcarman
Date: Sat Jul 17 04:50:38 2010
New Revision: 965013

URL: http://svn.apache.org/viewvc?rev=965013&view=rev
Log:
renaming packages

Added:
    commons/proper/proxy/branches/version-2.0-work/cglib/src/main/resources/META-INF/services/org.apache.commons.proxy2.ProxyFactory
      - copied unchanged from r965011, commons/proper/proxy/branches/version-2.0-work/cglib/src/main/resources/META-INF/services/org.apache.commons.proxy.ProxyFactory
    commons/proper/proxy/branches/version-2.0-work/javassist/src/main/resources/META-INF/services/org.apache.commons.proxy2.ProxyFactory
      - copied unchanged from r965011, commons/proper/proxy/branches/version-2.0-work/javassist/src/main/resources/META-INF/services/org.apache.commons.proxy.ProxyFactory
    commons/proper/proxy/branches/version-2.0-work/jdk/src/main/resources/META-INF/services/org.apache.commons.proxy2.ProxyFactory
      - copied unchanged from r965011, commons/proper/proxy/branches/version-2.0-work/jdk/src/main/resources/META-INF/services/org.apache.commons.proxy.ProxyFactory
Removed:
    commons/proper/proxy/branches/version-2.0-work/cglib/src/main/resources/META-INF/services/org.apache.commons.proxy.ProxyFactory
    commons/proper/proxy/branches/version-2.0-work/javassist/src/main/resources/META-INF/services/org.apache.commons.proxy.ProxyFactory
    commons/proper/proxy/branches/version-2.0-work/jdk/src/main/resources/META-INF/services/org.apache.commons.proxy.ProxyFactory
Modified:
    commons/proper/proxy/branches/version-2.0-work/cglib/pom.xml
    commons/proper/proxy/branches/version-2.0-work/core/pom.xml
    commons/proper/proxy/branches/version-2.0-work/core/src/test/java/org/apache/commons/proxy2/AbstractProxyFactoryTestCase.java
    commons/proper/proxy/branches/version-2.0-work/javassist/pom.xml
    commons/proper/proxy/branches/version-2.0-work/jdk/pom.xml
    commons/proper/proxy/branches/version-2.0-work/pom.xml

Modified: commons/proper/proxy/branches/version-2.0-work/cglib/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/cglib/pom.xml?rev=965013&r1=965012&r2=965013&view=diff
==============================================================================
--- commons/proper/proxy/branches/version-2.0-work/cglib/pom.xml (original)
+++ commons/proper/proxy/branches/version-2.0-work/cglib/pom.xml Sat Jul 17 04:50:38 2010
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>commons-proxy-cglib</artifactId>
-
+    <name>Commons Proxy CGLIB Proxies Module</name>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: commons/proper/proxy/branches/version-2.0-work/core/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/core/pom.xml?rev=965013&r1=965012&r2=965013&view=diff
==============================================================================
--- commons/proper/proxy/branches/version-2.0-work/core/pom.xml (original)
+++ commons/proper/proxy/branches/version-2.0-work/core/pom.xml Sat Jul 17 04:50:38 2010
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>commons-proxy</artifactId>
-
+    <name>Commons Proxy</name>
     <dependencies>
         <dependency>
             <groupId>aopalliance</groupId>

Modified: commons/proper/proxy/branches/version-2.0-work/core/src/test/java/org/apache/commons/proxy2/AbstractProxyFactoryTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/core/src/test/java/org/apache/commons/proxy2/AbstractProxyFactoryTestCase.java?rev=965013&r1=965012&r2=965013&view=diff
==============================================================================
--- commons/proper/proxy/branches/version-2.0-work/core/src/test/java/org/apache/commons/proxy2/AbstractProxyFactoryTestCase.java
(original)
+++ commons/proper/proxy/branches/version-2.0-work/core/src/test/java/org/apache/commons/proxy2/AbstractProxyFactoryTestCase.java
Sat Jul 17 04:50:38 2010
@@ -31,6 +31,7 @@ import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ServiceLoader;
@@ -57,7 +58,17 @@ public abstract class AbstractProxyFacto
 
     protected AbstractProxyFactoryTestCase()
     {
-        this.factory = ServiceLoader.load(ProxyFactory.class).iterator().next();
+        final ServiceLoader<ProxyFactory> serviceLoader = ServiceLoader.load(ProxyFactory.class);
+        Iterator<ProxyFactory> iter = serviceLoader.iterator();
+        if(iter.hasNext())
+        {
+            this.factory= iter.next();
+        }
+        else
+        {
+            throw new RuntimeException("Unable to find proxy factory implementation."); 
+        }
+
     }
 
 //**********************************************************************************************************************

Modified: commons/proper/proxy/branches/version-2.0-work/javassist/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/javassist/pom.xml?rev=965013&r1=965012&r2=965013&view=diff
==============================================================================
--- commons/proper/proxy/branches/version-2.0-work/javassist/pom.xml (original)
+++ commons/proper/proxy/branches/version-2.0-work/javassist/pom.xml Sat Jul 17 04:50:38 2010
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>commons-proxy-javassist</artifactId>
-
+    <name>Commons Proxy Javassist Proxies Module</name>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: commons/proper/proxy/branches/version-2.0-work/jdk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/jdk/pom.xml?rev=965013&r1=965012&r2=965013&view=diff
==============================================================================
--- commons/proper/proxy/branches/version-2.0-work/jdk/pom.xml (original)
+++ commons/proper/proxy/branches/version-2.0-work/jdk/pom.xml Sat Jul 17 04:50:38 2010
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>commons-proxy-jdk</artifactId>
-
+    <name>Commons Proxy JDK Proxies Module</name>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: commons/proper/proxy/branches/version-2.0-work/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/pom.xml?rev=965013&r1=965012&r2=965013&view=diff
==============================================================================
--- commons/proper/proxy/branches/version-2.0-work/pom.xml (original)
+++ commons/proper/proxy/branches/version-2.0-work/pom.xml Sat Jul 17 04:50:38 2010
@@ -34,7 +34,7 @@
     </parent>
     <artifactId>commons-proxy-parent</artifactId>
     <version>2.0-SNAPSHOT</version>
-    <name>Commons Proxy</name>
+    <name>Commons Proxy Parent</name>
     <description>Java library for dynamic proxying</description>
     <url>http://commons.apache.org/proxy/</url>
     <inceptionYear>2005</inceptionYear>
@@ -114,6 +114,14 @@
     </scm>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -174,22 +182,5 @@
         <commons.binary.suffix></commons.binary.suffix>
         <commons.jira.id>PROXY</commons.jira.id>
         <commons.jira.pid>12310731</commons.jira.pid>
-        <releaseManager>${user.name}</releaseManager>
     </properties>
-
-    <profiles>
-        <profile>
-            <id>rc</id>
-            <distributionManagement>
-                <site>
-                    <id>stagingSite</id>
-                    <name>Release Candidate Staging Site</name>
-                    <url>
-                        ${commons.deployment.protocol}://people.apache.org/home/${releaseManager}/public_html/${artifactId}-${version}
-                    </url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
-
 </project>



Mime
View raw message