fix distribution

sbryzak · Jan 2, 2011 · c8c42bc · c8c42bc
1 parent 1824b70
commit c8c42bc
Show file tree

Hide file tree

Showing 8 changed files with 122 additions and 16 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -17,8 +17,7 @@
 
       <dependency>
          <groupId>org.jboss.seam.persistence</groupId>
-         <artifactId>seam-persistence-api</artifactId>
-         <version>3.0.0.Beta1</version>
+         <artifactId>seam-persistence</artifactId>
       </dependency>
 
       <dependency>

diff --git a/dist/pom.xml b/dist/pom.xml
@@ -19,6 +19,7 @@
    </properties>
 
    <dependencies>
+      <!-- Libraries -->
       <dependency>
          <groupId>org.jboss.seam.security</groupId>
          <artifactId>seam-security-api</artifactId>
@@ -31,6 +32,14 @@
          <optional>true</optional>
       </dependency>
 
+      <dependency>
+         <groupId>org.jboss.seam.security</groupId>
+         <artifactId>seam-security-external</artifactId>
+         <optional>true</optional>
+      </dependency>
+
+      <!-- Source -->
+
       <dependency>
          <groupId>org.jboss.seam.security</groupId>
          <artifactId>seam-security-api</artifactId>
@@ -39,6 +48,22 @@
          <optional>true</optional>
       </dependency>
 
+      <dependency>
+         <groupId>org.jboss.seam.security</groupId>
+         <artifactId>seam-security-impl</artifactId>
+         <version>${project.version}</version>
+         <classifier>sources</classifier>
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.seam.security</groupId>
+         <artifactId>seam-security-external</artifactId>
+         <version>${project.version}</version>
+         <classifier>sources</classifier>
+      </dependency>      
+
+      <!-- Javadoc -->
+
       <dependency>
          <groupId>org.jboss.seam.security</groupId>
          <artifactId>seam-security-api</artifactId>
@@ -47,21 +72,23 @@
          <optional>true</optional>
       </dependency>
 
-
       <dependency>
          <groupId>org.jboss.seam.security</groupId>
          <artifactId>seam-security-impl</artifactId>
          <version>${project.version}</version>
-         <classifier>sources</classifier>
+         <classifier>javadoc</classifier>
+         <optional>true</optional>
       </dependency>
 
       <dependency>
          <groupId>org.jboss.seam.security</groupId>
-         <artifactId>seam-security-impl</artifactId>
+         <artifactId>seam-security-external</artifactId>
          <version>${project.version}</version>
          <classifier>javadoc</classifier>
          <optional>true</optional>
       </dependency>
+
+      <!-- Reference docs -->
 
       <!--dependency>
          <groupId>org.jboss.seam.security</groupId>
@@ -70,22 +97,48 @@
          <type>war</type>
          <optional>true</optional>
       </dependency-->
+
+      <!-- Examples -->
 
-      <!--dependency>
+      <dependency>
          <groupId>org.jboss.seam.security</groupId>
-         <artifactId>seam-security-seamspace-example</artifactId>
+         <artifactId>seam-security-idmconsole-example</artifactId>
          <version>${project.version}</version>
-         <type>zip</type>
+         <type>war</type>
          <optional>true</optional>
-      </dependency-->
-
+      </dependency>
+      
       <dependency>
          <groupId>org.jboss.seam.security</groupId>
-         <artifactId>seam-security-idmconsole-example</artifactId>
+         <artifactId>openid-op</artifactId>
+         <version>${project.version}</version>
+         <type>war</type>
+         <optional>true</optional>
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.seam.security</groupId>
+         <artifactId>openid-rp</artifactId>
+         <version>${project.version}</version>
+         <type>war</type>
+         <optional>true</optional>
+      </dependency>  
+
+      <dependency>
+         <groupId>org.jboss.seam.security</groupId>
+         <artifactId>saml-idp</artifactId>
          <version>${project.version}</version>
          <type>war</type>
          <optional>true</optional>
       </dependency>
+
+      <dependency>
+         <groupId>org.jboss.seam.security</groupId>
+         <artifactId>saml-sp</artifactId>
+         <version>${project.version}</version>
+         <type>war</type>
+         <optional>true</optional>
+      </dependency>                
 
    </dependencies>
 

diff --git a/dist/src/main/assembly/assembly.xml b/dist/src/main/assembly/assembly.xml
@@ -29,6 +29,7 @@
          <includes>
             <include>org.jboss.seam.security:seam-security-api</include>
             <include>org.jboss.seam.security:seam-security-impl</include>
