Author: saminda
Date: Sun Feb 10 10:08:50 2008
New Revision: 13525
Log:
1. Added root lib dir to distirbution
2. Added slf4j jar
3. clean up pom.xml; specially documentation
Modified:
trunk/solutions/identity/modules/distribution/pom.xml
trunk/solutions/identity/modules/distribution/src/assemble/assembly-bin.xml
trunk/solutions/identity/modules/distribution/src/assemble/assembly-src.xml
trunk/solutions/identity/modules/documentation/pom.xml
trunk/solutions/identity/pom.xml
Modified: trunk/solutions/identity/modules/distribution/pom.xml
==============================================================================
--- trunk/solutions/identity/modules/distribution/pom.xml (original)
+++ trunk/solutions/identity/modules/distribution/pom.xml Sun Feb 10
10:08:50 2008
@@ -82,7 +82,7 @@
<mkdir
dir="${basedir}/target/documentation" />
<copy todir="target/documentation"
filtering="on">
- <fileset
dir="../../target/site/documentation">
+ <fileset
dir="../documentation/target/site">
<include name="**/**.html"/>
<include name="**/**.css"/>
<include name="**/**.xsl"/>
@@ -90,7 +90,7 @@
</fileset>
</copy>
<copy todir="target/documentation">
- <fileset
dir="../../target/site/documentation">
+ <fileset
dir="../documentation/target/site">
<include name="**/**.png"/>
<include name="**/**.gif"/>
<include name="**/**.jpg"/>
Modified:
trunk/solutions/identity/modules/distribution/src/assemble/assembly-bin.xml
==============================================================================
--- trunk/solutions/identity/modules/distribution/src/assemble/assembly-bin.xml
(original)
+++ trunk/solutions/identity/modules/distribution/src/assemble/assembly-bin.xml
Sun Feb 10 10:08:50 2008
@@ -95,17 +95,17 @@
<include>org.eclipse.higgins:higgins-sts-common:jar</include>
<include>org.eclipse.higgins:higgins-sts-server-token-handler:jar</include>
<include>org.eclipse.higgins:higgins-sts-spi:jar</include>
-
- <!-- OpenSaml related jars -->
- <include>org.slf4j:slf4j-log4j12:jar</include>
- <include>org.slf4j:slf4j-simple:jar</include>
- <include>org.slf4j:slf4j-api:jar</include>
- <include>commons-lang:commons-lang:jar</include>
- <include>joda-time:joda-time:jar</include>
- <include>velocity:velocity:jar</include>
- <include>org.opensaml:opensaml:jar</include>
- <include>org.opensaml:openws:jar</include>
- <include>org.opensaml:xmltooling:jar</include>
+
+ <!-- OpenSaml related jars -->
+ <include>org.slf4j:slf4j-log4j12:jar</include>
+ <include>org.slf4j:slf4j-simple:jar</include>
+ <include>org.slf4j:slf4j-api:jar</include>
+ <include>commons-lang:commons-lang:jar</include>
+ <include>joda-time:joda-time:jar</include>
+ <include>velocity:velocity:jar</include>
+ <include>org.opensaml:opensaml:jar</include>
+ <include>org.opensaml:openws:jar</include>
+ <include>org.opensaml:xmltooling:jar</include>
</includes>
</dependencySet>
@@ -242,6 +242,11 @@
</includes>
</fileSet>
+ <fileSet>
+ <directory>../../lib</directory>
+ <outputDirectory>{identity.solution.home.dir}/lib</outputDirectory>
+ </fileSet>
+
</fileSets>
<files>
Modified:
trunk/solutions/identity/modules/distribution/src/assemble/assembly-src.xml
==============================================================================
--- trunk/solutions/identity/modules/distribution/src/assemble/assembly-src.xml
(original)
+++ trunk/solutions/identity/modules/distribution/src/assemble/assembly-src.xml
Sun Feb 10 10:08:50 2008
@@ -10,12 +10,14 @@
<directory>../..</directory>
<outputDirectory>wso2-identity-solution-src</outputDirectory>
<includes>
+ <include>etc</include>
+ <include>legal</include>
+ <include>lib</include>
<include>**/modules/**/*</include>
<include>**/pom.xml</include>
<include>LICENSE</include>
<include>NOTICE</include>
<include>README</include>
-
</includes>
<excludes>
<exclude>**/target</exclude>
Modified: trunk/solutions/identity/modules/documentation/pom.xml
==============================================================================
--- trunk/solutions/identity/modules/documentation/pom.xml (original)
+++ trunk/solutions/identity/modules/documentation/pom.xml Sun Feb 10
10:08:50 2008
@@ -32,44 +32,4 @@
</plugin>
</plugins>
</build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
-
<outputDirectory>../../target/site/${artifactId}</outputDirectory>
-
<reportsDirectory>target/surefire-reports</reportsDirectory>
- <outputName>${artifactId}-test-report</outputName>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
-
<outputDirectory>../../target/site/${artifactId}</outputDirectory>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>1.1.1</version>
- <configuration>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
</project>
Modified: trunk/solutions/identity/pom.xml
==============================================================================
--- trunk/solutions/identity/pom.xml (original)
+++ trunk/solutions/identity/pom.xml Sun Feb 10 10:08:50 2008
@@ -718,6 +718,12 @@
<artifactId>higgins-sts-spi</artifactId>
<version>SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.0.1</version>
+ </dependency>
</dependencies>
@@ -812,6 +818,7 @@
<usermanager.version>SNAPSHOT</usermanager.version>
<rampart.version>SNAPSHOT</rampart.version>
<wss4j.version>SNAPSHOT</wss4j.version>
+ <axiom.version>SNAPSHOT</axiom.version>
<wsas.version>2.2</wsas.version>
<axis2.version>1.3</axis2.version>
@@ -822,7 +829,6 @@
<opensaml.version>1.1.406</opensaml.version>
<woden.version>1.0-incubating-M7b</woden.version>
<xmlsec.version>534045-patched</xmlsec.version>
- <axiom.version>1.2.4</axiom.version>
<wsdl4j.version>1.6.1</wsdl4j.version>
<annogen.version>0.1.0</annogen.version>
<javamail.version>1.4</javamail.version>
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
