You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/07/27 16:21:18 UTC
svn commit: r979718 - in /myfaces/test/branches/1_0_0_jakobk_shade: test12/
test12/src/main/java/org/apache/myfaces/test/mock/ test20/
test20/src/test/java/org/apache/myfaces/test/mock/
Author: jakobk
Date: Tue Jul 27 14:21:18 2010
New Revision: 979718
URL: http://svn.apache.org/viewvc?rev=979718&view=rev
Log:
use common-shades/attributemaps and maven-shade-plugin instead of copied classes
Removed:
myfaces/test/branches/1_0_0_jakobk_shade/test12/src/main/java/org/apache/myfaces/test/mock/_AbstractAttributeMap.java
myfaces/test/branches/1_0_0_jakobk_shade/test12/src/main/java/org/apache/myfaces/test/mock/_ApplicationMap.java
myfaces/test/branches/1_0_0_jakobk_shade/test12/src/main/java/org/apache/myfaces/test/mock/_CookieMap.java
myfaces/test/branches/1_0_0_jakobk_shade/test12/src/main/java/org/apache/myfaces/test/mock/_InitParameterMap.java
myfaces/test/branches/1_0_0_jakobk_shade/test12/src/main/java/org/apache/myfaces/test/mock/_NullEnumeration.java
myfaces/test/branches/1_0_0_jakobk_shade/test12/src/main/java/org/apache/myfaces/test/mock/_RequestHeaderMap.java
myfaces/test/branches/1_0_0_jakobk_shade/test12/src/main/java/org/apache/myfaces/test/mock/_RequestHeaderValuesMap.java
myfaces/test/branches/1_0_0_jakobk_shade/test12/src/main/java/org/apache/myfaces/test/mock/_RequestMap.java
myfaces/test/branches/1_0_0_jakobk_shade/test12/src/main/java/org/apache/myfaces/test/mock/_RequestParameterMap.java
myfaces/test/branches/1_0_0_jakobk_shade/test12/src/main/java/org/apache/myfaces/test/mock/_RequestParameterValuesMap.java
myfaces/test/branches/1_0_0_jakobk_shade/test12/src/main/java/org/apache/myfaces/test/mock/_SessionMap.java
Modified:
myfaces/test/branches/1_0_0_jakobk_shade/test12/pom.xml
myfaces/test/branches/1_0_0_jakobk_shade/test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext.java
myfaces/test/branches/1_0_0_jakobk_shade/test20/pom.xml
myfaces/test/branches/1_0_0_jakobk_shade/test20/src/test/java/org/apache/myfaces/test/mock/MockPartialViewContextTestCase.java
Modified: myfaces/test/branches/1_0_0_jakobk_shade/test12/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/test/branches/1_0_0_jakobk_shade/test12/pom.xml?rev=979718&r1=979717&r2=979718&view=diff
==============================================================================
--- myfaces/test/branches/1_0_0_jakobk_shade/test12/pom.xml (original)
+++ myfaces/test/branches/1_0_0_jakobk_shade/test12/pom.xml Tue Jul 27 14:21:18 2010
@@ -91,6 +91,14 @@
<version>1.0</version>
<scope>provided</scope>
</dependency>
+
+ <!-- shaded artifacts -->
+ <dependency>
+ <groupId>org.apache.myfaces.common-shades</groupId>
+ <artifactId>attributemaps</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
@@ -122,6 +130,42 @@
</execution>
</executions>
</plugin>
+
+ <!--
+ Use maven-shade-plugin to include artifacts from
+ org.apache.myfaces.common-shades directly in the target jar.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.3.3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ <artifactSet>
+ <includes>
+ <include>org.apache.myfaces.common-shades:attributemaps</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <!-- rename packages to circumvent class loading conflicts -->
+ <pattern>org.apache.myfaces.shaded</pattern>
+ <shadedPattern>org.apache.myfaces.test</shadedPattern>
+ <excludes>
+ <exclude>org.apache.myfaces.test.**</exclude>
+ </excludes>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<!-- Allow building with JDK 1.4 as well as JDK 1.5,
Modified: myfaces/test/branches/1_0_0_jakobk_shade/test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext.java
URL: http://svn.apache.org/viewvc/myfaces/test/branches/1_0_0_jakobk_shade/test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext.java?rev=979718&r1=979717&r2=979718&view=diff
==============================================================================
--- myfaces/test/branches/1_0_0_jakobk_shade/test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext.java (original)
+++ myfaces/test/branches/1_0_0_jakobk_shade/test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext.java Tue Jul 27 14:21:18 2010
@@ -36,7 +36,16 @@ import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+
+import org.apache.myfaces.shaded.context.servlet.ApplicationMap;
+import org.apache.myfaces.shaded.context.servlet.CookieMap;
+import org.apache.myfaces.shaded.context.servlet.InitParameterMap;
+import org.apache.myfaces.shaded.context.servlet.RequestHeaderMap;
+import org.apache.myfaces.shaded.context.servlet.RequestHeaderValuesMap;
+import org.apache.myfaces.shaded.context.servlet.RequestMap;
+import org.apache.myfaces.shaded.context.servlet.RequestParameterMap;
+import org.apache.myfaces.shaded.context.servlet.RequestParameterValuesMap;
+import org.apache.myfaces.shaded.context.servlet.SessionMap;
/**
* <p>Mock implementation of <code>ExternalContext</code>.</p>
@@ -103,7 +112,7 @@ public class MockExternalContext extends
{
Map map = getRequestCookieMap();
if (request instanceof MockHttpServletRequest &&
- map instanceof _CookieMap)
+ map instanceof CookieMap)
{
((MockHttpServletRequest)request).addCookie(cookie);
}
@@ -133,7 +142,7 @@ public class MockExternalContext extends
{
Map map = getRequestParameterMap();
if (request instanceof MockHttpServletRequest &&
- map instanceof _RequestParameterMap)
+ map instanceof RequestParameterMap)
{
((MockHttpServletRequest)request).addParameter(key, value);
}
@@ -163,7 +172,7 @@ public class MockExternalContext extends
{
Map map = getRequestHeaderMap();
if (request instanceof MockHttpServletRequest &&
- map instanceof _RequestHeaderMap)
+ map instanceof RequestHeaderMap)
{
((MockHttpServletRequest)request).addHeader(key, value);
}
@@ -234,7 +243,7 @@ public class MockExternalContext extends
{
if (applicationMap == null)
{
- applicationMap = new _ApplicationMap(context);
+ applicationMap = new ApplicationMap(context);
}
return applicationMap;
}
@@ -262,7 +271,7 @@ public class MockExternalContext extends
{
if (initParameterMap == null)
{
- initParameterMap = new _InitParameterMap(context);
+ initParameterMap = new InitParameterMap(context);
}
return initParameterMap;
}
@@ -290,7 +299,7 @@ public class MockExternalContext extends
{
if (requestCookieMap == null)
{
- requestCookieMap = new _CookieMap(request);
+ requestCookieMap = new CookieMap(request);
}
return requestCookieMap;
}
@@ -300,7 +309,7 @@ public class MockExternalContext extends
{
if (requestHeaderMap == null)
{
- requestHeaderMap = new _RequestHeaderMap(request);
+ requestHeaderMap = new RequestHeaderMap(request);
}
return requestHeaderMap;
}
@@ -310,7 +319,7 @@ public class MockExternalContext extends
{
if (requestHeaderValuesMap == null)
{
- requestHeaderValuesMap = new _RequestHeaderValuesMap(request);
+ requestHeaderValuesMap = new RequestHeaderValuesMap(request);
}
return requestHeaderValuesMap;
}
@@ -332,7 +341,7 @@ public class MockExternalContext extends
{
if (requestMap == null)
{
- requestMap = new _RequestMap(request);
+ requestMap = new RequestMap(request);
}
return requestMap;
}
@@ -342,7 +351,7 @@ public class MockExternalContext extends
{
if (requestParameterMap == null)
{
- requestParameterMap = new _RequestParameterMap(request);
+ requestParameterMap = new RequestParameterMap(request);
}
return requestParameterMap;
}
@@ -378,7 +387,7 @@ public class MockExternalContext extends
{
if (requestParameterValuesMap == null)
{
- requestParameterValuesMap = new _RequestParameterValuesMap(request);
+ requestParameterValuesMap = new RequestParameterValuesMap(request);
}
return requestParameterValuesMap;
}
@@ -430,7 +439,7 @@ public class MockExternalContext extends
{
if (sessionMap == null)
{
- sessionMap = new _SessionMap(request);
+ sessionMap = new SessionMap(request);
}
return sessionMap;
}
Modified: myfaces/test/branches/1_0_0_jakobk_shade/test20/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/test/branches/1_0_0_jakobk_shade/test20/pom.xml?rev=979718&r1=979717&r2=979718&view=diff
==============================================================================
--- myfaces/test/branches/1_0_0_jakobk_shade/test20/pom.xml (original)
+++ myfaces/test/branches/1_0_0_jakobk_shade/test20/pom.xml Tue Jul 27 14:21:18 2010
@@ -116,6 +116,14 @@
<version>2.1</version>
<scope>provided</scope>
</dependency>
+
+ <!-- shaded artifacts -->
+ <dependency>
+ <groupId>org.apache.myfaces.common-shades</groupId>
+ <artifactId>attributemaps</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
@@ -192,11 +200,47 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>
+
+ <!--
+ Use maven-shade-plugin to include artifacts from
+ org.apache.myfaces.common-shades directly in the target jar.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.3.3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ <artifactSet>
+ <includes>
+ <include>org.apache.myfaces.common-shades:attributemaps</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <!-- rename packages to circumvent class loading conflicts -->
+ <pattern>org.apache.myfaces.shaded</pattern>
+ <shadedPattern>org.apache.myfaces.test</shadedPattern>
+ <excludes>
+ <exclude>org.apache.myfaces.test.**</exclude>
+ </excludes>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<properties>
<jsf-ri.version>2.0.2-b10</jsf-ri.version>
- <jsf-myfaces.version>2.0.0-beta</jsf-myfaces.version>
+ <jsf-myfaces.version>2.0.2-SNAPSHOT</jsf-myfaces.version>
</properties>
</project>
Modified: myfaces/test/branches/1_0_0_jakobk_shade/test20/src/test/java/org/apache/myfaces/test/mock/MockPartialViewContextTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/test/branches/1_0_0_jakobk_shade/test20/src/test/java/org/apache/myfaces/test/mock/MockPartialViewContextTestCase.java?rev=979718&r1=979717&r2=979718&view=diff
==============================================================================
--- myfaces/test/branches/1_0_0_jakobk_shade/test20/src/test/java/org/apache/myfaces/test/mock/MockPartialViewContextTestCase.java (original)
+++ myfaces/test/branches/1_0_0_jakobk_shade/test20/src/test/java/org/apache/myfaces/test/mock/MockPartialViewContextTestCase.java Tue Jul 27 14:21:18 2010
@@ -65,7 +65,7 @@ public class MockPartialViewContextTestC
PartialViewContext pvContext = factory.getPartialViewContext(facesContext);
assertFalse(pvContext.isAjaxRequest());
- facesContext.getExternalContext().getRequestHeaderMap().put("Faces-Request", "partial/ajax");
+ externalContext.addRequestHeader("Faces-Request", "partial/ajax");
pvContext = factory.getPartialViewContext(facesContext);
assertTrue(pvContext.isAjaxRequest());