February 2010 - gatein-commits - Jboss List Archives

gatein SVN: r1632 - in components/sso/trunk: .settings and 18 other directories.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-02-11 07:28:04 -0500 (Thu, 11 Feb 2010) New Revision: 1632 Added: components/sso/trunk/.settings/ components/sso/trunk/.settings/org.eclipse.jdt.core.prefs components/sso/trunk/.settings/org.maven.ide.eclipse.prefs components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/webapps/ components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/webapps/josso/ components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/webapps/josso/WEB-INF/ Removed: components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/WEB-INF/ Modified: components/sso/trunk/.classpath components/sso/trunk/.project components/sso/trunk/agent/pom.xml components/sso/trunk/auth-callback/pom.xml components/sso/trunk/cas/gatein-cas-plugin/ components/sso/trunk/cas/gatein-cas-plugin/pom.xml components/sso/trunk/cas/gatein-cas-portal/ components/sso/trunk/cas/gatein-cas-portal/pom.xml components/sso/trunk/cas/pom.xml components/sso/trunk/josso/gatein-josso-plugin/ components/sso/trunk/josso/gatein-josso-plugin/pom.xml components/sso/trunk/josso/gatein-josso-portal/ components/sso/trunk/josso/gatein-josso-portal/pom.xml components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml components/sso/trunk/josso/pom.xml components/sso/trunk/opensso/gatein-opensso-plugin/ components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml components/sso/trunk/opensso/gatein-opensso-portal/ components/sso/trunk/opensso/gatein-opensso-portal/pom.xml components/sso/trunk/opensso/pom.xml components/sso/trunk/packaging/ components/sso/trunk/packaging/pom.xml components/sso/trunk/packaging/src/main/assembly/src.xml components/sso/trunk/packaging/src/main/resources/README components/sso/trunk/pom.xml Log: Cleanup Modified: components/sso/trunk/.classpath =================================================================== --- components/sso/trunk/.classpath 2010-02-11 10:50:37 UTC (rev 1631) +++ components/sso/trunk/.classpath 2010-02-11 12:28:04 UTC (rev 1632) @@ -1,57 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="agent/src/main/java"/> - <classpathentry kind="src" path="agent/src/test/java"/> - <classpathentry kind="src" path="auth-callback/src/main/java"/> - <classpathentry kind="src" path="auth-callback/src/test/java"/> - <classpathentry kind="src" path="gatein-cas-plugin/src/main/java"/> - <classpathentry kind="src" path="gatein-cas-plugin/src/test/java"/> - <classpathentry kind="src" path="gatein-josso-plugin/src/main/java"/> - <classpathentry kind="src" path="gatein-opensso-plugin/src/main/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="M2_REPO/org/jasig/cas/cas-server-core/3.3.4/cas-server-core-3.3.4.jar" sourcepath="M2_REPO/org/jasig/cas/cas-server-core/3.3.4/cas-server-core-3.3.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> - - <classpathentry kind="var" path="M2_REPO/javax/ws/rs/jsr311-api/1.0/jsr311-api-1.0.jar" sourcepath="M2_REPO/javax/ws/rs/jsr311-api/1.0/jsr311-api-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/picocontainer/picocontainer/1.1/picocontainer-1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/> - <classpathentry kind="var" path="M2_REPO/opensso/amserver/8.0/amserver-8.0.jar"/> - <classpathentry kind="var" path="M2_REPO/opensso/opensso/8.0/opensso-8.0.jar"/> - <classpathentry kind="var" path="M2_REPO/opensso/openssoclientsdk/8.0/openssoclientsdk-8.0.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jasig/cas/cas-client-core/3.1.9/cas-client-core-3.1.9.jar"/> - <classpathentry kind="var" path="M2_REPO/org/josso/josso-basic-authscheme/1.8.1/josso-basic-authscheme-1.8.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/josso/josso-agent/1.8.1/josso-agent-1.8.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/josso/josso-agent-shared/1.8.1/josso-agent-shared-1.8.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/josso/josso-common/1.8.1/josso-common-1.8.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/josso/josso-core/1.8.1/josso-core-1.8.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/josso/josso-protocol-client/1.8.1/josso-protocol-client-1.8.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/josso/josso-servlet-agent/1.8.1/josso-servlet-agent-1.8.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/josso/josso-ws/1.8.1/josso-ws-1.8.1.jar"/> - - <classpathentry kind="var" path="M2_REPO/org/exoplatform/core/exo.core.component.database/2.3.0-Beta02/exo.core.component.database-2.3.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/core/exo.core.component.database/2.3.0-Beta02/exo.core.component.database-2.3.0-Beta02-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/core/exo.core.component.document/2.3.0-Beta02/exo.core.component.document-2.3.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/core/exo.core.component.document/2.3.0-Beta02/exo.core.component.document-2.3.0-Beta02-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/core/exo.core.component.organization.api/2.3.0-Beta02/exo.core.component.organization.api-2.3.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/core/exo.core.component.organization.api/2.3.0-Beta02/exo.core.component.organization.api-2.3.0-Beta02-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/core/exo.core.component.script.groovy/2.3.0-Beta02/exo.core.component.script.groovy-2.3.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/core/exo.core.component.script.groovy/2.3.0-Beta02/exo.core.component.script.groovy-2.3.0-Beta02-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/core/exo.core.component.security.core/2.3.0-Beta02/exo.core.component.security.core-2.3.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/core/exo.core.component.security.core/2.3.0-Beta02/exo.core.component.security.core-2.3.0-Beta02-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/core/exo.core.component.xml-processing/2.3.0-Beta02/exo.core.component.xml-processing-2.3.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/core/exo.core.component.xml-processing/2.3.0-Beta02/exo.core.component.xml-processing-2.3.0-Beta02-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/jcr/exo.jcr.component.core/1.12.0-Beta02/exo.jcr.component.core-1.12.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/jcr/exo.jcr.component.core/1.12.0-Beta02/exo.jcr.component.core-1.12.0-Beta02-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/jcr/exo.jcr.component.ext/1.12.0-Beta02/exo.jcr.component.ext-1.12.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/jcr/exo.jcr.component.ext/1.12.0-Beta02/exo.jcr.component.ext-1.12.0-Beta02-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/kernel/exo.kernel.commons/2.2.0-Beta02/exo.kernel.commons-2.2.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/kernel/exo.kernel.commons/2.2.0-Beta02/exo.kernel.commons-2.2.0-Beta02-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/kernel/exo.kernel.component.cache/2.2.0-Beta02/exo.kernel.component.cache-2.2.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/kernel/exo.kernel.component.cache/2.2.0-Beta02/exo.kernel.component.cache-2.2.0-Beta02-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/kernel/exo.kernel.component.command/2.2.0-Beta02/exo.kernel.component.command-2.2.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/kernel/exo.kernel.component.command/2.2.0-Beta02/exo.kernel.component.command-2.2.0-Beta02-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/kernel/exo.kernel.component.common/2.2.0-Beta02/exo.kernel.component.common-2.2.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/kernel/exo.kernel.component.common/2.2.0-Beta02/exo.kernel.component.common-2.2.0-Beta02-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/kernel/exo.kernel.component.remote/2.2.0-Beta02/exo.kernel.component.remote-2.2.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/kernel/exo.kernel.component.remote/2.2.0-Beta02/exo.kernel.component.remote-2.2.0-Beta02-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/kernel/exo.kernel.container/2.2.0-Beta02/exo.kernel.container-2.2.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/kernel/exo.kernel.container/2.2.0-Beta02/exo.kernel.container-2.2.0-Beta02-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/portal/exo.portal.component.common/3.0.0-CR01-SNAPSHOT/exo.portal.component.common-3.0.0-CR01-SNAPSHOT.jar" sourcepath="M2_REPO/org/exoplatform/portal/exo.portal.component.common/3.0.0-CR01-SNAPSHOT/exo.portal.component.common-3.0.0-CR01-SNAPSHOT-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/portal/exo.portal.component.scripting/3.0.0-CR01-SNAPSHOT/exo.portal.component.scripting-3.0.0-CR01-SNAPSHOT.jar" sourcepath="M2_REPO/org/exoplatform/portal/exo.portal.component.scripting/3.0.0-CR01-SNAPSHOT/exo.portal.component.scripting-3.0.0-CR01-SNAPSHOT-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/portal/exo.portal.component.web/3.0.0-CR01-SNAPSHOT/exo.portal.component.web-3.0.0-CR01-SNAPSHOT.jar" sourcepath="M2_REPO/org/exoplatform/portal/exo.portal.component.web/3.0.0-CR01-SNAPSHOT/exo.portal.component.web-3.0.0-CR01-SNAPSHOT-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/portal/exo.portal.component.xml-parser/3.0.0-CR01-SNAPSHOT/exo.portal.component.xml-parser-3.0.0-CR01-SNAPSHOT.jar" sourcepath="M2_REPO/org/exoplatform/portal/exo.portal.component.xml-parser/3.0.0-CR01-SNAPSHOT/exo.portal.component.xml-parser-3.0.0-CR01-SNAPSHOT-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/tool/exo.tool.framework.junit/1.2.0/exo.tool.framework.junit-1.2.0.jar" sourcepath="M2_REPO/org/exoplatform/tool/exo.tool.framework.junit/1.2.0/exo.tool.framework.junit-1.2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/ws/exo.ws.commons/2.1.0-Beta02/exo.ws.commons-2.1.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/ws/exo.ws.commons/2.1.0-Beta02/exo.ws.commons-2.1.0-Beta02-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/ws/exo.ws.frameworks.json/2.1.0-Beta02/exo.ws.frameworks.json-2.1.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/ws/exo.ws.frameworks.json/2.1.0-Beta02/exo.ws.frameworks.json-2.1.0-Beta02-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/exoplatform/ws/exo.ws.rest.core/2.1.0-Beta02/exo.ws.rest.core-2.1.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/ws/exo.ws.rest.core/2.1.0-Beta02/exo.ws.rest.core-2.1.0-Beta02-sources.jar"/> - + <classpathentry kind="src" output="auth-callback/target/classes" path="auth-callback/src/main/java"/> + <classpathentry excluding="**" kind="src" output="auth-callback/target/classes" path="auth-callback/src/main/resources"/> + <classpathentry kind="src" output="auth-callback/target/test-classes" path="auth-callback/src/test/java"/> + <classpathentry excluding="**" kind="src" output="auth-callback/target/test-classes" path="auth-callback/src/test/resources"/> + <classpathentry kind="src" output="agent/target/classes" path="agent/src/main/java"/> + <classpathentry excluding="**" kind="src" output="agent/target/classes" path="agent/src/main/resources"/> + <classpathentry kind="src" output="agent/target/test-classes" path="agent/src/test/java"/> + <classpathentry excluding="**" kind="src" output="agent/target/test-classes" path="agent/src/test/resources"/> + <classpathentry kind="src" output="cas/gatein-cas-plugin/target/classes" path="cas/gatein-cas-plugin/src/main/java"/> + <classpathentry excluding="**" kind="src" output="cas/gatein-cas-plugin/target/classes" path="cas/gatein-cas-plugin/src/main/resources"/> + <classpathentry kind="src" output="cas/gatein-cas-plugin/target/test-classes" path="cas/gatein-cas-plugin/src/test/java"/> + <classpathentry excluding="**" kind="src" output="cas/gatein-cas-plugin/target/test-classes" path="cas/gatein-cas-plugin/src/test/resources"/> + <classpathentry excluding="**" kind="src" output="cas/gatein-cas-portal/target/classes" path="cas/gatein-cas-portal/src/main/resources"/> + <classpathentry excluding="**" kind="src" output="josso/gatein-josso-portal/target/classes" path="josso/gatein-josso-portal/src/main/resources"/> + <classpathentry kind="src" output="josso/gatein-josso-plugin/target/classes" path="josso/gatein-josso-plugin/src/main/java"/> + <classpathentry kind="src" output="opensso/gatein-opensso-plugin/target/classes" path="opensso/gatein-opensso-plugin/src/main/java"/> + <classpathentry excluding="**" kind="src" output="opensso/gatein-opensso-portal/target/classes" path="opensso/gatein-opensso-portal/src/main/resources"/> + <classpathentry excluding="**" kind="src" output="packaging/target/classes" path="packaging/src/main/resources"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: components/sso/trunk/.project =================================================================== --- components/sso/trunk/.project 2010-02-11 10:50:37 UTC (rev 1631) +++ components/sso/trunk/.project 2010-02-11 12:28:04 UTC (rev 1632) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>gatein-sso-trunk</name> + <name>sso_trunk</name> <comment></comment> <projects> </projects> @@ -10,8 +10,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.maven.ide.eclipse.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> </natures> </projectDescription> Added: components/sso/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- components/sso/trunk/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ components/sso/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-11 12:28:04 UTC (rev 1632) @@ -0,0 +1,5 @@ +#Thu Feb 11 12:21:29 CET 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.source=1.5 Property changes on: components/sso/trunk/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: components/sso/trunk/.settings/org.maven.ide.eclipse.prefs =================================================================== --- components/sso/trunk/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ components/sso/trunk/.settings/org.maven.ide.eclipse.prefs 2010-02-11 12:28:04 UTC (rev 1632) @@ -0,0 +1,9 @@ +#Thu Feb 11 12:21:40 CET 2010 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=true +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 Property changes on: components/sso/trunk/.settings/org.maven.ide.eclipse.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: components/sso/trunk/agent/pom.xml =================================================================== --- components/sso/trunk/agent/pom.xml 2010-02-11 10:50:37 UTC (rev 1631) +++ components/sso/trunk/agent/pom.xml 2010-02-11 12:28:04 UTC (rev 1632) @@ -1,214 +1,177 @@ <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 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.gatein.sso</groupId> - <artifactId>gatein-sso-parent</artifactId> - <relativePath>../pom.xml</relativePath> - <version>trunk-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>agent</artifactId> - <packaging>jar</packaging> - <name>Gatein SSO Agent</name> - - <properties> -  - <gatein.location>/home/soshah/projects/gatein/runtime/jboss/server/default</gatein.location> - </properties> - - <dependencies> - <dependency> - <groupId>org.gatein.sso</groupId> - <artifactId>auth-callback</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> - - <dependency> - <groupId>org.jasig.cas</groupId> - <artifactId>cas-client-core</artifactId> - </dependency> - - <dependency> - <groupId>org.josso</groupId> - <artifactId>josso-agent</artifactId> - </dependency> - <dependency> - <groupId>org.josso</groupId> - <artifactId>josso-servlet-agent</artifactId> - </dependency> - <dependency> - <groupId>org.josso</groupId> - <artifactId>josso-agent-shared</artifactId> - </dependency> - <dependency> - <groupId>org.josso</groupId> - <artifactId>josso-protocol-client</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.xbean</groupId> - <artifactId>maven-xbean-plugin</artifactId> - <version>${version.xbean}</version> - <executions> - <execution> - <configuration> - <namespace>urn:org:josso:agent:generic-servlet</namespace> - </configuration> - <goals> - <goal>mapping</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - -  - <profiles> - <profile> - <id>integration-tests</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  + <gatein.location>/home/soshah/projects/gatein/runtime/jboss/server/default</gatein.location> + </properties> + + <dependencies> + <dependency> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-auth-callback</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + </dependency> + + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </dependency> + + <dependency> + <groupId>org.jasig.cas</groupId> + <artifactId>cas-client-core</artifactId> + </dependency> + + <dependency> + <groupId>org.josso</groupId> + <artifactId>josso-agent</artifactId> + </dependency> + <dependency> + <groupId>org.josso</groupId> + <artifactId>josso-servlet-agent</artifactId> + </dependency> + <dependency> + <groupId>org.josso</groupId> + <artifactId>josso-agent-shared</artifactId> + </dependency> + <dependency> + <groupId>org.josso</groupId> + <artifactId>josso-protocol-client</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3.1</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.xbean</groupId> + <artifactId>maven-xbean-plugin</artifactId> + <version>${version.xbean}</version> + <executions> + <execution> + <configuration> + <namespace>urn:org:josso:agent:generic-servlet</namespace> + </configuration> + <goals> + <goal>mapping</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + +  + <profiles> + <profile> + <id>integration-tests</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3.1</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  -  - </profiles> +  + </profiles> </project> Modified: components/sso/trunk/auth-callback/pom.xml =================================================================== --- components/sso/trunk/auth-callback/pom.xml 2010-02-11 10:50:37 UTC (rev 1631) +++ components/sso/trunk/auth-callback/pom.xml 2010-02-11 12:28:04 UTC (rev 1632) @@ -1,34 +1,34 @@ <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 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.gatein.sso</groupId> - <artifactId>gatein-sso-parent</artifactId> - <relativePath>../pom.xml</relativePath> - <version>trunk-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>auth-callback</artifactId> - <packaging>jar</packaging> - <name>A RESTful call back service used by SSO servers to perform authentication against the Gatein instance</name> - - <properties> - </properties> - - <dependencies> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.rest.core</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.security.core</artifactId> - </dependency> - - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> - </dependency> - </dependencies> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-parent</artifactId> + <relativePath>../pom.xml</relativePath> + <version>trunk-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>sso-auth-callback</artifactId> + <packaging>jar</packaging> + <name>GateIn SSO - Authentication Callback</name> + <description>A RESTful call back service used by SSO servers to perform authentication against the Gatein instance</description> + <properties> + </properties> + + <dependencies> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + </dependency> + + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + </dependency> + </dependencies> </project> Property changes on: components/sso/trunk/cas/gatein-cas-plugin ___________________________________________________________________ Name: svn:ignore + target Modified: components/sso/trunk/cas/gatein-cas-plugin/pom.xml =================================================================== --- components/sso/trunk/cas/gatein-cas-plugin/pom.xml 2010-02-11 10:50:37 UTC (rev 1631) +++ components/sso/trunk/cas/gatein-cas-plugin/pom.xml 2010-02-11 12:28:04 UTC (rev 1632) @@ -1,61 +1,72 @@ <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 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.gatein.sso</groupId> - <artifactId>gatein-sso-parent</artifactId> - <relativePath>../pom.xml</relativePath> - <version>trunk-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>gatein-cas-plugin</artifactId> - <packaging>jar</packaging> - <name>Gatein Integration for CAS Single Sign On Framework</name> - - <properties> - </properties> - - <dependencies> - <dependency> - <groupId>org.jasig.cas</groupId> - <artifactId>cas-server-core</artifactId> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - -  - <profiles> - <profile> - <id>integration-tests</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-cas-parent</artifactId> + <relativePath>../pom.xml</relativePath> + <version>trunk-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>sso-cas-plugin</artifactId> + <packaging>jar</packaging> + <name>GateIn SSO - CAS Plugin</name> + + <properties> + </properties> + + <dependencies> + <dependency> + <groupId>org.jasig.cas</groupId> + <artifactId>cas-server-core</artifactId> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </dependency> + <dependency> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3.1</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + +  + <profiles> + <profile> + <id>integration-tests</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3.1</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Property changes on: components/sso/trunk/cas/gatein-cas-portal ___________________________________________________________________ Name: svn:ignore + target Modified: components/sso/trunk/cas/gatein-cas-portal/pom.xml =================================================================== --- components/sso/trunk/cas/gatein-cas-portal/pom.xml 2010-02-11 10:50:37 UTC (rev 1631) +++ components/sso/trunk/cas/gatein-cas-portal/pom.xml 2010-02-11 12:28:04 UTC (rev 1632) @@ -2,20 +2,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.sso</groupId> - <artifactId>cas-parent</artifactId> + <artifactId>sso-cas-parent</artifactId> <version>trunk-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>cas-pkg</artifactId> + <artifactId>sso-cas-pkg</artifactId> <packaging>pom</packaging> - <name>CAS Agent and Server Packages</name> + <name>GateIn SSO - CAS - Portal packaging</name> <dependencies> <dependency> <groupId>org.gatein.sso</groupId> - <artifactId>gatein-cas-plugin</artifactId> - <version>trunk-SNAPSHOT</version> + <artifactId>sso-cas-plugin</artifactId> + <version>trunk-SNAPSHOT</version> </dependency> <dependency> <groupId>commons-httpclient</groupId> @@ -33,16 +33,16 @@ <descriptor>src/main/assembly/src.xml</descriptor> </descriptors> </configuration> - <executions> - <execution> - <id>make-assembly</id>  - <phase>package</phase>  - <goals> - <goal>single</goal>  - </goals> - </execution> - </executions> - + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> Modified: components/sso/trunk/cas/pom.xml =================================================================== --- components/sso/trunk/cas/pom.xml 2010-02-11 10:50:37 UTC (rev 1631) +++ components/sso/trunk/cas/pom.xml 2010-02-11 12:28:04 UTC (rev 1632) @@ -1,34 +1,23 @@ <?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 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.gatein.sso</groupId> - <artifactId>cas-parent</artifactId> - <version>trunk-SNAPSHOT</version> - <packaging>pom</packaging> - - <parent> - <groupId>org.gatein.sso</groupId> - <artifactId>sso-parent</artifactId> - <version>trunk-SNAPSHOT</version> - </parent> - - - <name>Gatein - Single Sign On Integration (CAS)</name> - <description>GateIn Single Sign On Integration (CAS)</description> - - <modules> - <module>gatein-cas-plugin</module> - <module>gatein-cas-portal</module> - </modules> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-cas-parent</artifactId> + <version>trunk-SNAPSHOT</version> + <packaging>pom</packaging> + <parent> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-parent</artifactId> + <version>trunk-SNAPSHOT</version> + </parent> + + <name>GateIn SSO - CAS</name> + + <modules> + <module>gatein-cas-plugin</module> + <module>gatein-cas-portal</module> + </modules> + </project> Property changes on: components/sso/trunk/josso/gatein-josso-plugin ___________________________________________________________________ Name: svn:ignore + target Modified: components/sso/trunk/josso/gatein-josso-plugin/pom.xml =================================================================== --- components/sso/trunk/josso/gatein-josso-plugin/pom.xml 2010-02-11 10:50:37 UTC (rev 1631) +++ components/sso/trunk/josso/gatein-josso-plugin/pom.xml 2010-02-11 12:28:04 UTC (rev 1632) @@ -1,135 +1,95 @@ <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 http://maven.apache.org/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.sso</groupId> - <artifactId>josso-parent</artifactId> + <artifactId>sso-josso-parent</artifactId> <version>trunk-SNAPSHOT</version> </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>gatein-josso-plugin</artifactId> - <packaging>jar</packaging> - <name>Gatein Integration for JOSSO Single Sign On Framework</name> - - <properties> - </properties> - - <dependencies> - <dependency> - <groupId>org.josso</groupId> - <artifactId>josso-core</artifactId> - </dependency> - <dependency> - <groupId>org.josso</groupId> - <artifactId>josso-basic-authscheme</artifactId> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.xbean</groupId> - <artifactId>maven-xbean-plugin</artifactId> - <version>${version.xbean}</version> - <executions> - <execution> - <configuration> - <namespace>urn:org:gatein:sso:josso:plugin:gateinidentityplugin</namespace> - </configuration> - <goals> - <goal>mapping</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -  -  +  -  +  </project> Property changes on: components/sso/trunk/josso/gatein-josso-portal ___________________________________________________________________ Name: svn:ignore + target Modified: components/sso/trunk/josso/gatein-josso-portal/pom.xml =================================================================== --- components/sso/trunk/josso/gatein-josso-portal/pom.xml 2010-02-11 10:50:37 UTC (rev 1631) +++ components/sso/trunk/josso/gatein-josso-portal/pom.xml 2010-02-11 12:28:04 UTC (rev 1632) @@ -2,14 +2,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.sso</groupId> - <artifactId>josso-parent</artifactId> + <artifactId>sso-josso-parent</artifactId> <version>trunk-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>josso-pkg</artifactId> + <artifactId>sso-josso-pkg</artifactId> <packaging>pom</packaging> - <name>JOSSO Agent and Server Packages</name> + <name>GateIn SSO - JOSSO - Portal packaging</name> <dependencies> <dependency> @@ -52,6 +52,25 @@ <artifactId>xbean-spring</artifactId> <version>3.4.3</version> </dependency> + + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${version.commons-logging}</version> + </dependency> + <dependency> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-josso-plugin</artifactId> + <version>trunk-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> </dependencies> <build> Modified: components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml =================================================================== --- components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml 2010-02-11 10:50:37 UTC (rev 1631) +++ components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml 2010-02-11 12:28:04 UTC (rev 1632) @@ -1,27 +1,48 @@ <assembly> - <includeBaseDirectory>false</includeBaseDirectory> - <formats> - <format>dir</format> - - </formats> - - <fileSets> - <fileSet> - - <directory>src/main/resources</directory> - <outputDirectory></outputDirectory> - </fileSet> - </fileSets> - - <dependencySets> - - <dependencySet> - - <outputDirectory>gatein.ear/lib</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <useTransitiveDependencies>false</useTransitiveDependencies> - </dependencySet> - - </dependencySets> + <includeBaseDirectory>false</includeBaseDirectory> + <formats> + <format>dir</format> + </formats> + + <fileSets> + <fileSet> + + <directory>src/main/resources</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + + <dependencySets> + + <dependencySet> + <outputDirectory>gatein.ear/lib</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <includes> + <include>org.josso:josso-agents-bin</include> + <include>org.josso:josso-agent-shared</include> + <include>org.springframework:spring-beans</include> + <include>org.springframework:spring-context</include> + <include>org.springframework:spring-core</include> + <include>commons-discovery:commons-discovery</include> + <include>org.apache.axis:axis</include> + <include>org.apache.xbean:xbean-spring</include> + </includes> + </dependencySet> + + <dependencySet> + <outputDirectory>plugin/webapps/josso/WEB-INF/lib</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <includes> + <include>commons-httpclient:commons-httpclient</include> + <include>commons-logging:commons-logging</include> + <include>org.gatein.sso:sso-josso-plugin</include> + <include>apache-log4j:log4j</include> + </includes> + </dependencySet> + + </dependencySets> + </assembly> \ No newline at end of file Copied: components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/webapps/josso/WEB-INF (from rev 1629, components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/WEB-INF) Modified: components/sso/trunk/josso/pom.xml =================================================================== --- components/sso/trunk/josso/pom.xml 2010-02-11 10:50:37 UTC (rev 1631) +++ components/sso/trunk/josso/pom.xml 2010-02-11 12:28:04 UTC (rev 1632) @@ -1,34 +1,24 @@ <?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 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.gatein.sso</groupId> - <artifactId>josso-parent</artifactId> - <version>trunk-SNAPSHOT</version> - <packaging>pom</packaging> - - <parent> - <groupId>org.gatein.sso</groupId> - <artifactId>sso-parent</artifactId> - <version>trunk-SNAPSHOT</version> - </parent> - - - <name>Gatein - Single Sign On Integration (JOSSO)</name> - <description>GateIn Single Sign On Integration (JOSSO)</description> - - <modules> - <module>gatein-josso-portal</module> - <module>gatein-josso-plugin</module> - </modules> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-josso-parent</artifactId> + <version>trunk-SNAPSHOT</version> + <packaging>pom</packaging> + <parent> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-parent</artifactId> + <version>trunk-SNAPSHOT</version> + </parent> + + + <name>GateIn SSO - JOSSO</name> + + <modules> + <module>gatein-josso-portal</module> + <module>gatein-josso-plugin</module> + </modules> + </project> Property changes on: components/sso/trunk/opensso/gatein-opensso-plugin ___________________________________________________________________ Name: svn:ignore + target Modified: components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml =================================================================== --- components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml 2010-02-11 10:50:37 UTC (rev 1631) +++ components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml 2010-02-11 12:28:04 UTC (rev 1632) @@ -1,36 +1,36 @@ <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 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.gatein.sso</groupId> - <artifactId>gatein-sso-parent</artifactId> - <relativePath>../pom.xml</relativePath> - <version>trunk-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>gatein-opensso-plugin</artifactId> - <packaging>jar</packaging> - <name>Gatein Plugin for the OpenSSO Server</name> - - <properties> - </properties> - - <dependencies> - <dependency> - <groupId>opensso</groupId> - <artifactId>opensso</artifactId> - </dependency> - <dependency> - <groupId>opensso</groupId> - <artifactId>amserver</artifactId> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> - </dependencies> - - <build> - </build> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-opensso-parent</artifactId> + <relativePath>../pom.xml</relativePath> + <version>trunk-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>sso-opensso-plugin</artifactId> + <packaging>jar</packaging> + <name>GateIn SSO - OpenSSO Plugin</name> + + <properties> + </properties> + + <dependencies> + <dependency> + <groupId>opensso</groupId> + <artifactId>opensso</artifactId> + </dependency> + <dependency> + <groupId>opensso</groupId> + <artifactId>amserver</artifactId> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </dependency> + </dependencies> + + <build> + </build> </project> Property changes on: components/sso/trunk/opensso/gatein-opensso-portal ___________________________________________________________________ Name: svn:ignore + target Modified: components/sso/trunk/opensso/gatein-opensso-portal/pom.xml =================================================================== --- components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2010-02-11 10:50:37 UTC (rev 1631) +++ components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2010-02-11 12:28:04 UTC (rev 1632) @@ -2,19 +2,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.sso</groupId> - <artifactId>opensso-parent</artifactId> + <artifactId>sso-opensso-parent</artifactId> <version>trunk-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>opensso-pkg</artifactId> + <artifactId>sso-opensso-pkg</artifactId> <packaging>pom</packaging> - <name>OpenSSO Agent and Server Packages</name> + <name>GateIn SSO - OpenSSO - Portal packaging</name> <dependencies> <dependency> <groupId>org.gatein.sso</groupId> - <artifactId>gatein-opensso-plugin</artifactId> + <artifactId>sso-opensso-plugin</artifactId> <version>trunk-SNAPSHOT</version> </dependency> <dependency> Modified: components/sso/trunk/opensso/pom.xml =================================================================== --- components/sso/trunk/opensso/pom.xml 2010-02-11 10:50:37 UTC (rev 1631) +++ components/sso/trunk/opensso/pom.xml 2010-02-11 12:28:04 UTC (rev 1632) @@ -1,34 +1,24 @@ <?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 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.gatein.sso</groupId> - <artifactId>opensso-parent</artifactId> - <version>trunk-SNAPSHOT</version> - <packaging>pom</packaging> - - <parent> - <groupId>org.gatein.sso</groupId> - <artifactId>sso-parent</artifactId> - <version>trunk-SNAPSHOT</version> - </parent> - - - <name>Gatein - Single Sign On Integration (OpenSSO)</name> - <description>GateIn Single Sign On Integration (OpenSSO)</description> - - <modules> - <module>gatein-opensso-plugin</module> - <module>gatein-opensso-portal</module> - </modules> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-opensso-parent</artifactId> + <version>trunk-SNAPSHOT</version> + <packaging>pom</packaging> + <parent> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-parent</artifactId> + <version>trunk-SNAPSHOT</version> + </parent> + + + <name>GateIn SSO - OpenSSO</name> + + <modules> + <module>gatein-opensso-plugin</module> + <module>gatein-opensso-portal</module> + </modules> + </project> Property changes on: components/sso/trunk/packaging ___________________________________________________________________ Name: svn:ignore + target Modified: components/sso/trunk/packaging/pom.xml =================================================================== --- components/sso/trunk/packaging/pom.xml 2010-02-11 10:50:37 UTC (rev 1631) +++ components/sso/trunk/packaging/pom.xml 2010-02-11 12:28:04 UTC (rev 1632) @@ -1,17 +1,17 @@ <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 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.gatein.sso</groupId> - <artifactId>sso-parent</artifactId> - <version>trunk-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>packaging</artifactId> - <packaging>pom</packaging> - <name>Used for packaging deployable artifacts</name> - - <build> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-parent</artifactId> + <version>trunk-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>sso-packaging</artifactId> + <packaging>pom</packaging> + <name>GateIn SSO - Packaging</name> + + <build> <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> @@ -21,15 +21,15 @@ <descriptor>src/main/assembly/src.xml</descriptor> </descriptors> </configuration> - <executions> - <execution> - <id>make-assembly</id>  - <phase>package</phase>  - <goals> - <goal>single</goal>  - </goals> - </execution> - </executions> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> </plugin> </plugins> </build> Modified: components/sso/trunk/packaging/src/main/assembly/src.xml =================================================================== --- components/sso/trunk/packaging/src/main/assembly/src.xml 2010-02-11 10:50:37 UTC (rev 1631) +++ components/sso/trunk/packaging/src/main/assembly/src.xml 2010-02-11 12:28:04 UTC (rev 1632) @@ -8,13 +8,21 @@ <fileSets> <fileSet> - <directory>../cas/gatein-cas-portal/target/cas-pkg-trunk-SNAPSHOT/</directory> - <outputDirectory>sso/cas</outputDirectory> + <directory>../cas/gatein-cas-portal/target/sso-cas-pkg-trunk-SNAPSHOT/</directory> + <outputDirectory>gatein-sso-${version}/cas</outputDirectory> </fileSet> <fileSet> - <directory>../josso/gatein-josso-portal/target/josso-pkg-trunk-SNAPSHOT/</directory> - <outputDirectory>sso/josso</outputDirectory> + <directory>../josso/gatein-josso-portal/target/sso-josso-pkg-trunk-SNAPSHOT/</directory> + <outputDirectory>gatein-sso-${version}/josso</outputDirectory> </fileSet> + <fileSet> + <directory>../opensso/gatein-opensso-portal/target/sso-opensso-pkg-trunk-SNAPSHOT/</directory> + <outputDirectory>gatein-sso-${version}/opensso</outputDirectory> + </fileSet> + <fileSet> + <directory>src/main/resources/</directory> + <outputDirectory>gatein-sso-${version}</outputDirectory> + </fileSet> </fileSets>  +  <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 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.gatein.sso</groupId> - <artifactId>gatein-sso-parent</artifactId> - <version>trunk-SNAPSHOT</version> - <packaging>pom</packaging> - - <parent> - <groupId>org.gatein</groupId> - <artifactId>gatein-parent</artifactId> - <version>1.0.0-Beta04</version> - </parent> - - - <name>Gatein - Single Sign On Integration</name> - <description>GateIn Single Sign On Integration</description> - - <modules> - <module>agent</module> - <module>auth-callback</module> - <module>gatein-cas-plugin</module> - <module>gatein-josso-plugin</module> - <module>gatein-opensso-plugin</module> - <module>packaging</module> - </modules> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-parent</artifactId> + <version>trunk-SNAPSHOT</version> + <packaging>pom</packaging> - <properties> - <version.junit>3.8.1</version.junit> - -  - <version.commons-httpclient>3.1</version.commons-httpclient> - -  - <version.log4j>1.2.14</version.log4j> - <version.jboss.logging>2.0.2.GA</version.jboss.logging> - <version.apache.logging>1.0.4-jboss</version.apache.logging> - <version.commons-logging>1.0.4</version.commons-logging> - -  - <version.cas>3.3.4</version.cas> - <version.cas.client>3.1.9</version.cas.client> - -  - <version.josso>1.8.1</version.josso> - -  - <version.xbean>3.4.3</version.xbean> - -  - <version.opensso>8.0</version.opensso> - -  - <org.exoplatform.core.version>2.3.0-Beta02</org.exoplatform.core.version> - <org.exoplatform.ws.version>2.1.0-Beta02</org.exoplatform.ws.version> - <org.exoplatform.portal.version>3.0.0-Beta03</org.exoplatform.portal.version> - -  - <version.javax.ws.rs>1.0</version.javax.ws.rs> - -  - <version.servlet-api>2.5</version.servlet-api> - </properties> - - <dependencyManagement> - <dependencies> -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${version.junit}</version> - </dependency> - -  - <dependency> - <groupId>org.jasig.cas</groupId> - <artifactId>cas-server-core</artifactId> - <version>${version.cas}</version> - </dependency> - <dependency> - <groupId>org.jasig.cas</groupId> - <artifactId>cas-client-core</artifactId> - <version>${version.cas.client}</version> - </dependency> - -  - <dependency> - <groupId>opensso</groupId> - <artifactId>opensso</artifactId> - <version>${version.opensso}</version> - </dependency> - <dependency> - <groupId>opensso</groupId> - <artifactId>amserver</artifactId> - <version>${version.opensso}</version> - </dependency> - -  - <dependency> - <groupId>org.josso</groupId> - <artifactId>josso-core</artifactId> - <version>${version.josso}</version> - </dependency> - <dependency> - <groupId>org.josso</groupId> - <artifactId>josso-basic-authscheme</artifactId> - <version>${version.josso}</version> - </dependency> - <dependency> - <groupId>org.josso</groupId> - <artifactId>josso-agent</artifactId> - <version>${version.josso}</version> - </dependency> - <dependency> - <groupId>org.josso</groupId> - <artifactId>josso-agent-shared</artifactId> - <version>${version.josso}</version> - </dependency> - <dependency> - <groupId>org.josso</groupId> - <artifactId>josso-servlet-agent</artifactId> - <version>${version.josso}</version> - </dependency> - <dependency> - <groupId>org.josso</groupId> - <artifactId>josso-protocol-client</artifactId> - <version>${version.josso}</version> - </dependency> - <dependency> - <groupId>org.josso</groupId> - <artifactId>josso-common</artifactId> - <version>${version.josso}</version> - </dependency> - - <dependency> - <groupId>org.apache.xbean</groupId> - <artifactId>xbean-spring</artifactId> - <version>${version.xbean}</version> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> - </exclusion> - </exclusions> - </dependency> - -  - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - <version>${version.log4j}</version> - </dependency> - -  - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>${version.commons-httpclient}</version> - </dependency> - -  - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> - <version>${version.javax.ws.rs}</version> - </dependency> - -  - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.rest.core</artifactId> - <version>${org.exoplatform.ws.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.security.core</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web</artifactId> - <version>${org.exoplatform.portal.version}</version> - </dependency> - - -  - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${version.servlet-api}</version> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + <parent> + <groupId>org.gatein</groupId> + <artifactId>gatein-parent</artifactId> + <version>1.0.0-Beta04</version> + </parent> - <repositories> - <repository> - <id>repository.jboss.org</id> - <name>JBoss Repository</name> - <layout>default</layout> - <url>http://repository.jboss.org/maven2/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - - <repository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshots Repository</name> - <layout>default</layout> - <url>http://snapshots.jboss.org/maven2/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - - <repository> - <id>josso-m2-repo</id> - <name>JOSSO Maven2 Repository</name> - <url>http://repository.josso.org</url> - <releases> - <checksumPolicy>fail</checksumPolicy> - <enabled>true</enabled> - </releases> - <snapshots> - <checksumPolicy>fail</checksumPolicy> - <enabled>false</enabled> - </snapshots> - </repository> - - <repository> - <id>exo-int</id> - <url>http://maven2.exoplatform.org/rest/maven2</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> + <name>GateIn SSO</name> + <description>GateIn Single Sign On Integration</description> + <modules> + <module>agent</module> + <module>auth-callback</module> + <module>cas</module> + <module>josso</module> +  + <module>opensso</module> + <module>packaging</module> + </modules> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> + <properties> + <version.junit>3.8.1</version.junit> - <pluginRepositories> - <pluginRepository> - <id>java.net maven repository</id> - <url>http://download.java.net/maven/2/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> +  + <version.commons-httpclient>3.1</version.commons-httpclient> + +  + <version.log4j>1.2.14</version.log4j> + <version.jboss.logging>2.0.2.GA</version.jboss.logging> + <version.apache.logging>1.0.4-jboss</version.apache.logging> + <version.commons-logging>1.0.4</version.commons-logging> + +  + <version.cas>3.3.4</version.cas> + <version.cas.client>3.1.9</version.cas.client> + +  + <version.josso>1.8.1</version.josso> + +  + <version.xbean>3.4.3</version.xbean> + +  + <version.opensso>8.0</version.opensso> + +  + <org.exoplatform.core.version>2.3.0-Beta02</org.exoplatform.core.version> + <org.exoplatform.ws.version>2.1.0-Beta02</org.exoplatform.ws.version> + <org.exoplatform.portal.version>3.0.0-Beta03</org.exoplatform.portal.version> + +  + <version.javax.ws.rs>1.0</version.javax.ws.rs> + +  + <version.servlet-api>2.5</version.servlet-api> + </properties> + + <dependencyManagement> + <dependencies> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${version.junit}</version> + </dependency> + +  + <dependency> + <groupId>org.jasig.cas</groupId> + <artifactId>cas-server-core</artifactId> + <version>${version.cas}</version> + </dependency> + <dependency> + <groupId>org.jasig.cas</groupId> + <artifactId>cas-client-core</artifactId> + <version>${version.cas.client}</version> + </dependency> + +  + <dependency> + <groupId>opensso</groupId> + <artifactId>opensso</artifactId> + <version>${version.opensso}</version> + </dependency> + <dependency> + <groupId>opensso</groupId> + <artifactId>amserver</artifactId> + <version>${version.opensso}</version> + </dependency> + +  + <dependency> + <groupId>org.josso</groupId> + <artifactId>josso-core</artifactId> + <version>${version.josso}</version> + </dependency> + <dependency> + <groupId>org.josso</groupId> + <artifactId>josso-basic-authscheme</artifactId> + <version>${version.josso}</version> + </dependency> + <dependency> + <groupId>org.josso</groupId> + <artifactId>josso-agent</artifactId> + <version>${version.josso}</version> + </dependency> + <dependency> + <groupId>org.josso</groupId> + <artifactId>josso-agent-shared</artifactId> + <version>${version.josso}</version> + </dependency> + <dependency> + <groupId>org.josso</groupId> + <artifactId>josso-servlet-agent</artifactId> + <version>${version.josso}</version> + </dependency> + <dependency> + <groupId>org.josso</groupId> + <artifactId>josso-protocol-client</artifactId> + <version>${version.josso}</version> + </dependency> + <dependency> + <groupId>org.josso</groupId> + <artifactId>josso-common</artifactId> + <version>${version.josso}</version> + </dependency> + + <dependency> + <groupId>org.apache.xbean</groupId> + <artifactId>xbean-spring</artifactId> + <version>${version.xbean}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring</artifactId> + </exclusion> + </exclusions> + </dependency> + +  + <dependency> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + <version>${version.log4j}</version> + </dependency> + +  + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>${version.commons-httpclient}</version> + </dependency> + +  + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + <version>${version.javax.ws.rs}</version> + </dependency> + +  + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.core</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web</artifactId> + <version>${org.exoplatform.portal.version}</version> + </dependency> + + +  + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${version.servlet-api}</version> + </dependency> + </dependencies> + </dependencyManagement> + + <repositories> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Repository</name> + <layout>default</layout> + <url>http://repository.jboss.org/maven2/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + + <repository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshots Repository</name> + <layout>default</layout> + <url>http://snapshots.jboss.org/maven2/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + + <repository> + <id>josso-m2-repo</id> + <name>JOSSO Maven2 Repository</name> + <url>http://repository.josso.org</url> + <releases> + <checksumPolicy>fail</checksumPolicy> + <enabled>true</enabled> + </releases> + <snapshots> + <checksumPolicy>fail</checksumPolicy> + <enabled>false</enabled> + </snapshots> + </repository> + + <repository> + <id>exo-int</id> + <url>http://maven2.exoplatform.org/rest/maven2</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + + <pluginRepositories> + <pluginRepository> + <id>java.net maven repository</id> + <url>http://download.java.net/maven/2/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> </project>

