[gatein-commits] gatein SVN: r7491 - in sandbox/as7_support/trunk/wci: exo and 24 other directories.

Author: mstruk Date: 2011-09-22 20:03:21 -0400 (Thu, 22 Sep 2011) New Revision: 7491 Removed: sandbox/as7_support/trunk/wci/test/servers/.pom.xml.swp sandbox/as7_support/trunk/wci/test/servers/jboss42/src/integration-tests/.build.xml.swp sandbox/as7_support/trunk/wci/test/servers/jboss6/src/integration-tests/.build.xml.swp Modified: sandbox/as7_support/trunk/wci/ sandbox/as7_support/trunk/wci/exo/ sandbox/as7_support/trunk/wci/exo/pom.xml sandbox/as7_support/trunk/wci/jboss/ sandbox/as7_support/trunk/wci/jboss/jboss6/ sandbox/as7_support/trunk/wci/jboss/jboss6/pom.xml sandbox/as7_support/trunk/wci/jboss/pom.xml sandbox/as7_support/trunk/wci/jetty/ sandbox/as7_support/trunk/wci/jetty/pom.xml sandbox/as7_support/trunk/wci/pom.xml sandbox/as7_support/trunk/wci/test/ sandbox/as7_support/trunk/wci/test/core/ sandbox/as7_support/trunk/wci/test/core/pom.xml sandbox/as7_support/trunk/wci/test/pom.xml sandbox/as7_support/trunk/wci/test/portlets/ sandbox/as7_support/trunk/wci/test/portlets/exo-portlet/ sandbox/as7_support/trunk/wci/test/portlets/exo-portlet/pom.xml sandbox/as7_support/trunk/wci/test/portlets/gatein-portlet/ sandbox/as7_support/trunk/wci/test/portlets/gatein-portlet/pom.xml sandbox/as7_support/trunk/wci/test/portlets/native-portlet/ sandbox/as7_support/trunk/wci/test/portlets/native-portlet/pom.xml sandbox/as7_support/trunk/wci/test/portlets/pom.xml sandbox/as7_support/trunk/wci/test/servers/ sandbox/as7_support/trunk/wci/test/servers/jboss42/ sandbox/as7_support/trunk/wci/test/servers/jboss51/ sandbox/as7_support/trunk/wci/test/servers/jboss51/pom.xml sandbox/as7_support/trunk/wci/test/servers/jboss6/ sandbox/as7_support/trunk/wci/test/servers/jboss6/pom.xml sandbox/as7_support/trunk/wci/test/servers/jetty6/ sandbox/as7_support/trunk/wci/test/servers/jetty6/pom.xml sandbox/as7_support/trunk/wci/test/servers/pom.xml sandbox/as7_support/trunk/wci/test/servers/tomcat6/ sandbox/as7_support/trunk/wci/test/servers/tomcat6/pom.xml sandbox/as7_support/trunk/wci/test/servers/tomcat7/ sandbox/as7_support/trunk/wci/test/servers/tomcat7/pom.xml sandbox/as7_support/trunk/wci/test/servers/tomcat7/src/integration-tests/build.xml sandbox/as7_support/trunk/wci/tomcat/ sandbox/as7_support/trunk/wci/tomcat/pom.xml sandbox/as7_support/trunk/wci/tomcat/tomcat6/ sandbox/as7_support/trunk/wci/tomcat/tomcat6/pom.xml sandbox/as7_support/trunk/wci/tomcat/tomcat7/ sandbox/as7_support/trunk/wci/tomcat/tomcat7/pom.xml sandbox/as7_support/trunk/wci/wci/ sandbox/as7_support/trunk/wci/wci/pom.xml sandbox/as7_support/trunk/wci/wci/src/main/java/org/gatein/wci/security/WCILoginController.java Log: Merged from wci trunk up to r7111 Property changes on: sandbox/as7_support/trunk/wci ___________________________________________________________________ Modified: svn:ignore - target .settings .project .metadata + .idea target .settings .project .metadata *.iml Modified: svn:mergeinfo - /components/wci/branches/logout:5894-6009 /components/wci/trunk:6492-6756 + /components/wci/branches/logout:5894-6009 /components/wci/trunk:6492-7111 Property changes on: sandbox/as7_support/trunk/wci/exo ___________________________________________________________________ Modified: svn:ignore - target + target *.iml Modified: sandbox/as7_support/trunk/wci/exo/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/exo/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/exo/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-exo</artifactId> Property changes on: sandbox/as7_support/trunk/wci/jboss ___________________________________________________________________ Added: svn:ignore + target *.iml Property changes on: sandbox/as7_support/trunk/wci/jboss/jboss6 ___________________________________________________________________ Added: svn:ignore + target *.iml Modified: sandbox/as7_support/trunk/wci/jboss/jboss6/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/jboss/jboss6/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/jboss/jboss6/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-jboss</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-jboss6</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> <packaging>jar</packaging> <name>GateIn - WCI JBoss 6 compatibility component</name> Modified: sandbox/as7_support/trunk/wci/jboss/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/jboss/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/jboss/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-jboss</artifactId> Property changes on: sandbox/as7_support/trunk/wci/jetty ___________________________________________________________________ Modified: svn:ignore - target + target *.iml Modified: sandbox/as7_support/trunk/wci/jetty/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/jetty/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/jetty/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-jetty</artifactId> Modified: sandbox/as7_support/trunk/wci/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -6,7 +6,7 @@ <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> <packaging>pom</packaging> <parent> @@ -44,7 +44,7 @@ <dependency> <groupId>org.gatein</groupId> <artifactId>gatein-dep</artifactId> - <version>1.1.0-Beta04</version> + <version>1.1.0-Beta06</version> <type>pom</type> <scope>import</scope> </dependency> Property changes on: sandbox/as7_support/trunk/wci/test ___________________________________________________________________ Modified: svn:ignore - target + target *.iml Property changes on: sandbox/as7_support/trunk/wci/test/core ___________________________________________________________________ Modified: svn:ignore - target + target *.iml Modified: sandbox/as7_support/trunk/wci/test/core/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/test/core/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/test/core/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-parent</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-core</artifactId> @@ -63,10 +63,6 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> </dependencies> <build> Modified: sandbox/as7_support/trunk/wci/test/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/test/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/test/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-parent</artifactId> @@ -11,7 +11,14 @@ <dependencyManagement> <dependencies> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + </dependency> + + <dependency> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-core</artifactId> <version>${project.version}</version> @@ -38,6 +45,12 @@ </dependencies> </dependencyManagement> + <dependencies> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </dependency> + </dependencies> <modules> <module>core</module> Property changes on: sandbox/as7_support/trunk/wci/test/portlets ___________________________________________________________________ Added: svn:ignore + target *.iml Property changes on: sandbox/as7_support/trunk/wci/test/portlets/exo-portlet ___________________________________________________________________ Modified: svn:ignore - target + target *.iml Modified: sandbox/as7_support/trunk/wci/test/portlets/exo-portlet/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/test/portlets/exo-portlet/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/test/portlets/exo-portlet/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-portlets</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-exo-portlet</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> <packaging>war</packaging> <name>GateIn - WCI eXo Backwards Compatibility Test Portlet</name> </project> Property changes on: sandbox/as7_support/trunk/wci/test/portlets/gatein-portlet ___________________________________________________________________ Modified: svn:ignore - target + target *.iml Modified: sandbox/as7_support/trunk/wci/test/portlets/gatein-portlet/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/test/portlets/gatein-portlet/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/test/portlets/gatein-portlet/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-portlets</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-gatein-portlet</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> <packaging>war</packaging> <name>GateIn - WCI Gatein Test Portlet</name> </project> Property changes on: sandbox/as7_support/trunk/wci/test/portlets/native-portlet ___________________________________________________________________ Modified: svn:ignore - target + target *.iml Modified: sandbox/as7_support/trunk/wci/test/portlets/native-portlet/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/test/portlets/native-portlet/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/test/portlets/native-portlet/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-portlets</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-native-portlet</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> <packaging>war</packaging> <name>GateIn - WCI Native Test Portlet</name> </project> Modified: sandbox/as7_support/trunk/wci/test/portlets/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/test/portlets/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/test/portlets/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-parent</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-portlets</artifactId> Property changes on: sandbox/as7_support/trunk/wci/test/servers ___________________________________________________________________ Modified: svn:ignore - target + target *.iml Deleted: sandbox/as7_support/trunk/wci/test/servers/.pom.xml.swp =================================================================== (Binary files differ) Property changes on: sandbox/as7_support/trunk/wci/test/servers/jboss42 ___________________________________________________________________ Modified: svn:ignore - target + target *.iml Deleted: sandbox/as7_support/trunk/wci/test/servers/jboss42/src/integration-tests/.build.xml.swp =================================================================== (Binary files differ) Property changes on: sandbox/as7_support/trunk/wci/test/servers/jboss51 ___________________________________________________________________ Modified: svn:ignore - target + target *.iml Modified: sandbox/as7_support/trunk/wci/test/servers/jboss51/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/test/servers/jboss51/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/test/servers/jboss51/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-server-parent</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-jboss51</artifactId> Property changes on: sandbox/as7_support/trunk/wci/test/servers/jboss6 ___________________________________________________________________ Added: svn:ignore + target *.iml Modified: sandbox/as7_support/trunk/wci/test/servers/jboss6/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/test/servers/jboss6/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/test/servers/jboss6/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-server-parent</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-jboss6</artifactId> Deleted: sandbox/as7_support/trunk/wci/test/servers/jboss6/src/integration-tests/.build.xml.swp =================================================================== (Binary files differ) Property changes on: sandbox/as7_support/trunk/wci/test/servers/jetty6 ___________________________________________________________________ Modified: svn:ignore - target + target *.iml Modified: sandbox/as7_support/trunk/wci/test/servers/jetty6/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/test/servers/jetty6/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/test/servers/jetty6/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-server-parent</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-jetty6</artifactId> Modified: sandbox/as7_support/trunk/wci/test/servers/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/test/servers/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/test/servers/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-parent</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-server-parent</artifactId> Property changes on: sandbox/as7_support/trunk/wci/test/servers/tomcat6 ___________________________________________________________________ Modified: svn:ignore - target + target *.iml Modified: sandbox/as7_support/trunk/wci/test/servers/tomcat6/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/test/servers/tomcat6/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/test/servers/tomcat6/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-server-parent</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-tomcat6</artifactId> Property changes on: sandbox/as7_support/trunk/wci/test/servers/tomcat7 ___________________________________________________________________ Added: svn:ignore + target *.iml Modified: sandbox/as7_support/trunk/wci/test/servers/tomcat7/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/test/servers/tomcat7/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/test/servers/tomcat7/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-server-parent</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-tomcat7</artifactId> @@ -367,6 +367,7 @@ <property name="dependency.gatein-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat7.jar.path}" /> <property name="dependency.gatein-wci-exo.jar" value="${maven.dependency.org.gatein.wci.wci-exo.jar.path}" /> <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}" /> + <property name="dependency.tomcat.jar" value="${maven.dependency.org.apache.tomcat.tomcat-catalina.jar.path}" /> <!-- locations of archives to use --> <property name="test.archives.directory" value="${project.build.directory}/test-archives" /> Modified: sandbox/as7_support/trunk/wci/test/servers/tomcat7/src/integration-tests/build.xml =================================================================== --- sandbox/as7_support/trunk/wci/test/servers/tomcat7/src/integration-tests/build.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/test/servers/tomcat7/src/integration-tests/build.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -32,6 +32,7 @@ <path path="${dependency.gatein-wci-tomcat.jar}"/> <path path="${dependency.gatein-wci-exo.jar}"/> <path path="${dependency.jboss-serialization.jar}"/> + <path path="${dependency.tomcat.jar}"/> </path> <target name="cargo.start" depends="cargo.setup"> Property changes on: sandbox/as7_support/trunk/wci/tomcat ___________________________________________________________________ Added: svn:ignore + target *.iml Modified: sandbox/as7_support/trunk/wci/tomcat/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/tomcat/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/tomcat/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-tomcat</artifactId> Property changes on: sandbox/as7_support/trunk/wci/tomcat/tomcat6 ___________________________________________________________________ Modified: svn:ignore - target + target *.iml Modified: sandbox/as7_support/trunk/wci/tomcat/tomcat6/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/tomcat/tomcat6/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/tomcat/tomcat6/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-tomcat</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-tomcat6</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> <packaging>jar</packaging> <name>GateIn - WCI Tomcat 6 compatibility component</name> Property changes on: sandbox/as7_support/trunk/wci/tomcat/tomcat7 ___________________________________________________________________ Added: svn:ignore + target *.iml Modified: sandbox/as7_support/trunk/wci/tomcat/tomcat7/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/tomcat/tomcat7/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/tomcat/tomcat7/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-tomcat</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-tomcat7</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> <packaging>jar</packaging> <name>GateIn - WCI Tomcat 7 compatibility component</name> @@ -18,7 +18,7 @@ <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-catalina</artifactId> - <version>7.0.2</version> + <version>7.0.19</version> </dependency> </dependencies> </project> Property changes on: sandbox/as7_support/trunk/wci/wci ___________________________________________________________________ Modified: svn:ignore - target + target *.iml Modified: sandbox/as7_support/trunk/wci/wci/pom.xml =================================================================== --- sandbox/as7_support/trunk/wci/wci/pom.xml 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/wci/pom.xml 2011-09-23 00:03:21 UTC (rev 7491) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.0-Beta05-SNAPSHOT</version> + <version>2.1.0-Beta07-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-wci</artifactId> Modified: sandbox/as7_support/trunk/wci/wci/src/main/java/org/gatein/wci/security/WCILoginController.java =================================================================== --- sandbox/as7_support/trunk/wci/wci/src/main/java/org/gatein/wci/security/WCILoginController.java 2011-09-22 15:10:35 UTC (rev 7490) +++ sandbox/as7_support/trunk/wci/wci/src/main/java/org/gatein/wci/security/WCILoginController.java 2011-09-23 00:03:21 UTC (rev 7491) @@ -37,9 +37,6 @@ /** . */ private static final Logger log = LoggerFactory.getLogger(WCILoginController.class); - /** . */ - protected Credentials credentials; - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { String username = req.getParameter("username"); @@ -52,23 +49,13 @@ ) return; // - if (username == null) - { - log.error("Tried to access the portal login controller without username provided"); - resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "No username provided"); - return; + + if (username != null && password != null) + { + log.debug("Found username and password and set credentials in http session"); + Credentials credentials = new Credentials(username, password); + req.getSession().setAttribute(Credentials.CREDENTIALS, credentials); } - if (password == null) - { - log.error("Tried to access the portal login controller without password provided"); - resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "No password provided"); - return; - } - - // - log.debug("Found username and password and set credentials in http session"); - credentials = new Credentials(username, password); - req.getSession().setAttribute(Credentials.CREDENTIALS, credentials); } protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException