FAQ
Could someone add current12/pom.xml to continuum? Until then all 1.2
builds will fail.

I have no access to continuum on http://myfaces.zones.apache.org:8081/continuum

This pom contains for all 1.2 dependencies the used versions and will
be referenced by 1.2 artifacts. This was necessary to ensure that all
1.2 artifacts share the same version if a dependency is used across
them. We now have only one place if a version of a dependency needs to
be changed.

2007/2/26, mbr@apache.org <mbr@apache.org>:
Author: mbr
Date: Sun Feb 25 16:34:28 2007
New Revision: 511671

URL: http://svn.apache.org/viewvc?view=rev&rev=511671
Log:
fix for MYFACES-1542
versions for dependencies are now managed in dependencyManagement of current12/pom.xml (this pom needs to be added to continuum to work)
+ updated dependecies to use latest versions
TODO: add current12/pom.xml to continuum (until then the MyFaces 1.2 builds will fail!)
TODO: also specify versions of used maven plugins to ensure reproduceable builds (maven don't update released plugins automatically)

Removed:
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/ELParserHelper.java
Modified:
myfaces/core/branches/jsf12/api/pom.xml
myfaces/core/branches/jsf12/api/src/test/java/javax/faces/application/StateManagerTest.java
myfaces/core/branches/jsf12/impl/pom.xml
myfaces/core/branches/jsf12/pom.xml
myfaces/current12/pom.xml
myfaces/current12/test-webapp/pom.xml
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java
myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/taglib/UIComponentTagUtilsTest.java
myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java
myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java
myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java
myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java
myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java
myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java
myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java
myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java
myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java
myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java
myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java
myfaces/shared/branches/3_0_0/pom.xml

Modified: myfaces/core/branches/jsf12/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/pom.xml?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/core/branches/jsf12/api/pom.xml (original)
+++ myfaces/core/branches/jsf12/api/pom.xml Sun Feb 25 16:34:28 2007
@@ -57,11 +57,11 @@
</execution>
</executions>
<dependencies>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
</dependencies>
</plugin>
</plugins>
@@ -161,111 +161,67 @@
</profiles>
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-build</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</dependency>
+
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jasper-el</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
<scope>provided</scope>
</dependency>
+
+ <!-- only needed together with org.apache.myfaces.trinidadbuild:maven-faces-plugin to generate components -->
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-build</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- test dependencies -->
<dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- <scope>compile</scope>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
- <version>1.1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
- <version>1.0.1</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock-cglib</artifactId>
- <version>1.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <artifactId>jsp-api</artifactId>
- <groupId>javax.servlet</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>easymock</groupId>
+ <groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>1.1</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.6</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>xml-apis</artifactId>
- <groupId>xml-apis</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.2.1</version>
<scope>test</scope>
</dependency>
</dependencies>

Modified: myfaces/core/branches/jsf12/api/src/test/java/javax/faces/application/StateManagerTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/test/java/javax/faces/application/StateManagerTest.java?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/core/branches/jsf12/api/src/test/java/javax/faces/application/StateManagerTest.java (original)
+++ myfaces/core/branches/jsf12/api/src/test/java/javax/faces/application/StateManagerTest.java Sun Feb 25 16:34:28 2007
@@ -16,15 +16,17 @@

package javax.faces.application;

+import org.apache.shale.test.mock.MockStateManager;
+
+import org.easymock.classextension.EasyMock;
+import org.easymock.classextension.IMocksControl;
+
+
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;

import junit.framework.TestCase;

-import org.apache.shale.test.mock.MockStateManager;
-import org.easymock.MockControl;
-import org.easymock.classextension.MockClassControl;
-
public class StateManagerTest extends TestCase {

public static void main(String[] args) {
@@ -59,15 +61,15 @@
* Test method for 'javax.faces.application.StateManager.isSavingStateInClient(FacesContext)'
*/
public void testIsSavingStateInClientTrue() {
- MockControl contextControl = MockClassControl.createControl(FacesContext.class);
- MockControl externalControl = MockClassControl.createControl(ExternalContext.class);
- FacesContext context = (FacesContext)contextControl.getMock();
- ExternalContext external = (ExternalContext)externalControl.getMock();
+ IMocksControl contextControl = EasyMock.createControl();
+ IMocksControl externalControl = EasyMock.createControl();
+ FacesContext context = contextControl.createMock(FacesContext.class);
+ ExternalContext external = externalControl.createMock(ExternalContext.class);
context.getExternalContext();
- contextControl.setReturnValue(external);
+ contextControl.andReturn(external);
contextControl.replay();
external.getInitParameter(StateManager.STATE_SAVING_METHOD_PARAM_NAME);
- externalControl.setReturnValue("client");
+ externalControl.andReturn("client");
externalControl.replay();

MockStateManager subject = new MockStateManager();
@@ -78,15 +80,15 @@
* Test method for 'javax.faces.application.StateManager.isSavingStateInClient(FacesContext)'
*/
public void testIsSavingStateInClientFalse() {
- MockControl contextControl = MockClassControl.createControl(FacesContext.class);
- MockControl externalControl = MockClassControl.createControl(ExternalContext.class);
- FacesContext context = (FacesContext)contextControl.getMock();
- ExternalContext external = (ExternalContext)externalControl.getMock();
+ IMocksControl contextControl = EasyMock.createControl();
+ IMocksControl externalControl = EasyMock.createControl();
+ FacesContext context = contextControl.createMock(FacesContext.class);
+ ExternalContext external = externalControl.createMock(ExternalContext.class);
context.getExternalContext();
- contextControl.setReturnValue(external);
+ contextControl.andReturn(external);
contextControl.replay();
external.getInitParameter(StateManager.STATE_SAVING_METHOD_PARAM_NAME);
- externalControl.setReturnValue("server");
+ externalControl.andReturn("server");
externalControl.replay();

MockStateManager subject = new MockStateManager();
@@ -99,19 +101,18 @@
* Test method for 'javax.faces.application.StateManager.isSavingStateInClient(FacesContext)'
*/
public void testIsSavingStateInClientBogus() {
- MockControl contextControl = MockClassControl.createControl(FacesContext.class);
- MockControl externalControl = MockClassControl.createControl(ExternalContext.class);
- FacesContext context = (FacesContext)contextControl.getMock();
- ExternalContext external = (ExternalContext)externalControl.getMock();
+ IMocksControl contextControl = EasyMock.createControl();
+ IMocksControl externalControl = EasyMock.createControl();
+ FacesContext context = contextControl.createMock(FacesContext.class);
+ ExternalContext external = externalControl.createMock(ExternalContext.class);
context.getExternalContext();
- contextControl.setReturnValue(external);
+ contextControl.andReturn(external);
context.getExternalContext();
- contextControl.setReturnValue(external);
+ contextControl.andReturn(external);
contextControl.replay();
external.getInitParameter(StateManager.STATE_SAVING_METHOD_PARAM_NAME);
- externalControl.setReturnValue("blorf");
+ externalControl.andReturn("blorf");
external.log("Illegal state saving method 'blorf', default server state saving will be used");
- externalControl.setVoidCallable();
externalControl.replay();

MockStateManager subject = new MockStateManager();
@@ -122,19 +123,18 @@
* Test method for 'javax.faces.application.StateManager.isSavingStateInClient(FacesContext)'
*/
public void testIsSavingStateInClientNull() {
- MockControl contextControl = MockClassControl.createControl(FacesContext.class);
- MockControl externalControl = MockClassControl.createControl(ExternalContext.class);
- FacesContext context = (FacesContext)contextControl.getMock();
- ExternalContext external = (ExternalContext)externalControl.getMock();
+ IMocksControl contextControl = EasyMock.createControl();
+ IMocksControl externalControl = EasyMock.createControl();
+ FacesContext context = contextControl.createMock(FacesContext.class);
+ ExternalContext external = externalControl.createMock(ExternalContext.class);
context.getExternalContext();
- contextControl.setReturnValue(external);
+ contextControl.andReturn(external);
context.getExternalContext();
- contextControl.setReturnValue(external);
+ contextControl.andReturn(external);
contextControl.replay();
external.getInitParameter(StateManager.STATE_SAVING_METHOD_PARAM_NAME);
- externalControl.setReturnValue(null);
+ externalControl.andReturn(null);
external.log("No state saving method defined, assuming default server state saving");
- externalControl.setVoidCallable();
externalControl.replay();

MockStateManager subject = new MockStateManager();

Modified: myfaces/core/branches/jsf12/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/pom.xml?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/core/branches/jsf12/impl/pom.xml (original)
+++ myfaces/core/branches/jsf12/impl/pom.xml Sun Feb 25 16:34:28 2007
@@ -250,101 +250,95 @@
</profiles>
<dependencies>
<dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+ <dependency>
+ <!-- this dependency will be packed together with the main artifact of this pom -->
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-impl</artifactId>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <artifactId>jsp-api</artifactId>
- <groupId>javax.servlet</groupId>
- </exclusion>
- </exclusions>
</dependency>
+
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>1.0</version>
<scope>provided</scope>
</dependency>
- <!-- dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jasper-el</artifactId>
- <version>6.0.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency-->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <classifier>tests</classifier>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- <scope>compile</scope>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <scope>test</scope>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <scope>compile</scope>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
</dependency>
<dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus</artifactId>
- <version>13-1.7.1</version>
- <scope>test</scope>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <!-- this dependency will be packed together with the main artifact of this pom -->
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-impl</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <scope>provided</scope>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.3</version>
- <scope>compile</scope>
</dependency>
<dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
</dependency>
+
+ <!-- only needed together with org.apache.myfaces.trinidadbuild:maven-faces-plugin to generate tlds and faces config -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-build</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
+
+ <!-- tests -->
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cactus</groupId>
+ <artifactId>cactus</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<reporting>
<plugins>

Modified: myfaces/core/branches/jsf12/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/pom.xml?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/core/branches/jsf12/pom.xml (original)
+++ myfaces/core/branches/jsf12/pom.xml Sun Feb 25 16:34:28 2007
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 " rel="nofollow">http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 " rel="nofollow">http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>myfaces-master</artifactId>
- <groupId>org.apache.myfaces.maven</groupId>
- <version>1.0.5-SNAPSHOT</version>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>myfaces-base</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.myfaces.core</groupId>
@@ -50,15 +51,15 @@
</repositories>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<distributionManagement>
<site>

Modified: myfaces/current12/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/current12/pom.xml?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/current12/pom.xml (original)
+++ myfaces/current12/pom.xml Sun Feb 25 16:34:28 2007
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 " rel="nofollow">http://maven.apache.org/maven-v4_0_0.xsd">

+ <parent>
+ <artifactId>myfaces-master</artifactId>
+ <groupId>org.apache.myfaces.maven</groupId>
+ <version>1.0.5-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces-base</artifactId>
@@ -25,4 +30,231 @@
<defaultGoal>install</defaultGoal>
</build>

-</project>
\ No newline at end of file
+ <repositories>
+ <repository>
+ <!-- this repository is needed for jstl:jstl:1.2 -->
+ <id>maven-repository.dev.java.net</id>
+ <name>java.net Maven 1 Repository</name>
+ <url>https://maven-repository.dev.java.net/nonav/repository</url>
+ <layout>legacy</layout>
+ </repository>
+ <repository>
+ <!-- this repository is needed for javax.el:el-api -->
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven 2</name>
+ <url>https://maven2-repository.dev.java.net/nonav/repository</url>
+ </repository>
+ <repository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>apache.snapshots</id>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ </repository>
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>myfaces-repo</id>
+ <url>http://myfaces.zones.apache.org/dist/maven-repository</url>
+ </repository>
+ </repositories>
+
+ <dependencyManagement>
+ <!-- define for all dependencies the version to use -->
+ <dependencies>
+ <!-- internal myfaces dependencies -->
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-build</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-impl</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <!-- apache commons-* dependencies -->
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <!-- TODO: commons-logging should declare these dependencies as optional ... -->
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.8</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+
+ <!-- javax.* dependencies -->
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ </dependency>
+
+ <!-- javax.annotation package -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <!-- test webapp -->
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.12</version>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock-cglib</artifactId>
+ <version>1.1.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-full</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>cactus</groupId>
+ <artifactId>cactus</artifactId>
+ <version>13-1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>0.9.5</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+</project>

Modified: myfaces/current12/test-webapp/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/current12/test-webapp/pom.xml?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/current12/test-webapp/pom.xml (original)
+++ myfaces/current12/test-webapp/pom.xml Sun Feb 25 16:34:28 2007
@@ -1,177 +1,151 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
- <parent>
- <artifactId>myfaces-base</artifactId>
- <groupId>org.apache.myfaces</groupId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>myfaces-base</artifactId>
<groupId>org.apache.myfaces</groupId>
- <artifactId>test-webapp</artifactId>
- <packaging>war</packaging>
- <name>Example test webapp to test myfaces 1.2</name>
<version>1.2.0-SNAPSHOT</version>
- <url>http://www.myorganization.org</url>
- <build>
- <finalName>test-webapp</finalName>
- </build>
- <profiles>
- <profile>
- <id>jettyConfig</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.0rc3</version>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- <pluginRepositories>
- <pluginRepository>
- <id>mortbay-repo</id>
- <name>mortbay-repo</name>
- <url>http://www.mortbay.org/maven2/snapshot</url>
- </pluginRepository>
- </pluginRepositories>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>test-webapp</artifactId>
+ <packaging>war</packaging>
+ <name>Example test webapp to test myfaces 1.2</name>
+ <version>1.2.0-SNAPSHOT</version>
+ <url>http://www.myorganization.org</url>
+ <build>
+ <finalName>test-webapp</finalName>
+ </build>
+ <profiles>
+ <profile>
+ <id>jettyConfig</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.1</version>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ </configuration>
<dependencies>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>5.5.9</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>5.5.9</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler-jdt</artifactId>
- <version>5.5.9</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>el-api</artifactId>
- <version>6.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jasper-el</artifactId>
- <version>6.0.1-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
</dependencies>
- </profile>
- </profiles>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
+ </plugin>
+ </plugins>
+ </build>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>mortbay-repo</id>
+ <name>mortbay-repo</name>
+ <url>http://www.mortbay.org/maven2/snapshot</url>
+ </pluginRepository>
+ </pluginRepositories>
+ <dependencies>
<!--
- <dependency>
- <groupId>org.apache.myfaces.tomahawk</groupId>
- <artifactId>tomahawk</artifactId>
- <version>1.1.4-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- -->
-
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- <version>1.1.12</version>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.sun.el</groupId>
- <artifactId>el-ri</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
- </dependency>
- <!--
- <dependency>
- <groupId>org.ajax4jsf</groupId>
- <artifactId>ajax4jsf</artifactId>
- <version>1.0.4</version>
- </dependency>
-
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- <exclusions>
- <exclusion>
- <artifactId>jsp-api</artifactId>
- <groupId>javax.servlet</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.12</version>
- </dependency>
- </dependencies>
-
- <repositories>
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>https://maven2-repository.dev.java.net/nonav/repository</url>
- </repository>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </repository>
-
- <!-- temporary only (jaxb)-->
- <repository>
- <id>java.net</id>
- <url>http://maven1.glassfishwiki.org</url>
- <layout>legacy</layout>
- </repository>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>5.5.9</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>5.5.9</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler-jdt</artifactId>
+ <version>5.5.9</version>
+ <scope>compile</scope>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1</artifactId>
+ <version>6.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.el</groupId>
+ <artifactId>el-ri</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk</artifactId>
+ <version>1.1.4-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ -->
+
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>1.1.12</version>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>org.ajax4jsf</groupId>
+ <artifactId>ajax4jsf</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jsp-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.12</version>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <!-- temporary only (jaxb)-->
+ <repository>
+ <id>maven1.glassfishwiki.org</id>
+ <url>http://maven1.glassfishwiki.org</url>
+ <layout>legacy</layout>
+ </repository>

- </repositories>
-</project>
\ No newline at end of file
+ </repositories>
+</project>

Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java Sun Feb 25 16:34:28 2007
@@ -1,18 +1,15 @@
package org.apache.myfaces.shared.util;

-import org.apache.myfaces.shared.component.BindingAware;
-import org.apache.commons.digester.Digester;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

-import javax.faces.context.FacesContext;
+import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
-import javax.faces.el.ValueBinding;
-import javax.el.ValueExpression;
-import java.util.Iterator;
+import javax.faces.context.FacesContext;
+
import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
+import java.util.Iterator;

/**
* @author Martin Marinschek (latest modification by $Author: grantsmith $)

Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/taglib/UIComponentTagUtilsTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/taglib/UIComponentTagUtilsTest.java?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/taglib/UIComponentTagUtilsTest.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/taglib/UIComponentTagUtilsTest.java Sun Feb 25 16:34:28 2007
@@ -15,13 +15,13 @@
*/
package org.apache.myfaces.shared.taglib;

+import org.apache.shale.test.base.AbstractJsfTestCase;
+
import javax.faces.component.UIComponent;
import javax.faces.component.html.HtmlInputText;

import junit.framework.Test;

-import org.apache.shale.test.base.AbstractJsfTestCase;
-
/**
* TestCase for UIComponentTagUtils
*/
@@ -47,11 +47,13 @@
}
};

- public void setUp() {
+ public void setUp() throws Exception
+ {
super.setUp();
}

- public void tearDown() {
+ public void tearDown() throws Exception
+ {
super.tearDown();
}


Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java Sun Feb 25 16:34:28 2007
@@ -22,9 +22,8 @@
* @author Dennis C. Byrne
*/

-import org.apache.shale.test.base.AbstractJsfTestCase;
-import org.apache.myfaces.shared.util.StateUtils;
import org.apache.myfaces.shared.util.serial.DefaultSerialFactory;
+import org.apache.shale.test.base.AbstractJsfTestCase;

import java.io.Serializable;
import java.util.Arrays;
@@ -46,14 +45,14 @@
public static final String BASE64_KEY_SIZE_24 = "MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIz";


- public void setUp()
+ public void setUp() throws Exception
{
super.setUp();
sensitiveString = "this is my secret";
externalContext.getApplicationMap().put(StateUtils.SERIAL_FACTORY, new DefaultSerialFactory());
}

- public void tearDown()
+ public void tearDown() throws Exception
{
super.tearDown();
sensitiveString = null;

Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java Sun Feb 25 16:34:28 2007
@@ -45,7 +45,7 @@
return null; // keep this method or maven won't run it
}

- public void setUp()
+ public void setUp() throws Exception
{
super.setUp();


Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java Sun Feb 25 16:34:28 2007
@@ -35,7 +35,7 @@
return null; // keep this method or maven won't run it
}

- public void setUp()
+ public void setUp() throws Exception
{
super.setUp();


Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java Sun Feb 25 16:34:28 2007
@@ -35,7 +35,7 @@
return null; // keep this method or maven won't run it
}

- public void setUp()
+ public void setUp() throws Exception
{
super.setUp();


Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java Sun Feb 25 16:34:28 2007
@@ -35,7 +35,7 @@
return null; // keep this method or maven won't run it
}

- public void setUp()
+ public void setUp() throws Exception
{
super.setUp();


Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java Sun Feb 25 16:34:28 2007
@@ -17,12 +17,11 @@

package org.apache.myfaces.shared.util;

-import javax.faces.FacesException;
-
import junit.framework.Test;
-
import org.apache.shale.test.base.AbstractJsfTestCase;

+import javax.faces.FacesException;
+
/**
* @author Dennis C. Byrne
*/
@@ -37,7 +36,8 @@
return null; // keep this method or maven won't run it
}

- public void setUp(){
+ public void setUp() throws Exception
+ {

super.setUp();


Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java Sun Feb 25 16:34:28 2007
@@ -17,12 +17,11 @@

package org.apache.myfaces.shared.util;

-import javax.crypto.SecretKey;
-
import junit.framework.Test;
-
import org.apache.shale.test.base.AbstractJsfTestCase;

+import javax.crypto.SecretKey;
+
/**
* @author Dennis C. Byrne
*/
@@ -39,7 +38,7 @@
return null; // keep this method or maven won't run it
}

- public void setUp()
+ public void setUp() throws Exception
{
super.setUp();


Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java Sun Feb 25 16:34:28 2007
@@ -37,7 +37,7 @@
return null; // keep this method or maven won't run it
}

- public void setUp()
+ public void setUp() throws Exception
{
super.setUp();
// DO NOT UNCOMMENT THIS

Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java Sun Feb 25 16:34:28 2007
@@ -44,7 +44,7 @@
return null; // keep this method or maven won't run it
}

- public void setUp()
+ public void setUp() throws Exception
{
super.setUp();


Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java Sun Feb 25 16:34:28 2007
@@ -16,8 +16,6 @@
package org.apache.myfaces.shared.util;

import junit.framework.Test;
-import org.apache.myfaces.shared.util.StateUtils;
-import org.apache.myfaces.shared.util.AbstractStateUtilsTest;

/**
* This TestCase uses Blowfish in Electronic CodeBook mode
@@ -43,7 +41,7 @@
return null; // keep this method or maven won't run it
}

- public void setUp()
+ public void setUp() throws Exception
{
super.setUp();


Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java Sun Feb 25 16:34:28 2007
@@ -16,8 +16,6 @@
package org.apache.myfaces.shared.util;

import junit.framework.Test;
-import org.apache.myfaces.shared.util.StateUtils;
-import org.apache.myfaces.shared.util.AbstractStateUtilsTest;

/**
* This TestCase uses the the default algorithm/mode/padding of
@@ -37,7 +35,7 @@
return null; // keep this method or maven won't run it
}

- public void setUp()
+ public void setUp() throws Exception
{
super.setUp();


Modified: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java Sun Feb 25 16:34:28 2007
@@ -16,8 +16,6 @@
package org.apache.myfaces.shared.util;

import junit.framework.Test;
-import org.apache.myfaces.shared.util.StateUtils;
-import org.apache.myfaces.shared.util.AbstractStateUtilsTest;

/**
* This TestCase uses the 3DES algorithm in Electronic CodeBook mode
@@ -43,7 +41,7 @@
return null; // keep this method or maven won't run it
}

- public void setUp()
+ public void setUp() throws Exception
{
super.setUp();


Modified: myfaces/shared/branches/3_0_0/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/pom.xml?view=diff&rev=511671&r1=511670&r2=511671
==============================================================================
--- myfaces/shared/branches/3_0_0/pom.xml (original)
+++ myfaces/shared/branches/3_0_0/pom.xml Sun Feb 25 16:34:28 2007
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 " rel="nofollow">http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>myfaces-master</artifactId>
- <groupId>org.apache.myfaces.maven</groupId>
- <version>1.0.5-SNAPSHOT</version>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>myfaces-base</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.myfaces.shared</groupId>
@@ -41,103 +41,83 @@
</repositories>
<dependencies>
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>el-api</artifactId>
- <version>6.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jasper-el</artifactId>
- <version>6.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>httpunit</groupId>
- <artifactId>httpunit</artifactId>
- <version>1.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus</artifactId>
- <version>13-1.7.1</version>
- <scope>test</scope>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
+
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.3</version>
- <scope>compile</scope>
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
<groupId>nekohtml</groupId>
<artifactId>nekohtml</artifactId>
- <version>0.9.1</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.struts.shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>1.0.2</version>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <scope>compile</scope>
+ <groupId>cactus</groupId>
+ <artifactId>cactus</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>easymock</groupId>
+ <groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>1.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>2.0.2</version>
<scope>test</scope>
</dependency>
</dependencies>


--
Mathias


--
Mathias

Search Discussions

Discussion Posts

Follow ups

Related Discussions

Discussion Navigation
viewthread | post
posts ‹ prev | 1 of 2 | next ›
Discussion Overview
groupdev @
categoriesmyfaces
postedFeb 26, '07 at 12:43a
activeFeb 26, '07 at 1:01a
posts2
users1
websitemyfaces.apache.org

1 user in discussion

Mathias Brökelmann: 2 posts

People

Translate

site design / logo © 2019 Grokbase