Author: thomas.heute(a)jboss.com Date: 2010-02-11 07:59:00 -0500 (Thu, 11 Feb 2010) New Revision: 1633 Modified: components/sso/trunk/cas/gatein-cas-portal/pom.xml components/sso/trunk/cas/gatein-cas-portal/src/main/assembly/src.xml components/sso/trunk/josso/gatein-josso-portal/pom.xml components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml components/sso/trunk/opensso/gatein-opensso-portal/pom.xml components/sso/trunk/opensso/gatein-opensso-portal/src/main/assembly/src.xml Log: Fixing assemblies Modified: components/sso/trunk/cas/gatein-cas-portal/pom.xml =================================================================== --- components/sso/trunk/cas/gatein-cas-portal/pom.xml 2010-02-11 12:28:04 UTC (rev 1632) +++ components/sso/trunk/cas/gatein-cas-portal/pom.xml 2010-02-11 12:59:00 UTC (rev 1633) @@ -21,6 +21,21 @@ <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </dependency> + <dependency> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-agent</artifactId> + <version>trunk-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-auth-callback</artifactId> + <version>trunk-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jasig.cas</groupId> + <artifactId>cas-client-core</artifactId> + <version>${version.cas.client}</version> + </dependency> </dependencies> <build> Modified: components/sso/trunk/cas/gatein-cas-portal/src/main/assembly/src.xml =================================================================== --- components/sso/trunk/cas/gatein-cas-portal/src/main/assembly/src.xml 2010-02-11 12:28:04 UTC (rev 1632) +++ components/sso/trunk/cas/gatein-cas-portal/src/main/assembly/src.xml 2010-02-11 12:59:00 UTC (rev 1633) @@ -1,27 +1,39 @@ <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.gatein.sso:sso-agent</include> + <include>org.gatein.sso:sso-auth-callback</include> + <include>org.jasig.cas:cas-client-core</include> + </includes> + </dependencySet> + + <dependencySet> + <outputDirectory>plugin/WEB-INF/lib</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <includes> + <include>org.gatein.sso:sso-cas-plugin</include> + <include>commons-httpclient:commons-httpclient</include> + </includes> + </dependencySet> + </dependencySets> + </assembly> \ No newline at end of file Modified: components/sso/trunk/josso/gatein-josso-portal/pom.xml =================================================================== --- components/sso/trunk/josso/gatein-josso-portal/pom.xml 2010-02-11 12:28:04 UTC (rev 1632) +++ components/sso/trunk/josso/gatein-josso-portal/pom.xml 2010-02-11 12:59:00 UTC (rev 1633) @@ -52,6 +52,16 @@ <artifactId>xbean-spring</artifactId> <version>3.4.3</version> </dependency> + <dependency> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-agent</artifactId> + <version>trunk-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-auth-callback</artifactId> + <version>trunk-SNAPSHOT</version> + </dependency> <dependency> <groupId>commons-httpclient</groupId> 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 12:28:04 UTC (rev 1632) +++ components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml 2010-02-11 12:59:00 UTC (rev 1633) @@ -28,6 +28,8 @@ <include>commons-discovery:commons-discovery</include> <include>org.apache.axis:axis</include> <include>org.apache.xbean:xbean-spring</include> + <include>org.gatein.sso:sso-agent</include> + <include>org.gatein.sso:sso-auth-callback</include> </includes> </dependencySet> Modified: components/sso/trunk/opensso/gatein-opensso-portal/pom.xml =================================================================== --- components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2010-02-11 12:28:04 UTC (rev 1632) +++ components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2010-02-11 12:59:00 UTC (rev 1633) @@ -26,6 +26,16 @@ <artifactId>commons-logging</artifactId> <version>${version.commons-logging}</version> </dependency> + <dependency> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-agent</artifactId> + <version>trunk-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-auth-callback</artifactId> + <version>trunk-SNAPSHOT</version> + </dependency> </dependencies> <build> Modified: components/sso/trunk/opensso/gatein-opensso-portal/src/main/assembly/src.xml =================================================================== --- components/sso/trunk/opensso/gatein-opensso-portal/src/main/assembly/src.xml 2010-02-11 12:28:04 UTC (rev 1632) +++ components/sso/trunk/opensso/gatein-opensso-portal/src/main/assembly/src.xml 2010-02-11 12:59:00 UTC (rev 1633) @@ -1,27 +1,41 @@ <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> + <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.gatein.sso:sso-agent</include> + <include>org.gatein.sso:sso-auth-callback</include> + </includes> + </dependencySet> + + <dependencySet> + <outputDirectory>plugin/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-opensso-plugin</include> + </includes> + </dependencySet> + + </dependencySets> + </assembly> \ No newline at end of file