renaming packages
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/proxy/branches/version-2.0-work@965013 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/cglib/pom.xml b/cglib/pom.xml
index 9f7c61b..48ad47d 100644
--- a/cglib/pom.xml
+++ b/cglib/pom.xml
@@ -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>
diff --git a/cglib/src/main/resources/META-INF/services/org.apache.commons.proxy.ProxyFactory b/cglib/src/main/resources/META-INF/services/org.apache.commons.proxy2.ProxyFactory
similarity index 100%
rename from cglib/src/main/resources/META-INF/services/org.apache.commons.proxy.ProxyFactory
rename to cglib/src/main/resources/META-INF/services/org.apache.commons.proxy2.ProxyFactory
diff --git a/core/pom.xml b/core/pom.xml
index 194f557..059e673 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>commons-proxy</artifactId>
-
+ <name>Commons Proxy</name>
<dependencies>
<dependency>
<groupId>aopalliance</groupId>
diff --git a/core/src/test/java/org/apache/commons/proxy2/AbstractProxyFactoryTestCase.java b/core/src/test/java/org/apache/commons/proxy2/AbstractProxyFactoryTestCase.java
index b43533b..b1e69b9 100644
--- a/core/src/test/java/org/apache/commons/proxy2/AbstractProxyFactoryTestCase.java
+++ b/core/src/test/java/org/apache/commons/proxy2/AbstractProxyFactoryTestCase.java
@@ -31,6 +31,7 @@
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 @@
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.");
+ }
+
}
//**********************************************************************************************************************
diff --git a/javassist/pom.xml b/javassist/pom.xml
index efe8297..3c78bc5 100644
--- a/javassist/pom.xml
+++ b/javassist/pom.xml
@@ -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>
diff --git a/javassist/src/main/resources/META-INF/services/org.apache.commons.proxy.ProxyFactory b/javassist/src/main/resources/META-INF/services/org.apache.commons.proxy2.ProxyFactory
similarity index 100%
rename from javassist/src/main/resources/META-INF/services/org.apache.commons.proxy.ProxyFactory
rename to javassist/src/main/resources/META-INF/services/org.apache.commons.proxy2.ProxyFactory
diff --git a/jdk/pom.xml b/jdk/pom.xml
index 3e5c4fb..a18b224 100644
--- a/jdk/pom.xml
+++ b/jdk/pom.xml
@@ -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>
diff --git a/jdk/src/main/resources/META-INF/services/org.apache.commons.proxy.ProxyFactory b/jdk/src/main/resources/META-INF/services/org.apache.commons.proxy2.ProxyFactory
similarity index 100%
rename from jdk/src/main/resources/META-INF/services/org.apache.commons.proxy.ProxyFactory
rename to jdk/src/main/resources/META-INF/services/org.apache.commons.proxy2.ProxyFactory
diff --git a/pom.xml b/pom.xml
index 8ac7ccf..def174f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