+            <include>org.jboss.seam.security:seam-security-external</include>
          </includes>
          <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
       </dependencySet>
@@ -57,11 +58,46 @@
          <unpack>true</unpack>
          <useProjectArtifact>false</useProjectArtifact>
          <includes>
-            <!--include>org.jboss.seam.security:seam-security-seamspace-example</include-->
             <include>org.jboss.seam.security:seam-security-idmconsole-example</include>
          </includes>
       </dependencySet>
+      <dependencySet>
+         <outputDirectory>examples/openid-op</outputDirectory>
+         <unpack>true</unpack>
+         <useProjectArtifact>false</useProjectArtifact>
+         <includes>
+            <include>org.jboss.seam.security:openid-op</include>
+         </includes>
+      </dependencySet>
+      <dependencySet>
+         <outputDirectory>examples/openid-rp</outputDirectory>
+         <unpack>true</unpack>
+         <useProjectArtifact>false</useProjectArtifact>
+         <includes>
+            <include>org.jboss.seam.security:openid-rp</include>
+         </includes>
+      </dependencySet>
+
+      <dependencySet>
+         <outputDirectory>examples/saml-idp</outputDirectory>
+         <unpack>true</unpack>
+         <useProjectArtifact>false</useProjectArtifact>
+         <includes>
+            <include>org.jboss.seam.security:saml-idp</include>
+         </includes>
+      </dependencySet>
+
+      <dependencySet>
+         <outputDirectory>examples/saml-sp</outputDirectory>
+         <unpack>true</unpack>
+         <useProjectArtifact>false</useProjectArtifact>
+         <includes>
+            <include>org.jboss.seam.security:saml-sp</include>
+         </includes>
+      </dependencySet>      
+
       <!-- Pull in docbook artifacts -->
+
       <dependencySet>
          <outputDirectory>doc/reference</outputDirectory>
          <unpack>true</unpack>

diff --git a/examples/openid-op/pom.xml b/examples/openid-op/pom.xml
@@ -35,7 +35,6 @@
       <dependency>
          <groupId>org.jboss.seam.servlet</groupId>
          <artifactId>seam-servlet</artifactId>
-         <version>3.0.0.Alpha3</version>
       </dependency>
 
       <dependency>

diff --git a/examples/openid-rp/pom.xml b/examples/openid-rp/pom.xml
@@ -35,7 +35,6 @@
       <dependency>
          <groupId>org.jboss.seam.servlet</groupId>
          <artifactId>seam-servlet</artifactId>
-         <version>3.0.0.Alpha3</version>
       </dependency>
 
       <dependency>

diff --git a/external/pom.xml b/external/pom.xml
@@ -63,7 +63,6 @@
       <dependency>
          <groupId>org.jboss.seam.servlet</groupId>
          <artifactId>seam-servlet</artifactId>
-         <version>3.0.0.Alpha3</version>
       </dependency>
 
       <dependency>

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -144,7 +144,6 @@
       <dependency>
          <groupId>org.jboss.seam.persistence</groupId>
          <artifactId>seam-persistence</artifactId>
-         <version>3.0.0.Beta2</version>
          <optional>true</optional>
       </dependency>
 

diff --git a/pom.xml b/pom.xml
@@ -51,6 +51,24 @@
             <version>${project.version}</version>
          </dependency>
 
+         <dependency>
+            <groupId>org.jboss.seam.security</groupId>
+            <artifactId>seam-security-external</artifactId>
+            <version>${project.version}</version>
+         </dependency>
+
+         <dependency>
+            <groupId>org.jboss.seam.persistence</groupId>
+            <artifactId>seam-persistence</artifactId>
+            <version>3.0.0.Beta2</version>
+         </dependency>
+
+         <dependency>
+            <groupId>org.jboss.seam.servlet</groupId>
+            <artifactId>seam-servlet</artifactId>
+            <version>3.0.0.Alpha3</version>
+         </dependency>
+
       </dependencies>
    </dependencyManagement>
 
@@ -66,6 +84,10 @@
             <module>dist</module>
             <module>docs</module>
             <module>examples/idmconsole</module>
+            <module>examples/openid-op</module>
+            <module>examples/openid-rp</module>
+            <module>examples/saml-idp</module>
+            <module>examples/saml-sp</module>            
          </modules>
       </profile>
    </profiles>