14 years, 11 months

1
0
0 / 0

gatein SVN: r1631 - in components/wsrp/trunk/admin-gui/src/main: webapp/WEB-INF and 7 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-02-11 05:50:37 -0500 (Thu, 11 Feb 2010) New Revision: 1631 Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ManagedBean.java components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/faces-config.xml components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandLink.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/error.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/management/management.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml Log: - Added support for WS timeout in Consumer configuration. - Fixed webui:commandButton so that it properly honors rendered attribute and use it where possible. - Added ConsumerBean.confirmEraseRegistration() to be able to use webui:commandButton as it doesn't seem possible to pass an outcome to commandLink in facelets components. - Added support for specifying a default action (called cancel) on ManagedBeans to allow abandonning current operation and redisplaying current page. - Set cancelOutcome property in faces-config.xml for ManagedBeans. - Use cancel action in confirmation dialogs. - Removed unused title template param. Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java =================================================================== --- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2010-02-11 10:49:16 UTC (rev 1630) +++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2010-02-11 10:50:37 UTC (rev 1631) @@ -140,6 +140,16 @@ getProducerInfo().setExpirationCacheSeconds((Integer)modifyIfNeeded(getCache(), cache, "cache", false)); } + public Integer getTimeout() + { + return getProducerInfo().getEndpointConfigurationInfo().getWSOperationTimeOut(); + } + + public void setTimeout(Integer timeout) + { + getProducerInfo().getEndpointConfigurationInfo().setWSOperationTimeOut((Integer)modifyIfNeeded(getTimeout(), timeout, "timeout", false)); + } + public String getWsdl() { return wsdl; @@ -294,6 +304,11 @@ return internalUpdate(true); } + public String confirmEraseRegistration() + { + return "confirmEraseRegistration"; + } + private String internalUpdate(boolean showMessage) { if (consumer != null) Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ManagedBean.java =================================================================== --- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ManagedBean.java 2010-02-11 10:49:16 UTC (rev 1630) +++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ManagedBean.java 2010-02-11 10:50:37 UTC (rev 1631) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2009, Red Hat Middleware, LLC, and individual + * Copyright 2010, Red Hat Middleware, LLC, and individual * contributors as indicated by the @authors tag. See the * copyright.txt in the distribution for a full listing of * individual contributors. @@ -39,6 +39,9 @@ protected Logger log = Logger.getLogger(getClass()); protected BeanContext beanContext; + + private String cancelOutcome; + public static final String INVALID_NAME = "INVALID_NAME_ERROR"; public static final String INVALID_PATH = "INVALID_PATH_ERROR"; public static final String DUPLICATE = "DUPLICATE_ERROR"; @@ -70,6 +73,11 @@ this.beanContext = beanContext; } + public void setCancelOutcome(String cancelOutcome) + { + this.cancelOutcome = cancelOutcome; + } + public String checkNameValidity(String name, String targetForErrorMessage) { return checkNameValidity(name, targetForErrorMessage, validator); @@ -237,4 +245,13 @@ return ParameterValidation.XSS_CHECK; } } + + /** + * Default action: returns to outcome specified by {@link #setCancelOutcome(String)} + * @return + */ + public String cancel() + { + return cancelOutcome; + } } Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties 2010-02-11 10:49:16 UTC (rev 1630) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties 2010-02-11 10:50:37 UTC (rev 1631) @@ -80,6 +80,8 @@ edit_consumer_producer = Producer id: edit_consumer_cache = Cache expiration: edit_consumer_cache_seconds = (seconds before expiration) +edit_consumer_timeout = Timeout for WS operations: +edit_consumer_timeout_milliseconds = (milliseconds before timeout) edit_consumer_endpoint = Endpoint configuration: edit_consumer_registration = Registration information: edit_consumer_registration_current = Current registration information: Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties 2010-02-11 10:49:16 UTC (rev 1630) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties 2010-02-11 10:50:37 UTC (rev 1631) @@ -143,4 +143,6 @@ consumers_table_reload=Recharger consommateurs CONSUMER_TYPE=Consommateur DUPLICATE_ERROR=Un {1} nomm\u00e9 ''{0}'' existe d\u00e9j\u00e0! -INVALID_NAME_ERROR=''{0}'' est un nom invalide pour un {1} : Ne peut pas \u00eatre null, vide ou contenir '/', '.', '\\', '<', '>', '(', ')', '=' ou '%5c' \ No newline at end of file +INVALID_NAME_ERROR=''{0}'' est un nom invalide pour un {1} : Ne peut pas \u00eatre null, vide ou contenir '/', '.', '\\', '<', '>', '(', ')', '=' ou '%5c' +edit_consumer_timeout=Timeout des op�rations WS: +edit_consumer_timeout_milliseconds=(millisecondes avant timeout) \ No newline at end of file Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/faces-config.xml 2010-02-11 10:49:16 UTC (rev 1630) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/faces-config.xml 2010-02-11 10:50:37 UTC (rev 1631) @@ -69,6 +69,10 @@ <property-class>org.gatein.wsrp.admin.ui.BeanContext</property-class> <value>#{beanContext}</value> </managed-property> + <managed-property> + <property-name>cancelOutcome</property-name> + <value>consumers</value> + </managed-property> </managed-bean> <managed-bean> <managed-bean-name>consumer</managed-bean-name> @@ -92,6 +96,10 @@ <property-name>manager</property-name> <value>#{consumersMgr}</value> </managed-property> + <managed-property> + <property-name>cancelOutcome</property-name> + <value>configureConsumer</value> + </managed-property> </managed-bean> <managed-bean> <managed-bean-name>producer</managed-bean-name> @@ -107,6 +115,10 @@ <property-class>org.gatein.wsrp.admin.ui.BeanContext</property-class> <value>#{beanContext}</value> </managed-property> + <managed-property> + <property-name>cancelOutcome</property-name> + <value>producer</value> + </managed-property> </managed-bean> <managed-bean> <managed-bean-name>resource</managed-bean-name> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml 2010-02-11 10:49:16 UTC (rev 1630) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml 2010-02-11 10:50:37 UTC (rev 1631) @@ -22,26 +22,38 @@ --> <ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:c="http://java.sun.com/jstl/core"> + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:c="http://java.sun.com/jstl/core"> -<table class="ActionContainer"> - <tr> - <td> + <table class="ActionContainer"> + <tr> + <td> <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandLink id="#{id}" action="#{backingBean[action]}" - value="#{value}" immediate="#{immediate}"> - <ui:insert/> - </h:commandLink> - </div> - </div> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <c:choose> + <c:when test="#{!empty rendered}"> +  + <c:set var="renderedVar" value="#{backingBean[rendered]}" scope="request"/> + <h:commandLink id="#{id}" action="#{backingBean[action]}" value="#{value}" + rendered="#{empty renderedVar ? '' : renderedVar}" + immediate="#{immediate}"> + <ui:insert/> + </h:commandLink> + </c:when> + <c:otherwise> + <h:commandLink id="#{id}" action="#{backingBean[action]}" value="#{value}" + immediate="#{immediate}"> + <ui:insert/> + </h:commandLink> + </c:otherwise></c:choose> + </div> + </div> </div> - </td> - </tr> -</table> + </td> + </tr> + </table> </ui:composition> \ No newline at end of file Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandLink.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandLink.xhtml 2010-02-11 10:49:16 UTC (rev 1630) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandLink.xhtml 2010-02-11 10:50:37 UTC (rev 1631) @@ -33,8 +33,7 @@ <div class="ButtonLeft"> <div class="ButtonRight"> <div class="ButtonMiddle"> - <h:commandLink id="#{id}" action="#{actionString}" - value="#{value}" immediate="#{immediate}"/> + <h:commandLink id="#{id}" action="#{actionString}" value="#{value}" title="#{title}" immediate="#{immediate}"/> </div> </div> </div> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml 2010-02-11 10:49:16 UTC (rev 1630) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml 2010-02-11 10:50:37 UTC (rev 1631) @@ -49,13 +49,6 @@ <ui:insert name="objectpath"/> <div class="wsrp-content-container"> - <ui:remove> - <c:if test="#{!empty title}"> - <h3>${title}</h3> - </c:if> - </ui:remove> - -  <ui:insert name="content">Content</ui:insert> </div> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml 2010-02-11 10:49:16 UTC (rev 1630) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml 2010-02-11 10:50:37 UTC (rev 1631) @@ -1,6 +1,6 @@ <!-- ~ JBoss, a division of Red Hat - ~ Copyright 2009, Red Hat Middleware, LLC, and individual + ~ Copyright 2010, Red Hat Middleware, LLC, and individual ~ contributors as indicated by the @authors tag. See the ~ copyright.txt in the distribution for a full listing of ~ individual contributors. @@ -54,24 +54,12 @@ <h:form id="confirm-erase-form"> <webui:commandButton id="submit" value="#{i18n.confirm_delete_registration_submit}" - action="eraseLocalRegistration" - backingBean="#{consumer}"/> + action="eraseLocalRegistration" + backingBean="#{consumer}"/> - <table class="ActionContainer"> - <tr> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandLink id="cancel" action="configureConsumer" - value="#{i18n.confirm_delete_registration_cancel}"/> - </div> - </div> - </div> - </td> - </tr> - </table> - + <webui:commandButton id="cancel" value="#{i18n.confirm_delete_registration_cancel}" + backingBean="#{consumer}" + action="cancel"/> </h:form> </div> </div> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-02-11 10:49:16 UTC (rev 1630) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-02-11 10:50:37 UTC (rev 1631) @@ -1,6 +1,6 @@ <!-- ~ JBoss, a division of Red Hat - ~ Copyright 2009, Red Hat Middleware, LLC, and individual + ~ Copyright 2010, Red Hat Middleware, LLC, and individual ~ contributors as indicated by the @authors tag. See the ~ copyright.txt in the distribution for a full listing of ~ individual contributors. @@ -27,8 +27,6 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core" xmlns:webui="http://jboss.org/gatein"> - - <ui:param name="title" value="#{i18n.consumers_title}"/> <ui:param name="showAddConsumer" value="true"/> <ui:define name="content"> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-02-11 10:49:16 UTC (rev 1630) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-02-11 10:50:37 UTC (rev 1631) @@ -27,7 +27,6 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core" xmlns:webui="http://jboss.org/gatein"> - <ui:param name="title" value=""/> <ui:define name="content"> @@ -51,6 +50,14 @@ </td> </tr> <tr> + <th>#{i18n.edit_consumer_timeout}</th> + <td> + <h:inputText id="timeout" value="#{consumer.timeout}"/> + #{i18n.edit_consumer_timeout_milliseconds} + <h:message styleClass="portlet-msg-error" for="timeout"/> + </td> + </tr> + <tr> <th>#{i18n.edit_consumer_endpoint}</th> <td> <h:inputText id="wsdl" size="70" value="#{consumer.wsdl}"/> @@ -95,23 +102,23 @@ </h:dataTable> - <webui:commandButton action="update" - backingBean="#{consumer}" - id="cons-update-link" - value="#{i18n.edit_consumer_registration_update_props}" - rendered="#{consumer.registered}"/> + <webui:commandButton action="update" + backingBean="#{consumer}" + id="cons-update-link" + value="#{i18n.edit_consumer_registration_update_props}" + rendered="registered"/> </c:when> <c:otherwise> #{i18n.edit_consumer_registration_no_props} </c:otherwise> </c:choose> - <webui:commandButton action="modifyRegistration" - backingBean="#{consumer}" - id="modify-reg-link" - rendered="#{consumer.registrationLocallyModified}" - value="#{i18n.edit_consumer_registration_modify}" - title="#{i18n.edit_consumer_registration_modify_title}"/> - + <webui:commandButton action="modifyRegistration" + backingBean="#{consumer}" + id="modify-reg-link" + rendered="registrationLocallyModified" + value="#{i18n.edit_consumer_registration_modify}" + title="#{i18n.edit_consumer_registration_modify_title}"/> + <br style="clear:both;"/> </h:panelGroup> @@ -151,11 +158,11 @@ </c:otherwise> </c:choose> - <webui:commandButton action="modifyRegistration" - backingBean="#{consumer}" - id="edit-reg-link" - value="#{i18n.edit_consumer_registration_modify}" - title="#{i18n.edit_consumer_registration_modify_title}"/> + <webui:commandButton action="modifyRegistration" + backingBean="#{consumer}" + id="edit-reg-link" + value="#{i18n.edit_consumer_registration_modify}" + title="#{i18n.edit_consumer_registration_modify_title}"/> <br style="clear:both;"/> </h:panelGroup> @@ -172,25 +179,12 @@ <th>#{i18n.edit_consumer_registration_context}</th> <td id="handle"> #{i18n.edit_consumer_registration_context_handle} - <h:outputText - value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/> + <h:outputText value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/> - <table class="ActionContainer"> - <tr> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandLink action="confirmEraseRegistration" - id="erase-cons-link" - value="#{i18n.edit_consumer_registration_context_erase}" - title="#{i18n.edit_consumer_registration_context_erase_title}"/> - </div> - </div> - </div> - </td> - </tr> - </table> + <webui:commandButton id="erase-cons-link" action="confirmEraseRegistration" + backingBean="#{consumer}" + value="#{i18n.edit_consumer_registration_context_erase}" + title="#{i18n.edit_consumer_registration_context_erase_title}"/> </td> </tr> @@ -199,28 +193,14 @@ <tr> <th/> <td class="portlet-section-buttonrow"> - <webui:commandButton action="refreshConsumer" - backingBean="#{consumer}" - id="refresh-cons-link" - value="#{i18n.edit_consumer_refresh}" - title="#{i18n.edit_consumer_refresh_title}"/> + <webui:commandButton action="refreshConsumer" + backingBean="#{consumer}" + id="refresh-cons-link" + value="#{i18n.edit_consumer_refresh}" + title="#{i18n.edit_consumer_refresh_title}"/> - <table class="ActionContainer"> - <tr> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandLink id="list-cons-link-two" action="#{consumersMgr.listConsumers}" - value="#{i18n.edit_consumer_cancel}"> - </h:commandLink> - </div> - </div> - </div> - </td> - </tr> - </table> - + <webui:commandButton id="list-cons-link-two" action="listConsumers" backingBean="#{consumersMgr}" + value="#{i18n.edit_consumer_cancel}"/> </td> </tr> </table> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/error.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/error.xhtml 2010-02-11 10:49:16 UTC (rev 1630) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/error.xhtml 2010-02-11 10:50:37 UTC (rev 1631) @@ -1,6 +1,6 @@ <!-- ~ JBoss, a division of Red Hat - ~ Copyright 2009, Red Hat Middleware, LLC, and individual + ~ Copyright 2010, Red Hat Middleware, LLC, and individual ~ contributors as indicated by the @authors tag. See the ~ copyright.txt in the distribution for a full listing of ~ individual contributors. @@ -9,7 +9,7 @@ ~ under the terms of the GNU Lesser General Public License as ~ published by the Free Software Foundation; either version 2.1 of ~ the License, or (at your option) any later version. - ~ + ~ ~ This software is distributed in the hope that it will be useful, ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -27,9 +27,6 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core" xmlns:webui="http://jboss.org/gatein"> - - <ui:param name="title" value="Error"/> - <ui:define name="content"> An Error Has Occured. </ui:define> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/management/management.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/management/management.xhtml 2010-02-11 10:49:16 UTC (rev 1630) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/management/management.xhtml 2010-02-11 10:50:37 UTC (rev 1631) @@ -1,6 +1,6 @@ <!-- ~ JBoss, a division of Red Hat - ~ Copyright 2009, Red Hat Middleware, LLC, and individual + ~ Copyright 2010, Red Hat Middleware, LLC, and individual ~ contributors as indicated by the @authors tag. See the ~ copyright.txt in the distribution for a full listing of ~ individual contributors. @@ -27,8 +27,6 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> - <ui:param name="title" value="Producer Management"/> - <ui:define name="content"> <p>Feature not quite ready yet! Check again in future versions of Portal.</p> </ui:define> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml 2010-02-11 10:49:16 UTC (rev 1630) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml 2010-02-11 10:50:37 UTC (rev 1631) @@ -1,6 +1,6 @@ <!-- ~ JBoss, a division of Red Hat - ~ Copyright 2009, Red Hat Middleware, LLC, and individual + ~ Copyright 2010, Red Hat Middleware, LLC, and individual ~ contributors as indicated by the @authors tag. See the ~ copyright.txt in the distribution for a full listing of ~ individual contributors. @@ -53,24 +53,12 @@ <h:form id="confirm-prop-del-form"> <webui:commandButton id="confirm-delete" value="#{i18n.confirm_delete_reg_property_submit}" - action="deleteRegistrationProperty" - backingBean="#{producer}"/> + action="deleteRegistrationProperty" + backingBean="#{producer}"/> - <table class="ActionContainer"> - <tr> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandLink id="cancel-delete" value="#{i18n.confirm_delete_reg_property_cancel}" - action="producer"/> - </div> - </div> - </div> - </td> - </tr> - </table> - + <webui:commandButton id="cancel-delete" value="#{i18n.confirm_delete_reg_property_cancel}" + backingBean="#{producer}" + action="cancel"/> </h:form> </div> </div>

14 years, 11 months

1
0
0 / 0

gatein SVN: r1630 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2010-02-11 05:49:16 -0500 (Thu, 11 Feb 2010) New Revision: 1630 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java Log: Fix error while adding portlet to a page Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-02-11 10:21:09 UTC (rev 1629) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-02-11 10:49:16 UTC (rev 1630) @@ -649,10 +649,12 @@ dataService.save(page); uiToolPanel.setUIComponent(null); + uiPage.getChildren().clear(); PortalDataMapper.toUIPage(uiPage, page); // Update UIPage cache on UIPortal uiPortal.setUIPage(pageId, uiPage); - + uiPortal.refreshUIPage(); + if (PortalProperties.SESSION_ALWAYS.equals(uiPortal.getSessionAlive())) { uiPortalApp.setSessionOpen(true);

14 years, 11 months

1
0
0 / 0

gatein SVN: r1629 - in components/sso/trunk: cas and 93 other directories.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-02-11 05:21:09 -0500 (Thu, 11 Feb 2010) New Revision: 1629 Added: components/sso/trunk/cas/ components/sso/trunk/cas/gatein-cas-plugin/ components/sso/trunk/cas/gatein-cas-plugin/pom.xml components/sso/trunk/cas/gatein-cas-plugin/src/ components/sso/trunk/cas/gatein-cas-plugin/src/main/ components/sso/trunk/cas/gatein-cas-plugin/src/main/java/ components/sso/trunk/cas/gatein-cas-plugin/src/main/java/org/ components/sso/trunk/cas/gatein-cas-plugin/src/main/java/org/gatein/ components/sso/trunk/cas/gatein-cas-plugin/src/main/java/org/gatein/sso/ components/sso/trunk/cas/gatein-cas-plugin/src/main/java/org/gatein/sso/cas/ components/sso/trunk/cas/gatein-cas-plugin/src/main/java/org/gatein/sso/cas/plugin/ components/sso/trunk/cas/gatein-cas-plugin/src/main/java/org/gatein/sso/cas/plugin/AuthenticationPlugin.java components/sso/trunk/cas/gatein-cas-plugin/src/main/resources/ components/sso/trunk/cas/gatein-cas-plugin/src/main/resources/log4j.properties components/sso/trunk/cas/gatein-cas-plugin/src/test/ components/sso/trunk/cas/gatein-cas-plugin/src/test/java/ components/sso/trunk/cas/gatein-cas-plugin/src/test/java/org/ components/sso/trunk/cas/gatein-cas-plugin/src/test/java/org/gatein/ components/sso/trunk/cas/gatein-cas-plugin/src/test/java/org/gatein/sso/ components/sso/trunk/cas/gatein-cas-plugin/src/test/java/org/gatein/sso/cas/ components/sso/trunk/cas/gatein-cas-plugin/src/test/java/org/gatein/sso/cas/plugin/ components/sso/trunk/cas/gatein-cas-plugin/src/test/java/org/gatein/sso/cas/plugin/TestAuthenticationPlugin.java components/sso/trunk/cas/gatein-cas-plugin/src/test/resources/ components/sso/trunk/cas/gatein-cas-portal/ components/sso/trunk/cas/gatein-cas-portal/pom.xml components/sso/trunk/cas/gatein-cas-portal/src/ components/sso/trunk/cas/gatein-cas-portal/src/main/ components/sso/trunk/cas/gatein-cas-portal/src/main/assembly/ components/sso/trunk/cas/gatein-cas-portal/src/main/assembly/src.xml components/sso/trunk/cas/gatein-cas-portal/src/main/config/ components/sso/trunk/cas/gatein-cas-portal/src/main/config/gatein/ components/sso/trunk/cas/gatein-cas-portal/src/main/config/gatein/gatein.ear/ components/sso/trunk/cas/gatein-cas-portal/src/main/config/gatein/gatein.ear/META-INF/ components/sso/trunk/cas/gatein-cas-portal/src/main/config/gatein/portal.war/ components/sso/trunk/cas/gatein-cas-portal/src/main/config/gatein/portal.war/WEB-INF/ components/sso/trunk/cas/gatein-cas-portal/src/main/config/gatein/portal.war/WEB-INF/classes/ components/sso/trunk/cas/gatein-cas-portal/src/main/config/gatein/portal.war/groovy/ components/sso/trunk/cas/gatein-cas-portal/src/main/config/gatein/portal.war/groovy/portal/ components/sso/trunk/cas/gatein-cas-portal/src/main/config/gatein/portal.war/groovy/portal/webui/ components/sso/trunk/cas/gatein-cas-portal/src/main/config/gatein/portal.war/login/ components/sso/trunk/cas/gatein-cas-portal/src/main/config/gatein/portal.war/login/jsp/ components/sso/trunk/cas/gatein-cas-portal/src/main/config/plugin/ components/sso/trunk/cas/gatein-cas-portal/src/main/config/plugin/WEB-INF/ components/sso/trunk/cas/gatein-cas-portal/src/main/config/plugin/WEB-INF/classes/ components/sso/trunk/cas/gatein-cas-portal/src/main/config/plugin/lib/ components/sso/trunk/cas/gatein-cas-portal/src/main/resources/ components/sso/trunk/cas/gatein-cas-portal/src/main/resources/gatein.ear/ components/sso/trunk/cas/gatein-cas-portal/src/main/resources/plugin/ components/sso/trunk/cas/gatein-cas-portal/src/main/resources/plugin/WEB-INF/ components/sso/trunk/cas/gatein-cas-portal/src/main/resources/plugin/WEB-INF/deployerConfigContext.xml components/sso/trunk/cas/pom.xml components/sso/trunk/josso/ components/sso/trunk/josso/gatein-josso-plugin/ components/sso/trunk/josso/gatein-josso-plugin/pom.xml components/sso/trunk/josso/gatein-josso-plugin/src/ components/sso/trunk/josso/gatein-josso-plugin/src/main/ components/sso/trunk/josso/gatein-josso-plugin/src/main/java/ components/sso/trunk/josso/gatein-josso-plugin/src/main/java/org/ components/sso/trunk/josso/gatein-josso-plugin/src/main/java/org/gatein/ components/sso/trunk/josso/gatein-josso-plugin/src/main/java/org/gatein/sso/ components/sso/trunk/josso/gatein-josso-plugin/src/main/java/org/gatein/sso/josso/ components/sso/trunk/josso/gatein-josso-plugin/src/main/java/org/gatein/sso/josso/plugin/ components/sso/trunk/josso/gatein-josso-plugin/src/main/java/org/gatein/sso/josso/plugin/GateinIdentityPlugin.java components/sso/trunk/josso/gatein-josso-portal/ components/sso/trunk/josso/gatein-josso-portal/pom.xml components/sso/trunk/josso/gatein-josso-portal/src/ components/sso/trunk/josso/gatein-josso-portal/src/main/ components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/ components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml components/sso/trunk/josso/gatein-josso-portal/src/main/config/ components/sso/trunk/josso/gatein-josso-portal/src/main/config/gatein/ components/sso/trunk/josso/gatein-josso-portal/src/main/config/gatein/gatein.ear/ components/sso/trunk/josso/gatein-josso-portal/src/main/config/gatein/gatein.ear/META-INF/ components/sso/trunk/josso/gatein-josso-portal/src/main/config/gatein/portal.war/ components/sso/trunk/josso/gatein-josso-portal/src/main/config/gatein/portal.war/WEB-INF/ components/sso/trunk/josso/gatein-josso-portal/src/main/config/gatein/portal.war/WEB-INF/classes/ components/sso/trunk/josso/gatein-josso-portal/src/main/config/gatein/portal.war/groovy/ components/sso/trunk/josso/gatein-josso-portal/src/main/config/gatein/portal.war/groovy/portal/ components/sso/trunk/josso/gatein-josso-portal/src/main/config/gatein/portal.war/groovy/portal/webui/ components/sso/trunk/josso/gatein-josso-portal/src/main/config/gatein/portal.war/login/ components/sso/trunk/josso/gatein-josso-portal/src/main/config/gatein/portal.war/login/jsp/ components/sso/trunk/josso/gatein-josso-portal/src/main/config/plugin/ components/sso/trunk/josso/gatein-josso-portal/src/main/config/plugin/WEB-INF/ components/sso/trunk/josso/gatein-josso-portal/src/main/config/plugin/WEB-INF/classes/ components/sso/trunk/josso/gatein-josso-portal/src/main/config/plugin/lib/ components/sso/trunk/josso/gatein-josso-portal/src/main/resources/ components/sso/trunk/josso/gatein-josso-portal/src/main/resources/gatein.ear/ components/sso/trunk/josso/gatein-josso-portal/src/main/resources/gatein.ear/portal.war/ components/sso/trunk/josso/gatein-josso-portal/src/main/resources/gatein.ear/portal.war/WEB-INF/ components/sso/trunk/josso/gatein-josso-portal/src/main/resources/gatein.ear/portal.war/WEB-INF/classes/ components/sso/trunk/josso/gatein-josso-portal/src/main/resources/gatein.ear/portal.war/WEB-INF/classes/josso-agent-config.xml components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/ components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/WEB-INF/ components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/WEB-INF/classes/ components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/WEB-INF/classes/gatein.properties components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/lib/ components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/lib/josso-gateway-config.xml components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/lib/josso-gateway-gatein-stores.xml components/sso/trunk/josso/pom.xml components/sso/trunk/opensso/ components/sso/trunk/opensso/gatein-opensso-plugin/ components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml components/sso/trunk/opensso/gatein-opensso-plugin/src/ components/sso/trunk/opensso/gatein-opensso-plugin/src/main/ components/sso/trunk/opensso/gatein-opensso-plugin/src/main/java/ components/sso/trunk/opensso/gatein-opensso-plugin/src/main/java/org/ components/sso/trunk/opensso/gatein-opensso-plugin/src/main/java/org/gatein/ components/sso/trunk/opensso/gatein-opensso-plugin/src/main/java/org/gatein/sso/ components/sso/trunk/opensso/gatein-opensso-plugin/src/main/java/org/gatein/sso/opensso/ components/sso/trunk/opensso/gatein-opensso-plugin/src/main/java/org/gatein/sso/opensso/plugin/ components/sso/trunk/opensso/gatein-opensso-plugin/src/main/java/org/gatein/sso/opensso/plugin/AuthenticationPlugin.java components/sso/trunk/opensso/gatein-opensso-plugin/src/main/java/org/gatein/sso/opensso/plugin/GateInPrincipal.java components/sso/trunk/opensso/gatein-opensso-portal/ components/sso/trunk/opensso/gatein-opensso-portal/pom.xml components/sso/trunk/opensso/gatein-opensso-portal/src/ components/sso/trunk/opensso/gatein-opensso-portal/src/main/ components/sso/trunk/opensso/gatein-opensso-portal/src/main/assembly/ components/sso/trunk/opensso/gatein-opensso-portal/src/main/assembly/src.xml components/sso/trunk/opensso/gatein-opensso-portal/src/main/resources/ components/sso/trunk/opensso/gatein-opensso-portal/src/main/resources/plugin/ components/sso/trunk/opensso/gatein-opensso-portal/src/main/resources/plugin/WEB-INF/ components/sso/trunk/opensso/gatein-opensso-portal/src/main/resources/plugin/WEB-INF/classes/ components/sso/trunk/opensso/gatein-opensso-portal/src/main/resources/plugin/WEB-INF/classes/gatein.properties components/sso/trunk/opensso/gatein-opensso-portal/src/main/resources/plugin/config/ components/sso/trunk/opensso/gatein-opensso-portal/src/main/resources/plugin/config/auth/ components/sso/trunk/opensso/gatein-opensso-portal/src/main/resources/plugin/config/auth/default/ components/sso/trunk/opensso/gatein-opensso-portal/src/main/resources/plugin/config/auth/default/AuthenticationPlugin.xml components/sso/trunk/opensso/pom.xml components/sso/trunk/packaging/src/ components/sso/trunk/packaging/src/main/ components/sso/trunk/packaging/src/main/assembly/ components/sso/trunk/packaging/src/main/assembly/src.xml components/sso/trunk/packaging/src/main/resources/ components/sso/trunk/packaging/src/main/resources/README Removed: components/sso/trunk/README components/sso/trunk/gatein-cas-plugin/ components/sso/trunk/gatein-josso-plugin/ components/sso/trunk/gatein-opensso-plugin/ components/sso/trunk/packaging/cas/ components/sso/trunk/packaging/josso/ components/sso/trunk/packaging/opensso/ components/sso/trunk/packaging/profiles.xml Modified: components/sso/trunk/packaging/pom.xml Log: Major refactor Deleted: components/sso/trunk/README =================================================================== --- components/sso/trunk/README 2010-02-11 08:06:44 UTC (rev 1628) +++ components/sso/trunk/README 2010-02-11 10:21:09 UTC (rev 1629) @@ -1,41 +0,0 @@ -Instructions: ------------------ - -Build All: ---------------------------------- -* mvn clean install - -or - -* mvn clean package - - - - - -Install CAS plugin into a designated CAS (3.3.4) server: -------------------------------------------------- -Step 1: Go to the packaging directory: cd packaging - -Step 2: Update the profiles.xml to reflect the directories where your local JBoss AS 5.1.0.GA and Tomcat 6.0.2 are installed - -Step 3: mvn -Pplugin-cas-install install - - - -Install CAS GateIn Agent into the designated GateIn server: ------------------------------------------------------------ -Step 1: Go to the packaging directory: cd packaging - -Step 2: Update the profiles.xml to reflect the directories where your local JBoss AS 5.1.0.GA and Tomcat 6.0.2 are installed - -Step 3: mvn -Pgatein-cas-install install - - - -Under Construction: ---------------------- - -* JOSSO 1.8.1 integration - -* OpenSSO 8.0 Update1 integration \ No newline at end of file Added: components/sso/trunk/cas/gatein-cas-plugin/pom.xml =================================================================== --- components/sso/trunk/cas/gatein-cas-plugin/pom.xml (rev 0) +++ components/sso/trunk/cas/gatein-cas-plugin/pom.xml 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,61 @@ +<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 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.gatein.sso</groupId> + <artifactId>gatein-sso-parent</artifactId> + <relativePath>../pom.xml</relativePath> + <version>trunk-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>gatein-cas-plugin</artifactId> + <packaging>jar</packaging> + <name>Gatein Integration for CAS Single Sign On Framework</name> + + <properties> + </properties> + + <dependencies> + <dependency> + <groupId>org.jasig.cas</groupId> + <artifactId>cas-server-core</artifactId> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3.1</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + +  + <profiles> + <profile> + <id>integration-tests</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3.1</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> + Added: components/sso/trunk/cas/gatein-cas-plugin/src/main/java/org/gatein/sso/cas/plugin/AuthenticationPlugin.java =================================================================== --- components/sso/trunk/cas/gatein-cas-plugin/src/main/java/org/gatein/sso/cas/plugin/AuthenticationPlugin.java (rev 0) +++ components/sso/trunk/cas/gatein-cas-plugin/src/main/java/org/gatein/sso/cas/plugin/AuthenticationPlugin.java 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,141 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.gatein.sso.cas.plugin; + +import org.apache.log4j.Logger; + +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.methods.GetMethod; + +import org.jasig.cas.authentication.handler.support.AbstractUsernamePasswordAuthenticationHandler; +import org.jasig.cas.authentication.principal.UsernamePasswordCredentials; + +/** + * This is a Gatein Authentication Plugin for the CAS server. It is deployed along with the CAS server and provides authentication + * against a Gatein instance + * + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + */ +public class AuthenticationPlugin extends AbstractUsernamePasswordAuthenticationHandler +{ + private static Logger log = Logger.getLogger(AuthenticationPlugin.class); + + private String gateInHost; + private String gateInPort; + private String gateInContext; + + public AuthenticationPlugin() + { + + } + + public String getGateInHost() + { + return gateInHost; + } + + + + public void setGateInHost(String gateInHost) + { + this.gateInHost = gateInHost; + } + + + + public String getGateInPort() + { + return gateInPort; + } + + + public void setGateInPort(String gateInPort) + { + this.gateInPort = gateInPort; + } + + public String getGateInContext() + { + return gateInContext; + } + + public void setGateInContext(String gateInContext) + { + this.gateInContext = gateInContext; + } + //----------------------------------------------------------------------------------------------------------------------------------------------------------------- + public boolean authenticateUsernamePasswordInternal(final UsernamePasswordCredentials credentials) + { + try + { + final String username = credentials.getUsername(); + final String password = credentials.getPassword(); + + StringBuilder urlBuffer = new StringBuilder(); + urlBuffer.append("http://"+this.gateInHost+":"+this.gateInPort+"/"+this.gateInContext+"/rest/sso/authcallback/auth/"+username+"/"+password); + + log.debug("-------------------------------------------------------------------"); + log.debug("REST Request="+urlBuffer.toString()); + log.debug("-------------------------------------------------------------------"); + + return this.executeRemoteCall(urlBuffer.toString()); + } + catch(Exception e) + { + log.error("Remote Authentication Failed--------------------------"); + log.error(this, e); + return false; + } + } + + private boolean executeRemoteCall(String authUrl) throws Exception + { + HttpClient client = new HttpClient(); + GetMethod method = null; + try + { + method = new GetMethod(authUrl); + + int status = client.executeMethod(method); + String response = method.getResponseBodyAsString(); + + switch(status) + { + case 200: + if(response.equals(Boolean.TRUE.toString())) + { + return true; + } + break; + } + + return false; + } + finally + { + if(method != null) + { + method.releaseConnection(); + } + } + } +} Added: components/sso/trunk/cas/gatein-cas-plugin/src/main/resources/log4j.properties =================================================================== --- components/sso/trunk/cas/gatein-cas-plugin/src/main/resources/log4j.properties (rev 0) +++ components/sso/trunk/cas/gatein-cas-plugin/src/main/resources/log4j.properties 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,8 @@ +# Set root category priority to INFO and its only appender to CONSOLE. +log4j.rootCategory=INFO, CONSOLE + +# CONSOLE is set to be a ConsoleAppender using a PatternLayout. +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.Threshold=INFO +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=- %m%n Added: components/sso/trunk/cas/gatein-cas-plugin/src/test/java/org/gatein/sso/cas/plugin/TestAuthenticationPlugin.java =================================================================== --- components/sso/trunk/cas/gatein-cas-plugin/src/test/java/org/gatein/sso/cas/plugin/TestAuthenticationPlugin.java (rev 0) +++ components/sso/trunk/cas/gatein-cas-plugin/src/test/java/org/gatein/sso/cas/plugin/TestAuthenticationPlugin.java 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,69 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.gatein.sso.cas.plugin; + +import junit.framework.TestCase; + +import org.gatein.sso.cas.plugin.AuthenticationPlugin; +import org.jasig.cas.authentication.principal.UsernamePasswordCredentials; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + */ +public class TestAuthenticationPlugin extends TestCase +{ + private AuthenticationPlugin authPlugin; + + public void setUp() throws Exception + { + this.authPlugin = new AuthenticationPlugin(); + + this.authPlugin.setGateInHost("localhost"); + this.authPlugin.setGateInPort("1500"); + this.authPlugin.setGateInContext("portal"); + } + + public void tearDown() throws Exception + { + this.authPlugin = null; + } + //------------------------------------------------------------------------------------------------------------------------------------------------------------------- + public void testAuthenticationCallback() throws Exception + { + //Unsuccessful login scenario + UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(); + credentials.setUsername("root"); + credentials.setPassword("blah"); + + boolean authResult = this.authPlugin.authenticate(credentials); + assertFalse("Login should *not* have succeeded!!", authResult); + + + //Successful login scenario + credentials = new UsernamePasswordCredentials(); + credentials.setUsername("root"); + credentials.setPassword("gtn"); + + authResult = this.authPlugin.authenticate(credentials); + assertTrue("Login should have succeeded!!", authResult); + } +} Added: components/sso/trunk/cas/gatein-cas-portal/pom.xml =================================================================== --- components/sso/trunk/cas/gatein-cas-portal/pom.xml (rev 0) +++ components/sso/trunk/cas/gatein-cas-portal/pom.xml 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,51 @@ +<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 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.gatein.sso</groupId> + <artifactId>cas-parent</artifactId> + <version>trunk-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>cas-pkg</artifactId> + <packaging>pom</packaging> + <name>CAS Agent and Server Packages</name> + + <dependencies> + <dependency> + <groupId>org.gatein.sso</groupId> + <artifactId>gatein-cas-plugin</artifactId> + <version>trunk-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-5</version> + <configuration> + <descriptors> + <descriptor>src/main/assembly/src.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>make-assembly</id>  + <phase>package</phase>  + <goals> + <goal>single</goal>  + </goals> + </execution> + </executions> + + </plugin> + </plugins> + </build> + +</project> + Added: components/sso/trunk/cas/gatein-cas-portal/src/main/assembly/src.xml =================================================================== --- components/sso/trunk/cas/gatein-cas-portal/src/main/assembly/src.xml (rev 0) +++ components/sso/trunk/cas/gatein-cas-portal/src/main/assembly/src.xml 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,27 @@ +<assembly> + <includeBaseDirectory>false</includeBaseDirectory> + <formats> + <format>dir</format> + + </formats> + + <fileSets> + <fileSet> + + <directory>src/main/resources</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + + <dependencySets> + + <dependencySet> + + <outputDirectory>gatein.ear/lib</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + + </dependencySets> + +</assembly> \ No newline at end of file Added: components/sso/trunk/cas/gatein-cas-portal/src/main/resources/plugin/WEB-INF/deployerConfigContext.xml =================================================================== --- components/sso/trunk/cas/gatein-cas-portal/src/main/resources/plugin/WEB-INF/deployerConfigContext.xml (rev 0) +++ components/sso/trunk/cas/gatein-cas-portal/src/main/resources/plugin/WEB-INF/deployerConfigContext.xml 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,151 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:p="http://www.springframework.org/schema/p" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> +  + <bean id="authenticationManager" + class="org.jasig.cas.authentication.AuthenticationManagerImpl"> +  + <property name="credentialsToPrincipalResolvers"> + <list> +  + <bean + class="org.jasig.cas.authentication.principal.UsernamePasswordCredentialsToPrincipalResolver" /> +  + <bean + class="org.jasig.cas.authentication.principal.HttpBasedServiceCredentialsToPrincipalResolver" /> + </list> + </property> + +  + <property name="authenticationHandlers"> + <list> +  + <bean class="org.jasig.cas.authentication.handler.support.HttpBasedServiceCredentialsAuthenticationHandler" + p:httpClient-ref="httpClient" /> +  + +  +  +  + <bean class="org.gatein.sso.cas.plugin.AuthenticationPlugin"> + <property name="gateInHost"><value>localhost</value></property> + <property name="gateInPort"><value>8080</value></property> + <property name="gateInContext"><value>portal</value></property> + </bean> + </list> + </property> + </bean> + + +  + <bean id="userDetailsService" class="org.springframework.security.userdetails.memory.InMemoryDaoImpl"> + <property name="userMap"> + <value> + + </value> + </property> + </bean> + +  + <bean id="attributeRepository" + class="org.jasig.services.persondir.support.StubPersonAttributeDao"> + <property name="backingMap"> + <map> + <entry key="uid" value="uid" /> + <entry key="eduPersonAffiliation" value="eduPersonAffiliation" /> + <entry key="groupMembership" value="groupMembership" /> + </map> + </property> + </bean> + +  + <bean + id="serviceRegistryDao" + class="org.jasig.cas.services.InMemoryServiceRegistryDaoImpl" /> +</beans> Added: components/sso/trunk/cas/pom.xml =================================================================== --- components/sso/trunk/cas/pom.xml (rev 0) +++ components/sso/trunk/cas/pom.xml 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,34 @@ +<?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 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.gatein.sso</groupId> + <artifactId>cas-parent</artifactId> + <version>trunk-SNAPSHOT</version> + <packaging>pom</packaging> + + <parent> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-parent</artifactId> + <version>trunk-SNAPSHOT</version> + </parent> + + + <name>Gatein - Single Sign On Integration (CAS)</name> + <description>GateIn Single Sign On Integration (CAS)</description> + + <modules> + <module>gatein-cas-plugin</module> + <module>gatein-cas-portal</module> + </modules> + +</project> Added: components/sso/trunk/josso/gatein-josso-plugin/pom.xml =================================================================== --- components/sso/trunk/josso/gatein-josso-plugin/pom.xml (rev 0) +++ components/sso/trunk/josso/gatein-josso-plugin/pom.xml 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,135 @@ +<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 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.gatein.sso</groupId> + <artifactId>josso-parent</artifactId> + <version>trunk-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>gatein-josso-plugin</artifactId> + <packaging>jar</packaging> + <name>Gatein Integration for JOSSO Single Sign On Framework</name> + + <properties> + </properties> + + <dependencies> + <dependency> + <groupId>org.josso</groupId> + <artifactId>josso-core</artifactId> + </dependency> + <dependency> + <groupId>org.josso</groupId> + <artifactId>josso-basic-authscheme</artifactId> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </dependency> + <dependency> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.xbean</groupId> + <artifactId>maven-xbean-plugin</artifactId> + <version>${version.xbean}</version> + <executions> + <execution> + <configuration> + <namespace>urn:org:gatein:sso:josso:plugin:gateinidentityplugin</namespace> + </configuration> + <goals> + <goal>mapping</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +  +  +  +</project> + Added: components/sso/trunk/josso/gatein-josso-plugin/src/main/java/org/gatein/sso/josso/plugin/GateinIdentityPlugin.java =================================================================== --- components/sso/trunk/josso/gatein-josso-plugin/src/main/java/org/gatein/sso/josso/plugin/GateinIdentityPlugin.java (rev 0) +++ components/sso/trunk/josso/gatein-josso-plugin/src/main/java/org/gatein/sso/josso/plugin/GateinIdentityPlugin.java 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,231 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.gatein.sso.josso.plugin; + +import java.io.InputStream; +import java.util.Properties; + +import org.apache.log4j.Logger; + +import org.josso.gateway.identity.exceptions.NoSuchUserException; +import org.josso.gateway.identity.exceptions.SSOIdentityException; +import org.josso.gateway.identity.service.BaseRole; +import org.josso.gateway.identity.service.BaseUser; +import org.josso.gateway.identity.service.BaseUserImpl; +import org.josso.gateway.identity.service.store.UserKey; +import org.josso.gateway.identity.service.store.IdentityStore; + +import org.josso.auth.Credential; +import org.josso.auth.CredentialKey; +import org.josso.auth.CredentialProvider; +import org.josso.auth.scheme.AuthenticationScheme; +import org.josso.auth.BindableCredentialStore; +import org.josso.auth.exceptions.SSOAuthenticationException; + +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.methods.GetMethod; + +/** + * @org.apache.xbean.XBean element="gatein-store" + * + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public class GateinIdentityPlugin implements BindableCredentialStore,IdentityStore +{ + private static Logger log = Logger.getLogger(GateinIdentityPlugin.class); + + private AuthenticationScheme authenticationScheme = null; + + private String gateInHost; + private String gateInPort; + private String gateInContext; + + /** + * + * + */ + public GateinIdentityPlugin() + { + InputStream is = null; + try + { + ///Load the GateIn properties + Properties properties = new Properties(); + is = Thread.currentThread().getContextClassLoader().getResourceAsStream("gatein.properties"); + properties.load(is); + + this.gateInHost = properties.getProperty("host"); + this.gateInPort = properties.getProperty("port"); + this.gateInContext = properties.getProperty("context"); + + log + .info("-------------------------------------------------------------------"); + log.info("GateIn Host: " + this.gateInHost); + log + .info("GateIn Identity Plugin successfully started........................"); + log + .info("-------------------------------------------------------------------"); + } + catch (Exception e) + { + this.authenticationScheme = null; + + log.error(this, e); + throw new RuntimeException( + "GateIn Identity Plugin registration failed...."); + } + finally + { + if(is != null) + { + try{is.close();}catch(Exception e){} + } + } + } + + public void setAuthenticationScheme(AuthenticationScheme authenticationScheme) + { + this.authenticationScheme = authenticationScheme; + } + + public String getGateInHost() + { + return gateInHost; + } + + public void setGateInHost(String gateInHost) + { + this.gateInHost = gateInHost; + } + + public String getGateInPort() + { + return gateInPort; + } + + public void setGateInPort(String gateInPort) + { + this.gateInPort = gateInPort; + } + + public String getGateInContext() + { + return gateInContext; + } + + public void setGateInContext(String gateInContext) + { + this.gateInContext = gateInContext; + } + + // ----------------IdentityStore + // implementation------------------------------------------------------------------------------------------------------------------------ + public boolean userExists(UserKey userKey) throws SSOIdentityException + { + return true; + } + + public BaseRole[] findRolesByUserKey(UserKey userKey) + throws SSOIdentityException + { + return null; + } + + public BaseUser loadUser(UserKey userKey) throws NoSuchUserException, + SSOIdentityException + { + BaseUser user = new BaseUserImpl(); + user.setName(userKey.toString()); + return user; + } + // ---------------CredentialStore + // implementation---------------------------------------------------------------------------------------------------------------------- + public Credential[] loadCredentials(CredentialKey credentialKey, + CredentialProvider credentialProvider) throws SSOIdentityException + { + return null; + } + + public Credential[] loadCredentials(CredentialKey credentialKey) throws SSOIdentityException + { + return null; + } + + public boolean bind(String username, String password) + throws SSOAuthenticationException + { + try + { + // return this.portalIdentityService.authenticate(username, password); + log.debug("Performing Authentication........................"); + log.debug("Username: "+username); + log.debug("Password: "+password); + + StringBuilder urlBuffer = new StringBuilder(); + urlBuffer.append("http://" + this.gateInHost + ":" + this.gateInPort + "/" + + this.gateInContext + "/rest/sso/authcallback/auth/" + username + "/" + + password); + + boolean success = this.executeRemoteCall(urlBuffer.toString()); + + return success; + } + catch(Exception e) + { + throw new SSOAuthenticationException(e); + } + } + //------------------------------------------------------------------------------------------------------------------------------------------ + private boolean executeRemoteCall(String authUrl) throws Exception + { + HttpClient client = new HttpClient(); + GetMethod method = null; + try + { + method = new GetMethod(authUrl); + + int status = client.executeMethod(method); + String response = method.getResponseBodyAsString(); + + switch (status) + { + case 200: + if (response.equals(Boolean.TRUE.toString())) + { + return true; + } + break; + } + + return false; + } + finally + { + if (method != null) + { + method.releaseConnection(); + } + } + } +} Added: components/sso/trunk/josso/gatein-josso-portal/pom.xml =================================================================== --- components/sso/trunk/josso/gatein-josso-portal/pom.xml (rev 0) +++ components/sso/trunk/josso/gatein-josso-portal/pom.xml 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,81 @@ +<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 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.gatein.sso</groupId> + <artifactId>josso-parent</artifactId> + <version>trunk-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>josso-pkg</artifactId> + <packaging>pom</packaging> + <name>JOSSO Agent and Server Packages</name> + + <dependencies> + <dependency> + <groupId>org.josso</groupId> + <artifactId>josso-agents-bin</artifactId> + <version>1.8.0</version> + </dependency> + <dependency> + <groupId>org.josso</groupId> + <artifactId>josso-agent-shared</artifactId> + <version>1.8.1</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>2.5.5</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>2.5.5</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>2.5.5</version> + </dependency> + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + <version>0.2</version> + </dependency> + <dependency> + <groupId>org.apache.axis</groupId> + <artifactId>axis</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>org.apache.xbean</groupId> + <artifactId>xbean-spring</artifactId> + <version>3.4.3</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-5</version> + <configuration> + <descriptors> + <descriptor>src/main/assembly/src.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>make-assembly</id>  + <phase>package</phase>  + <goals> + <goal>single</goal>  + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> + Added: components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml =================================================================== --- components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml (rev 0) +++ components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,27 @@ +<assembly> + <includeBaseDirectory>false</includeBaseDirectory> + <formats> + <format>dir</format> + + </formats> + + <fileSets> + <fileSet> + + <directory>src/main/resources</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + + <dependencySets> + + <dependencySet> + + <outputDirectory>gatein.ear/lib</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + + </dependencySets> + +</assembly> \ No newline at end of file Added: components/sso/trunk/josso/gatein-josso-portal/src/main/resources/gatein.ear/portal.war/WEB-INF/classes/josso-agent-config.xml =================================================================== --- components/sso/trunk/josso/gatein-josso-portal/src/main/resources/gatein.ear/portal.war/WEB-INF/classes/josso-agent-config.xml (rev 0) +++ components/sso/trunk/josso/gatein-josso-portal/src/main/resources/gatein.ear/portal.war/WEB-INF/classes/josso-agent-config.xml 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> + +<s:beans xmlns:s="http://www.springframework.org/schema/beans" + xmlns:gen-svlt="urn:org:josso:agent:generic-servlet" + xmlns:agent="urn:org:josso:agent:core" + xmlns:protocol="urn:org:josso:protocol:client" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> + +<gen-svlt:agent name="josso-tomcat60-agent" sessionAccessMinInterval="1000"> + + <gatewayLoginUrl>http://localhost:8888/josso/signon/login.do</gatewayLoginUrl> + <gatewayLogoutUrl>http://localhost:8888/josso/signon/logout.do</gatewayLogoutUrl> + + <gatewayServiceLocator> + <protocol:ws-service-locator endpoint="localhost:8888"/> + </gatewayServiceLocator> + <configuration> + <agent:agent-configuration> + <agent:partner-apps> + <agent:partner-app id="portal" context="/portal"/> + </agent:partner-apps> + </agent:agent-configuration> + </configuration> + <parametersBuilders> + <agent:vhost-parameters-builder/> + <agent:appctx-parameters-builder/> + </parametersBuilders> + </gen-svlt:agent> +</s:beans> \ No newline at end of file Added: components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/WEB-INF/classes/gatein.properties =================================================================== --- components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/WEB-INF/classes/gatein.properties (rev 0) +++ components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/WEB-INF/classes/gatein.properties 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,3 @@ +host=localhost +port=8080 +context=portal \ No newline at end of file Added: components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/lib/josso-gateway-config.xml =================================================================== --- components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/lib/josso-gateway-config.xml (rev 0) +++ components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/lib/josso-gateway-config.xml 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,314 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> + + +<s:beans xmlns:s="http://www.springframework.org/schema/beans" + xmlns="urn:org:josso:core" + xmlns:def-sdselector="urn:org:josso:default:secdomainselector" + xmlns:def-sdregistry="urn:org:josso:default:secdomainregistry" + xmlns:simple-sdmatcher="urn:org:josso:simple:secdomainmatcher" + xmlns:vhost-sdmatcher="urn:org:josso:vhost:secdomainmatcher" + xmlns:appcxt-sdmatcher="urn:org:josso:appctx:secdomainmatcher" + xmlns:def-auth="urn:org:josso:default:authenticator" + xmlns:basic-authscheme="urn:org:josso:basic:authscheme" + xmlns:bind-authscheme="urn:org:josso:bind:authscheme" + xmlns:ntlm-authscheme="urn:org:josso:ntlm:authscheme" + xmlns:strong-authscheme="urn:org:josso:strong:authscheme" + xmlns:memory-istore="urn:org:josso:memory:identitystore" + xmlns:def-identitymgr="urn:org:josso:default:identitymgr" + xmlns:def-identityprv="urn:org:josso:default:identityprovider" + xmlns:def-sessionmgr="urn:org:josso:default:sessionmgr" + xmlns:memory-sstore="urn:org:josso:memory:sessionstore" + xmlns:def-sidgen="urn:org:josso:default:sessionidgen" + xmlns:def-assertionmgr="urn:org:josso:default:assertionmgr" + xmlns:memory-astore="urn:org:josso:memory:assertionstore" + xmlns:def-aidgen="urn:org:josso:default:assertionidgen" + xmlns:def-auditmgr="urn:org:josso:default:auditmgr" + xmlns:logger-atrailhandler="urn:org:josso:logger:audittrailhandler" + xmlns:def-eventmgr="urn:org:josso:default:eventmgr" + xmlns:def-pwdmgr="urn:org:josso:default:passwordmgr" + xmlns:def-pwdgen="urn:org:josso:default:passwordgenerator" + xmlns:email-pwddist="urn:org:josso:email:passworddistributor" + xmlns:simple-lostpwd="urn:org:josso:simple:lostpasswordprocess" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + urn:org:josso:core http://www.josso.org/schema/josso-core.xsd + urn:org:josso:default:secdomainselector http://www.josso.org/schema/josso-default-secdomainselector.xsd + urn:org:josso:default:secdomainregistry http://www.josso.org/schema/josso-default-secdomainregistry.xsd + urn:org:josso:simple:secdomainmatcher http://www.josso.org/schema/josso-simple-secdomainmatcher.xsd + urn:org:josso:vhost:secdomainmatcher http://www.josso.org/schema/josso-vhost-secdomainmatcher.xsd + urn:org:josso:appctx:secdomainmatcher http://www.josso.org/schema/josso-appctx-secdomainmatcher.xsd + urn:org:josso:default:authenticator http://www.josso.org/schema/josso-default-authenticator.xsd + urn:org:josso:basic:authscheme http://www.josso.org/schema/josso-basic-authscheme.xsd + urn:org:josso:bind:authscheme http://www.josso.org/schema/josso-bind-authscheme.xsd + urn:org:josso:ntlm:authscheme http://www.josso.org/schema/josso-ntlm-authscheme.xsd + urn:org:josso:strong:authscheme http://www.josso.org/schema/josso-strong-authscheme.xsd + urn:org:josso:memory:identitystore http://www.josso.org/schema/josso-memory-identitystore.xsd + urn:org:josso:default:identitymgr http://www.josso.org/schema/josso-default-identitymgr.xsd + urn:org:josso:default:identityprovider http://www.josso.org/schema/josso-default-identityprovider.xsd + urn:org:josso:default:sessionmgr http://www.josso.org/schema/josso-default-sessionmgr.xsd + urn:org:josso:memory:sessionstore http://www.josso.org/schema/josso-memory-sessionstore.xsd + urn:org:josso:default:sessionidgen http://www.josso.org/schema/josso-default-sessionidgen.xsd + urn:org:josso:default:assertionmgr http://www.josso.org/schema/josso-default-assertionmgr.xsd + urn:org:josso:memory:assertionstore http://www.josso.org/schema/josso-memory-assertionstore.xsd + urn:org:josso:default:assertionidgen http://www.josso.org/schema/josso-default-assertionidgen.xsd + urn:org:josso:default:auditmgr http://www.josso.org/schema/josso-default-auditmgr.xsd + urn:org:josso:logger:audittrailhandler http://www.josso.org/schema/josso-logger-audittrailhandler.xsd + urn:org:josso:default:eventmgr http://www.josso.org/schema/josso-default-eventmgr.xsd + urn:org:josso:default:passwordmgr http://www.josso.org/schema/josso-default-passwordmanager.xsd + urn:org:josso:default:passwordgenerator http://www.josso.org/schema/josso-default-passwordgenerator.xsd + urn:org:josso:email:passworddistributor http://www.josso.org/schema/josso-email-passworddistributor.xsd + urn:org:josso:simple:lostpasswordprocess http://www.josso.org/schema/josso-simple-lostpasswordprocess.xsd"> + +  +  +  +  +  + +  + +  +  +  +  + +  + <s:import resource="josso-gateway-auth.xml"/> + +  + <s:import resource="josso-gateway-selfservices.xml"/> + +  +  + <s:import resource="josso-gateway-gatein-stores.xml" /> + +  + <s:import resource="josso-gateway-web.xml" /> + +  + <s:import resource="josso-gateway-jmx.xml" /> + +  +  +  + <gateway> + + <sso-domain-selector> + <def-sdselector:default-domain-selector/> + </sso-domain-selector> + + <sso-domains-registry> + <def-sdregistry:default-domains-registry/> + </sso-domains-registry> + +  +  +  +  +  +  +  +  + <domains> + <s:ref bean="josso"/> + </domains> + + </gateway> + + +  + <domain name="josso" type="web"> + + <sso-web-configuration> + <s:ref bean="josso-web-configuraiton"/> + </sso-web-configuration> + + <matchers> + <simple-sdmatcher:simple-matcher/> + </matchers> + + <authenticator> + <s:ref bean="josso-authenticator"/> + </authenticator> + + <identity-manager> + <s:ref bean="josso-identity-manager"/> + </identity-manager> + + <session-manager> + <s:ref bean="josso-session-manager"/> + </session-manager> + + <assertion-manager> + <s:ref bean="josso-assertion-manager"/> + </assertion-manager> + + <identity-provider> + <s:ref bean="josso-identity-provider"/> + </identity-provider> + + <audit-manager> + <s:ref bean="josso-audit-manager"/> + </audit-manager> + + <event-manager> + <s:ref bean="josso-event-manager"/> + </event-manager> + +  + <protocol-manager> + <s:ref bean="josso-protocol-manager"/> + </protocol-manager> + +  + <password-manager> + <s:ref bean="josso-password-manager"/> + </password-manager> + + </domain> + + +  +  +  + <def-auth:authenticator id="josso-authenticator"> +  + +  + <def-auth:schemes> + <s:ref bean="josso-bind-authentication"/> + </def-auth:schemes> + </def-auth:authenticator> + +  +  +  + <def-identitymgr:identity-manager id="josso-identity-manager"> + + <def-identitymgr:identityStore> + <s:ref bean="josso-identity-store"/> + </def-identitymgr:identityStore> + + <def-identitymgr:identityStoreKeyAdapter> + <s:ref bean="josso-simple-key-adapter"/> + </def-identitymgr:identityStoreKeyAdapter> + + </def-identitymgr:identity-manager> + +  +  +  + <def-identityprv:identity-provider id="josso-identity-provider"/> + +  +  +  + <def-sessionmgr:session-manager id="josso-session-manager" + maxInactiveInterval="30" + maxSessionsPerUser="-1" + invalidateExceedingSessions="false" + sessionMonitorInterval="10000"> + + <def-sessionmgr:session-id-generator> + <def-sidgen:id-generator algorithm="MD5"/> + </def-sessionmgr:session-id-generator> + + <def-sessionmgr:session-store> + <s:ref bean="josso-session-store"/> + </def-sessionmgr:session-store> + + </def-sessionmgr:session-manager> + +  +  +  + <def-assertionmgr:assertion-manager id="josso-assertion-manager"> + + <def-assertionmgr:assertion-id-generator> + <def-aidgen:id-generator/> + </def-assertionmgr:assertion-id-generator> + + <def-assertionmgr:assertion-store> + <s:ref bean="josso-assertion-store"/> + </def-assertionmgr:assertion-store> + + </def-assertionmgr:assertion-manager> + +  +  +  + <def-auditmgr:audit-manager id="josso-audit-manager"> + +  + <def-auditmgr:handlers> + <logger-atrailhandler:audittrail-logger category="org.josso.AUDIT"/> + </def-auditmgr:handlers> + + </def-auditmgr:audit-manager> + +  +  +  + <default-protocol-manager id="josso-protocol-manager"> +  + </default-protocol-manager> + +  +  +  + <def-eventmgr:springjmx-event-manager id="josso-event-manager"> + <def-eventmgr:listeners> + <s:ref bean="josso-audit-manager"/> + </def-eventmgr:listeners> + </def-eventmgr:springjmx-event-manager> + +  +  +  + <simple-key-adapter id="josso-simple-key-adapter"/> + +  +  +  + <s:bean id="josso-spring-mailsender" class="org.springframework.mail.javamail.JavaMailSenderImpl"> +  + <s:property name="host" value="mail.mycompany.com"/> + </s:bean> + +</s:beans> Added: components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/lib/josso-gateway-gatein-stores.xml =================================================================== --- components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/lib/josso-gateway-gatein-stores.xml (rev 0) +++ components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/lib/josso-gateway-gatein-stores.xml 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> + + +<s:beans xmlns:s="http://www.springframework.org/schema/beans" + xmlns:gatein-istore="urn:org:gatein:sso:josso:plugin:gateinidentityplugin" + xmlns:bind-authscheme="urn:org:josso:bind:authscheme" + xmlns:memory-sstore="urn:org:josso:memory:sessionstore" + xmlns:memory-astore="urn:org:josso:memory:assertionstore" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + urn:org:josso:memory:identitystore http://www.josso.org/schema/josso-memory-identitystore.xsd + urn:org:josso:memory:sessionstore http://www.josso.org/schema/josso-memory-sessionstore.xsd + urn:org:josso:memory:assertionstore http://www.josso.org/schema/josso-memory-assertionstore.xsd + "> + +  +  +  +  +  + <gatein-istore:gatein-store id="josso-identity-store" s:scope="singleton"/> + +  +  +  + <bind-authscheme:bind-auth-scheme + id="josso-bind-authentication" + name="basic-authentication" + hashAlgorithm="MD5" + hashEncoding="HEX" + ignorePasswordCase="false" + ignoreUserCase="false"> + + + <bind-authscheme:credentialStore> + <s:ref bean="josso-identity-store"/> + </bind-authscheme:credentialStore> + + <bind-authscheme:credentialStoreKeyAdapter> + <s:ref bean="josso-simple-key-adapter"/> + </bind-authscheme:credentialStoreKeyAdapter> + + </bind-authscheme:bind-auth-scheme> + +  +  +  +  + <memory-sstore:memory-store id="josso-session-store"/> + +  +  +  +  + <memory-astore:memory-store id="josso-assertion-store"/> +</s:beans> Added: components/sso/trunk/josso/pom.xml =================================================================== --- components/sso/trunk/josso/pom.xml (rev 0) +++ components/sso/trunk/josso/pom.xml 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,34 @@ +<?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 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.gatein.sso</groupId> + <artifactId>josso-parent</artifactId> + <version>trunk-SNAPSHOT</version> + <packaging>pom</packaging> + + <parent> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-parent</artifactId> + <version>trunk-SNAPSHOT</version> + </parent> + + + <name>Gatein - Single Sign On Integration (JOSSO)</name> + <description>GateIn Single Sign On Integration (JOSSO)</description> + + <modules> + <module>gatein-josso-portal</module> + <module>gatein-josso-plugin</module> + </modules> + +</project> Added: components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml =================================================================== --- components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml (rev 0) +++ components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,36 @@ +<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 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.gatein.sso</groupId> + <artifactId>gatein-sso-parent</artifactId> + <relativePath>../pom.xml</relativePath> + <version>trunk-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>gatein-opensso-plugin</artifactId> + <packaging>jar</packaging> + <name>Gatein Plugin for the OpenSSO Server</name> + + <properties> + </properties> + + <dependencies> + <dependency> + <groupId>opensso</groupId> + <artifactId>opensso</artifactId> + </dependency> + <dependency> + <groupId>opensso</groupId> + <artifactId>amserver</artifactId> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </dependency> + </dependencies> + + <build> + </build> +</project> + Added: components/sso/trunk/opensso/gatein-opensso-plugin/src/main/java/org/gatein/sso/opensso/plugin/AuthenticationPlugin.java =================================================================== --- components/sso/trunk/opensso/gatein-opensso-plugin/src/main/java/org/gatein/sso/opensso/plugin/AuthenticationPlugin.java (rev 0) +++ components/sso/trunk/opensso/gatein-opensso-plugin/src/main/java/org/gatein/sso/opensso/plugin/AuthenticationPlugin.java 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,188 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.gatein.sso.opensso.plugin; + +import java.util.Properties; +import java.util.Map; +import java.io.InputStream; +import java.io.IOException; + +import java.security.Principal; +import javax.security.auth.Subject; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.NameCallback; +import javax.security.auth.callback.PasswordCallback; + +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.methods.GetMethod; + +import com.sun.identity.authentication.spi.AMLoginModule; +import com.sun.identity.authentication.spi.AuthLoginException; +import com.sun.identity.authentication.util.ISAuthConstants; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + */ +public class AuthenticationPlugin extends AMLoginModule +{ + private String gateInHost; + private String gateInPort; + private String gateInContext; + + private String username; + private String password; + + public String getGateInHost() + { + return gateInHost; + } + + public void setGateInHost(String gateInHost) + { + this.gateInHost = gateInHost; + } + + public String getGateInPort() + { + return gateInPort; + } + + public void setGateInPort(String gateInPort) + { + this.gateInPort = gateInPort; + } + + public String getGateInContext() + { + return gateInContext; + } + + public void setGateInContext(String gateInContext) + { + this.gateInContext = gateInContext; + } + + public AuthenticationPlugin() + { + } + + public void init(Subject subject, Map sharedState, Map options) + { + InputStream is = null; + try + { + //Load the GateIn properties + Properties properties = new Properties(); + is = Thread.currentThread().getContextClassLoader().getResourceAsStream("gatein.properties"); + properties.load(is); + + this.gateInHost = properties.getProperty("host"); + this.gateInPort = properties.getProperty("port"); + this.gateInContext = properties.getProperty("context"); + } + catch(IOException ioe) + { + + } + finally + { + if(is != null) + { + try{is.close();}catch(Exception e){} + } + } + } + + public int process(Callback[] callbacks, int state) throws AuthLoginException + { + try + { + for (int i = 0; i < callbacks.length; i++) + { + Callback callback = callbacks[i]; + + if (callback instanceof NameCallback) + { + this.username = ((NameCallback) callback).getName(); + } + else if (callback instanceof PasswordCallback) + { + this.password = new String(((PasswordCallback) callback).getPassword()); + } + } + + StringBuilder urlBuffer = new StringBuilder(); + urlBuffer.append("http://" + this.gateInHost + ":" + this.gateInPort + "/" + + this.gateInContext + "/rest/sso/authcallback/auth/" + username + "/" + + password); + + boolean success = this.executeRemoteCall(urlBuffer.toString()); + if(!success) + { + throw new AuthLoginException("GateIn Login Callback Failed!!"); + } + + return ISAuthConstants.LOGIN_SUCCEED; + } + catch(Throwable e) + { + throw new AuthLoginException(e); + } + } + + public Principal getPrincipal() + { + return new GateInPrincipal(this.username); + } + //-------------------------------------------------------------------------------------------------------------------------------------------------------------------- + private boolean executeRemoteCall(String authUrl) throws Exception + { + HttpClient client = new HttpClient(); + GetMethod method = null; + try + { + method = new GetMethod(authUrl); + + int status = client.executeMethod(method); + String response = method.getResponseBodyAsString(); + + switch (status) + { + case 200: + if (response.equals(Boolean.TRUE.toString())) + { + return true; + } + break; + } + + return false; + } + finally + { + if (method != null) + { + method.releaseConnection(); + } + } + } +} Added: components/sso/trunk/opensso/gatein-opensso-plugin/src/main/java/org/gatein/sso/opensso/plugin/GateInPrincipal.java =================================================================== --- components/sso/trunk/opensso/gatein-opensso-plugin/src/main/java/org/gatein/sso/opensso/plugin/GateInPrincipal.java (rev 0) +++ components/sso/trunk/opensso/gatein-opensso-plugin/src/main/java/org/gatein/sso/opensso/plugin/GateInPrincipal.java 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,42 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.gatein.sso.opensso.plugin; + +import java.security.Principal; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + */ +public class GateInPrincipal implements Principal +{ + private String name; + + public GateInPrincipal(String name) + { + this.name = name; + } + + public String getName() + { + return this.name; + } +} Added: components/sso/trunk/opensso/gatein-opensso-portal/pom.xml =================================================================== --- components/sso/trunk/opensso/gatein-opensso-portal/pom.xml (rev 0) +++ components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,56 @@ +<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 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.gatein.sso</groupId> + <artifactId>opensso-parent</artifactId> + <version>trunk-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>opensso-pkg</artifactId> + <packaging>pom</packaging> + <name>OpenSSO Agent and Server Packages</name> + + <dependencies> + <dependency> + <groupId>org.gatein.sso</groupId> + <artifactId>gatein-opensso-plugin</artifactId> + <version>trunk-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${version.commons-logging}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-5</version> + <configuration> + <descriptors> + <descriptor>src/main/assembly/src.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>make-assembly</id>  + <phase>package</phase>  + <goals> + <goal>single</goal>  + </goals> + </execution> + </executions> + + </plugin> + </plugins> + </build> + +</project> + Added: components/sso/trunk/opensso/gatein-opensso-portal/src/main/assembly/src.xml =================================================================== --- components/sso/trunk/opensso/gatein-opensso-portal/src/main/assembly/src.xml (rev 0) +++ components/sso/trunk/opensso/gatein-opensso-portal/src/main/assembly/src.xml 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,27 @@ +<assembly> + <includeBaseDirectory>false</includeBaseDirectory> + <formats> + <format>dir</format> + + </formats> + + <fileSets> + <fileSet> + + <directory>src/main/resources</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + + <dependencySets> + + <dependencySet> + + <outputDirectory>plugin/WEB-INF/lib</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + + </dependencySets> + +</assembly> \ No newline at end of file Added: components/sso/trunk/opensso/gatein-opensso-portal/src/main/resources/plugin/WEB-INF/classes/gatein.properties =================================================================== --- components/sso/trunk/opensso/gatein-opensso-portal/src/main/resources/plugin/WEB-INF/classes/gatein.properties (rev 0) +++ components/sso/trunk/opensso/gatein-opensso-portal/src/main/resources/plugin/WEB-INF/classes/gatein.properties 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,5 @@ +host=localhost + +port=8080 + +context=portal \ No newline at end of file Added: components/sso/trunk/opensso/gatein-opensso-portal/src/main/resources/plugin/config/auth/default/AuthenticationPlugin.xml =================================================================== --- components/sso/trunk/opensso/gatein-opensso-portal/src/main/resources/plugin/config/auth/default/AuthenticationPlugin.xml (rev 0) +++ components/sso/trunk/opensso/gatein-opensso-portal/src/main/resources/plugin/config/auth/default/AuthenticationPlugin.xml 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,20 @@ +<?xml version='1.0' encoding="UTF-8"?> + +<!DOCTYPE ModuleProperties PUBLIC "=//iPlanet//Authentication Module Properties XML Interface 1.0 DTD//EN" + "jar://com/sun/identity/authentication/Auth_Module_Properties.dtd"> + +<ModuleProperties moduleName="AuthenticationPlugin" version="1.0" > + <Callbacks length="2" order="1" timeout="60" + header="GateIn OpenSSO Login" > + <NameCallback> + <Prompt> + Username + </Prompt> + </NameCallback> + <PasswordCallback echoPassword="false" > + <Prompt> + Password + </Prompt> + </PasswordCallback> + </Callbacks> +</ModuleProperties> Added: components/sso/trunk/opensso/pom.xml =================================================================== --- components/sso/trunk/opensso/pom.xml (rev 0) +++ components/sso/trunk/opensso/pom.xml 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,34 @@ +<?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 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.gatein.sso</groupId> + <artifactId>opensso-parent</artifactId> + <version>trunk-SNAPSHOT</version> + <packaging>pom</packaging> + + <parent> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-parent</artifactId> + <version>trunk-SNAPSHOT</version> + </parent> + + + <name>Gatein - Single Sign On Integration (OpenSSO)</name> + <description>GateIn Single Sign On Integration (OpenSSO)</description> + + <modules> + <module>gatein-opensso-plugin</module> + <module>gatein-opensso-portal</module> + </modules> + +</project> Modified: components/sso/trunk/packaging/pom.xml =================================================================== --- components/sso/trunk/packaging/pom.xml 2010-02-11 08:06:44 UTC (rev 1628) +++ components/sso/trunk/packaging/pom.xml 2010-02-11 10:21:09 UTC (rev 1629) @@ -2,8 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.sso</groupId> - <artifactId>gatein-sso-parent</artifactId> - <relativePath>../pom.xml</relativePath> + <artifactId>sso-parent</artifactId> <version>trunk-SNAPSHOT</version> </parent> @@ -12,11 +11,27 @@ <packaging>pom</packaging> <name>Used for packaging deployable artifacts</name> - <modules> - <module>cas</module> - <module>opensso</module> - <module>josso</module> - </modules> - + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-5</version> + <configuration> + <descriptors> + <descriptor>src/main/assembly/src.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>make-assembly</id>  + <phase>package</phase>  + <goals> + <goal>single</goal>  + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> Deleted: components/sso/trunk/packaging/profiles.xml =================================================================== --- components/sso/trunk/packaging/profiles.xml 2010-02-11 08:06:44 UTC (rev 1628) +++ components/sso/trunk/packaging/profiles.xml 2010-02-11 10:21:09 UTC (rev 1629) @@ -1,73 +0,0 @@ - -<profilesXml> - <profiles> - <profile> - <id>gatein-cas-install</id> - <properties> -  - <gatein.location>/home/soshah/projects/gatein/runtime/jboss/server/default</gatein.location> - </properties> - </profile> - <profile> - <id>plugin-cas-install</id> - <properties> -  - <tomcat60.location>/home/soshah/projects/gatein/runtime/tomcat-cas-3.3.4</tomcat60.location> - </properties> - </profile> - - <profile> - <id>gatein-josso-install</id> - <properties> -  - <gatein.location>/home/soshah/projects/gatein/runtime/jboss/server/default</gatein.location> - </properties> - </profile> - <profile> - <id>plugin-josso-install</id> - <properties> -  - <tomcat60.location>/home/soshah/projects/gatein/runtime/tomcat-josso-1.8.1</tomcat60.location> - </properties> - </profile> - - <profile> - <id>gatein-opensso-install</id> - <properties> -  - <gatein.location>/home/soshah/projects/gatein/runtime/jboss/server/default</gatein.location> - </properties> - </profile> - <profile> - <id>plugin-opensso-install</id> - <properties> -  - <tomcat60.location>/home/soshah/projects/gatein/runtime/tomcat-opensso-8.0</tomcat60.location> - </properties> - </profile> - </profiles> - - <activeProfiles> - <activeProfile>gatein-cas-install</activeProfile> - <activeProfile>plugin-cas-install</activeProfile> - </activeProfiles> -</profilesXml> Added: components/sso/trunk/packaging/src/main/assembly/src.xml =================================================================== --- components/sso/trunk/packaging/src/main/assembly/src.xml (rev 0) +++ components/sso/trunk/packaging/src/main/assembly/src.xml 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,31 @@ +<assembly> + + <includeBaseDirectory>false</includeBaseDirectory> + + <formats> + <format>zip</format> + </formats> + + <fileSets> + <fileSet> + <directory>../cas/gatein-cas-portal/target/cas-pkg-trunk-SNAPSHOT/</directory> + <outputDirectory>sso/cas</outputDirectory> + </fileSet> + <fileSet> + <directory>../josso/gatein-josso-portal/target/josso-pkg-trunk-SNAPSHOT/</directory> + <outputDirectory>sso/josso</outputDirectory> + </fileSet> + </fileSets> +  +</assembly> \ No newline at end of file Added: components/sso/trunk/packaging/src/main/resources/README =================================================================== --- components/sso/trunk/packaging/src/main/resources/README (rev 0) +++ components/sso/trunk/packaging/src/main/resources/README 2010-02-11 10:21:09 UTC (rev 1629) @@ -0,0 +1,3 @@ +GateIn - SSO Integration + +Please refer to the GateIn Portal documentation for usage \ No newline at end of file

14 years, 11 months

1
0
0 / 0

gatein SVN: r1628 - portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBannerPortlet.

by do-not-reply＠jboss.org

Author: thuy.nguyen Date: 2010-02-11 03:06:44 -0500 (Thu, 11 Feb 2010) New Revision: 1628 Modified: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css Log: GTNPORTAL-600: Can't login portal when banner portal is checked Show infor bar Modified: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css =================================================================== --- portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css 2010-02-11 05:03:51 UTC (rev 1627) +++ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css 2010-02-11 08:06:44 UTC (rev 1628) @@ -22,7 +22,8 @@ } .UIBannerPortlet { - zoom: 100%; + zoom: 100%; + background: #B5B6B6; } .UIBannerPortlet .LeftBanner {

14 years, 11 months

1
0
0 / 0

gatein SVN: r1627 - in portal/trunk: webui/portal/src/main/java/org/exoplatform/portal/webui/page and 1 other directories.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2010-02-11 00:03:51 -0500 (Thu, 11 Feb 2010) New Revision: 1627 Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/SiteConfig.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java Log: GTNPORTAL-620: Exception while browse to a node with deleted page Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/SiteConfig.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/SiteConfig.java 2010-02-11 04:46:43 UTC (rev 1626) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/SiteConfig.java 2010-02-11 05:03:51 UTC (rev 1627) @@ -11,18 +11,29 @@ public class SiteConfig extends ModelObject { + final public static String USER_TYPE = "user"; + + final public static String GROUP_TYPE = "group"; + + final public static String PORTAL_TYPE = "portal"; + private String ownerType; private String ownerId; - private Container layout; - private PageNavigation navigation; + /** Access permissions on UI */ private String[] accessPermissions; + /** Edit permissions on UI */ private String editPermission; + /** Layout of the site */ + private Container siteLayout; + + private String siteSkin; + public SiteConfig(String _ownerType, String _ownerId, String storageId) { super(storageId); @@ -37,4 +48,23 @@ return null; } + public void setSiteLayout(Container _siteLayout) + { + this.siteLayout = _siteLayout; + } + + public Container getSiteLayout() + { + return this.siteLayout; + } + + public String getSiteSkin() + { + return this.siteSkin; + } + + public void setSiteSkin(String _siteSkin) + { + this.siteSkin = _siteSkin; + } } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2010-02-11 04:46:43 UTC (rev 1626) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2010-02-11 05:03:51 UTC (rev 1627) @@ -103,7 +103,16 @@ uiPortal.setMaximizedUIComponent(null); - uiPage = getUIPage(pageReference, page, uiPortal, context); + try + { + uiPage = getUIPage(pageReference, page, uiPortal, context); + } + catch (Exception ex) + { + // TODO: Print evokable message + setUIComponent(null); + return; + } if (uiPage.isShowMaxWindow()) { @@ -136,17 +145,20 @@ private UIPage getUIPage(String pageReference, Page page, UIPortal uiPortal, WebuiRequestContext context) throws Exception { + //The page has been deleted + if(page == null) + { + //Clear the UIPage from cache in UIPortal + uiPortal.clearUIPage(pageReference); + throw new Exception("The page with id " + pageReference + " has been removed"); + } + UIPage uiPage = uiPortal.getUIPage(pageReference); if (uiPage != null) { return uiPage; } - if(page == null) - { - return null; - } - if (Page.DESKTOP_PAGE.equals(page.getFactoryId())) { uiPage = createUIComponent(context, UIDesktopPage.class, null, null); @@ -173,6 +185,8 @@ maximizedUIComponent.processRender((WebuiRequestContext)WebuiRequestContext.getCurrentInstance()); return; } + + //TODO: Remove beneath block if (uicomponent_ == null) { setPageBody(Util.getUIPortal().getSelectedNode(), Util.getUIPortal()); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2010-02-11 04:46:43 UTC (rev 1626) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2010-02-11 05:03:51 UTC (rev 1627) @@ -277,7 +277,11 @@ int currentPage = datasource.getCurrentPage(); dataService.remove(page); - + //Minh Hoang TO: The cached UIPage objects corresponding to removed Page should be removed here. + //As we have multiple UIPortal, which means multiple caches of UIPage. It 's unwise to garbage + // all UIPage caches at once. Better solution is to clear UIPage on browsing to PageNode having Page + //removed + UIPortal uiPortal = Util.getUIPortal(); if (uiPortal.getSelectedNode().getPageReference().equals(page.getPageId())) { Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2010-02-11 04:46:43 UTC (rev 1626) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2010-02-11 05:03:51 UTC (rev 1627) @@ -219,6 +219,11 @@ this.all_UIPages.put(pageReference, uiPage); } + public void clearUIPage(String pageReference) + { + this.all_UIPages.remove(pageReference); + } + public void setNavigation(PageNavigation _navigation) { this.navigation = _navigation;

14 years, 11 months

1
0
0 / 0

gatein SVN: r1626 - portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard.

by do-not-reply＠jboss.org

Author: thuy.nguyen Date: 2010-02-10 23:46:43 -0500 (Wed, 10 Feb 2010) New Revision: 1626 Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css Log: GTNPORTAL-586: Broken CSS when the title of a gadget is too long in the dashboard Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2010-02-11 01:56:38 UTC (rev 1625) +++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2010-02-11 04:46:43 UTC (rev 1626) @@ -52,6 +52,7 @@ cursor: move; overflow: hidden; white-space: nowrap; + width: 200px; } .UIDashboard .UIDashboardEditForm {

14 years, 11 months

1
0
0 / 0

gatein SVN: r1625 - portal/trunk/docs/user-guide/en/images.

by do-not-reply＠jboss.org

Author: smumford Date: 2010-02-10 20:56:38 -0500 (Wed, 10 Feb 2010) New Revision: 1625 Modified: portal/trunk/docs/user-guide/en/images/Forgot1.png Log: Final QE changes Modified: portal/trunk/docs/user-guide/en/images/Forgot1.png =================================================================== (Binary files differ)

14 years, 11 months

1
0
0 / 0

gatein SVN: r1624 - portal/trunk/docs/user-guide/en/modules/account.

by do-not-reply＠jboss.org

Author: smumford Date: 2010-02-10 20:56:20 -0500 (Wed, 10 Feb 2010) New Revision: 1624 Modified: portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml Log: Final QE changes Modified: portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml 2010-02-11 01:55:25 UTC (rev 1623) +++ portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml 2010-02-11 01:56:20 UTC (rev 1624) @@ -25,12 +25,12 @@ --><title>Account and Password Retrieval</title> <para> - Should you forget your account or password you can recover it quickly by following these simple steps: + You can recover your username or password should you forget them by following these steps: </para> <procedure> <step> <para> - Click the link 'Forget your User Name/Password?' (beneath the <emphasis role="bold">Password</emphasis> field of the <emphasis role="bold">Sign in</emphasis> form). This presents the form that guides you through recovering your username and/or password. + Click the link '<emphasis role="bold">Forgot your User Name/Password?</emphasis>' (beneath the <emphasis role="bold">Password</emphasis> field of the <emphasis role="bold">Sign in</emphasis> form). This presents the form that guides you through recovering your username and/or password. </para> <mediaobject> <imageobject> @@ -70,7 +70,7 @@ <itemizedlist> <listitem> <para> - If you selected the <emphasis role="bold">Forgot my password</emphasis> option you will be prompted for your <emphasis role="bold">Username</emphasis>: + If you selected the <emphasis role="bold">Forgot my password</emphasis> option you will be prompted for your username: </para> <mediaobject> <imageobject> @@ -105,14 +105,8 @@ After you submit the form an email will be send to your email address with the requested information, either your username or password. </para> <para> - If you forgot your username, an old user name still is valid when retrieving username. + If you forgot your password you will be sent a new (temporary) password. Your original password will not be valid after this email is sent. You will be directed to update your password the next time you sign in. </para> - <para> - If you forgot your password you will be sent a new (temporary) password. You will be directed to change this password the next time you sign in. - </para> - <para> - 'Recovered' usernames or passwords are only valid for one (1) day after being sent. If these details are not used within this time a new retrieval/reset will be required. - </para> </section>

14 years, 11 months

1
0
0 / 0

gatein SVN: r1623 - portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US.

by do-not-reply＠jboss.org

Author: smumford Date: 2010-02-10 20:55:25 -0500 (Wed, 10 Feb 2010) New Revision: 1623 Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.ent Log: Final QE changes Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.ent =================================================================== --- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.ent 2010-02-11 01:51:38 UTC (rev 1622) +++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.ent 2010-02-11 01:55:25 UTC (rev 1623) @@ -1,4 +1,4 @@ -<!ENTITY PRODUCT "Enterprise Portal Platform 5.0"> +<!ENTITY PRODUCT "Enterprise Portal Platform"> <!ENTITY BOOKID "User Guide"> <!ENTITY YEAR "2010"> <!ENTITY HOLDER "Red Hat, Inc">

14 years, 11 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits February 2010