Author: saminda
Date: Sun Jan 13 23:34:15 2008
New Revision: 611729
URL: http://svn.apache.org/viewvc?rev=611729&view=rev
Log:
1. Fixed the disbribution
2. Fixed poms
3. Inorder to build the distribtuion use mvn clean install -Drelease
Added:
webservices/rampart/trunk/java/modules/distribution/
webservices/rampart/trunk/java/modules/distribution/bin.xml
webservices/rampart/trunk/java/modules/distribution/pom.xml
webservices/rampart/trunk/java/modules/distribution/src.xml
Modified:
webservices/rampart/trunk/java/modules/rampart-core/pom.xml
webservices/rampart/trunk/java/modules/rampart-mar/pom.xml
webservices/rampart/trunk/java/modules/rampart-policy/pom.xml
webservices/rampart/trunk/java/modules/rampart-tests/pom.xml
webservices/rampart/trunk/java/modules/rampart-trust-mar/pom.xml
webservices/rampart/trunk/java/modules/rampart-trust/pom.xml
webservices/rampart/trunk/java/pom.xml
Added: webservices/rampart/trunk/java/modules/distribution/bin.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/distribution/bin.xml?rev=611729&view=auto
==============================================================================
--- webservices/rampart/trunk/java/modules/distribution/bin.xml (added)
+++ webservices/rampart/trunk/java/modules/distribution/bin.xml Sun Jan 13
23:34:15 2008
@@ -0,0 +1,66 @@
+<assembly>
+ <id>bin</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>${dist.dir}/modules</outputDirectory>
+ <includes>
+ <include>org.apache.rampart:rampart:mar</include>
+ <include>org.apache.rampart:rahas:mar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>${dist.dir}/lib</outputDirectory>
+ <excludes>
+ <exclude>org.apache.rampart:*:*:*</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>${dist.dir}/lib</outputDirectory>
+ <includes>
+ <include>org.apache.rampart:rampart-core:jar</include>
+ <include>org.apache.rampart:rampart-policy:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>target/apidocs</directory>
+ <outputDirectory>${dist.dir}/docs/apidocs</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../../target/site</directory>
+ <outputDirectory>${dist.dir}/docs</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../rampart-samples</directory>
+ <outputDirectory>${dist.dir}/samples</outputDirectory>
+ </fileSet>
+ </fileSets>
+
+ <files>
+ <file>
+ <source>../../release-docs/README.txt</source>
+ <outputDirectory>${dist.dir}</outputDirectory>
+ <destName>README</destName>
+ </file>
+ <file>
+ <source>../../release-docs/LICENSE.txt</source>
+ <outputDirectory>${dist.dir}</outputDirectory>
+ <destName>LICENSE</destName>
+ </file>
+ <file>
+ <source>../../release-docs/NOTICE.txt</source>
+ <outputDirectory>${dist.dir}</outputDirectory>
+ <destName>NOTICE</destName>
+ </file>
+ <file>
+ <source>../../release-docs/release-notes.html</source>
+ <outputDirectory>${dist.dir}</outputDirectory>
+ </file>
+ </files>
+
+</assembly>
Added: webservices/rampart/trunk/java/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/distribution/pom.xml?rev=611729&view=auto
==============================================================================
--- webservices/rampart/trunk/java/modules/distribution/pom.xml (added)
+++ webservices/rampart/trunk/java/modules/distribution/pom.xml Sun Jan 13
23:34:15 2008
@@ -0,0 +1,109 @@
+<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.apache.rampart</groupId>
+ <artifactId>rampart-project</artifactId>
+ <version>SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>rampart-dist</artifactId>
+ <packaging>pom</packaging>
+ <name>Rampart - Distribution</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>build-javadoc</id>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <javadoc packagenames="org.apache.rampart.*"
+ destdir="target/apidocs"
+ author="true"
+ breakiterator="true"
+ version="true"
+ use="true"
+ windowtitle="Apache Rampart API">
+
+ <sourcepath>
+ <dirset dir="../..">
+ <include
name="**/rampart-core/src/main/java"/>
+ <include
name="**/rampart-policy/src/main/java"/>
+ <include
name="**/rampart-trust/src/main/java"/>
+ </dirset>
+ </sourcepath>
+
+ <classpath
refid="maven.dependency.classpath"/>
+ <classpath
refid="maven.compile.classpath"/>
+ <classpath
refid="maven.runtime.classpath"/>
+
+ </javadoc>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-1</version>
+ <executions>
+ <execution>
+ <id>distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>bin.xml</descriptor>
+ <descriptor>src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart</artifactId>
+ <version>${rampart.mar.version}</version>
+ <type>mar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rahas</artifactId>
+ <version>${rahas.mar.version}</version>
+ <type>mar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-policy</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-trust</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: webservices/rampart/trunk/java/modules/distribution/src.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/distribution/src.xml?rev=611729&view=auto
==============================================================================
--- webservices/rampart/trunk/java/modules/distribution/src.xml (added)
+++ webservices/rampart/trunk/java/modules/distribution/src.xml Sun Jan 13
23:34:15 2008
@@ -0,0 +1,34 @@
+<assembly>
+ <id>src</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>../..</directory>
+ <outputDirectory>rampart-src-${rampart.version}</outputDirectory>
+ <includes>
+ <include>**/modules/**/*</include>
+ <include>**/pom.xml</include>
+ <include>src</include>
+ <include>release-docs</include>
+ </includes>
+ <excludes>
+ <exclude>**/target</exclude>
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/build</exclude>
+ <exclude>**/build/**/*</exclude>
+ <exclude>**/.settings</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.wtpmodules</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/.settings</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <exclude>**/.svn/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
Modified: webservices/rampart/trunk/java/modules/rampart-core/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/pom.xml?rev=611729&r1=611728&r2=611729&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-core/pom.xml (original)
+++ webservices/rampart/trunk/java/modules/rampart-core/pom.xml Sun Jan 13
23:34:15 2008
@@ -11,7 +11,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>rampart-core</artifactId>
<packaging>jar</packaging>
- <version>SNAPSHOT</version>
<name>Rampart - Core</name>
<build>
@@ -33,14 +32,14 @@
</plugin>
</plugins>
</build>
-
+
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
<version>${pom.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
<version>${pom.version}</version>
@@ -48,15 +47,15 @@
</dependencies>
<reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <templateDirectory>${basedir}</templateDirectory>
- <menu ref="parent" />
- </configuration>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <templateDirectory>${basedir}</templateDirectory>
+ <menu ref="parent"/>
+ </configuration>
+ </plugin>
+ </plugins>
</reporting>
</project>
Modified: webservices/rampart/trunk/java/modules/rampart-mar/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-mar/pom.xml?rev=611729&r1=611728&r2=611729&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-mar/pom.xml (original)
+++ webservices/rampart/trunk/java/modules/rampart-mar/pom.xml Sun Jan 13
23:34:15 2008
@@ -11,7 +11,7 @@
<groupId>org.apache.rampart</groupId>
<artifactId>rampart</artifactId>
<packaging>mar</packaging>
- <version>${rampart.mar.version}</version>
+ <version>${rampart.mar.version}</version><!-- TODO need to remove this-->
<name>Rampart - Mar</name>
<scm>
@@ -55,12 +55,12 @@
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
- <version>${rampart.version}</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
- <version>${rampart.version}</version>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
Modified: webservices/rampart/trunk/java/modules/rampart-policy/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/pom.xml?rev=611729&r1=611728&r2=611729&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/pom.xml (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/pom.xml Sun Jan 13
23:34:15 2008
@@ -11,7 +11,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>rampart-policy</artifactId>
<packaging>jar</packaging>
- <version>SNAPSHOT</version>
<name>Rampart - Policy</name>
<build>
@@ -35,16 +34,16 @@
</build>
<reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <templateDirectory>${basedir}</templateDirectory>
- <menu ref="parent" />
- </configuration>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <templateDirectory>${basedir}</templateDirectory>
+ <menu ref="parent"/>
+ </configuration>
+ </plugin>
+ </plugins>
</reporting>
-
+
</project>
Modified: webservices/rampart/trunk/java/modules/rampart-tests/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-tests/pom.xml?rev=611729&r1=611728&r2=611729&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-tests/pom.xml (original)
+++ webservices/rampart/trunk/java/modules/rampart-tests/pom.xml Sun Jan 13
23:34:15 2008
@@ -11,7 +11,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>rampart-tests</artifactId>
<packaging>jar</packaging>
- <version>SNAPSHOT</version>
<name>Rampart - Test Suite</name>
<build>
@@ -38,19 +37,19 @@
</plugin>
</plugins>
</build>
-
+
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
<version>${pom.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
<version>${pom.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-core</artifactId>
<version>${pom.version}</version>
@@ -58,16 +57,16 @@
</dependencies>
<reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <templateDirectory>${basedir}</templateDirectory>
- <menu ref="parent" />
- </configuration>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <templateDirectory>${basedir}</templateDirectory>
+ <menu ref="parent"/>
+ </configuration>
+ </plugin>
+ </plugins>
</reporting>
-
+
</project>
Modified: webservices/rampart/trunk/java/modules/rampart-trust-mar/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust-mar/pom.xml?rev=611729&r1=611728&r2=611729&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-trust-mar/pom.xml (original)
+++ webservices/rampart/trunk/java/modules/rampart-trust-mar/pom.xml Sun Jan 13
23:34:15 2008
@@ -12,7 +12,7 @@
<groupId>org.apache.rampart</groupId>
<artifactId>rahas</artifactId>
<packaging>mar</packaging>
- <version>${rahas.mar.version}</version>
+ <version>${rahas.mar.version}</version><!-- TODO need to remove this-->
<name>Rampart - Trust-Mar</name>
<scm>
@@ -56,12 +56,12 @@
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
- <version>${rampart.version}</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
- <version>${rampart.version}</version>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
Modified: webservices/rampart/trunk/java/modules/rampart-trust/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust/pom.xml?rev=611729&r1=611728&r2=611729&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-trust/pom.xml (original)
+++ webservices/rampart/trunk/java/modules/rampart-trust/pom.xml Sun Jan 13
23:34:15 2008
@@ -11,7 +11,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>rampart-trust</artifactId>
<packaging>jar</packaging>
- <version>SNAPSHOT</version>
<name>Rampart - Trust</name>
<build>
@@ -36,11 +35,11 @@
<target>1.4</target>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</build>
-
+
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
<version>${pom.version}</version>
@@ -48,16 +47,16 @@
</dependencies>
<reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <templateDirectory>${basedir}</templateDirectory>
- <menu ref="parent" />
- </configuration>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <templateDirectory>${basedir}</templateDirectory>
+ <menu ref="parent"/>
+ </configuration>
+ </plugin>
+ </plugins>
</reporting>
</project>
Modified: webservices/rampart/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/pom.xml?rev=611729&r1=611728&r2=611729&view=diff
==============================================================================
--- webservices/rampart/trunk/java/pom.xml (original)
+++ webservices/rampart/trunk/java/pom.xml Sun Jan 13 23:34:15 2008
@@ -302,15 +302,15 @@
<artifactId>xml-apis</artifactId>
<version>${xml.apis.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.woden</groupId>
- <artifactId>woden-api</artifactId>
- <version>${woden.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.woden</groupId>
- <artifactId>woden-impl-dom</artifactId>
- <version>${woden.version}</version>
+ <dependency>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden-api</artifactId>
+ <version>${woden.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden-impl-dom</artifactId>
+ <version>${woden.version}</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
@@ -456,6 +456,36 @@
</dependencies>
</profile>
+ <profile>
+ <id>distribution</id>
+ <activation>
+ <property>
+ <name>release</name>
+ </property>
+ </activation>
+ <modules>
+ <module>modules/distribution</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-5</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
<modules>
@@ -473,28 +503,23 @@
<rampart.mar.version>SNAPSHOT</rampart.mar.version>
<rahas.mar.version>SNAPSHOT</rahas.mar.version>
<axis2.version>SNAPSHOT</axis2.version>
-
+ <neethi.version>SNAPSHOT</neethi.version>
<axiom.version>SNAPSHOT</axiom.version>
+ <wss4j.version>SNAPSHOT</wss4j.version>
+ <woden.version>1.0-incubating-SNAPSHOT</woden.version>
<addressing.mar.version>SNAPSHOT</addressing.mar.version>
- <wss4j.version>SNAPSHOT</wss4j.version>
<xmlsec.version>1.4.0</xmlsec.version>
-
<opensaml.version>1.1</opensaml.version>
-
<XmlSchema.version>1.3.1</XmlSchema.version>
- <neethi.version>SNAPSHOT</neethi.version>
<xbean.version>2.1.0</xbean.version>
- <woden.version>1.0-incubating-SNAPSHOT</woden.version>
<wsdl4j.version>1.6.1</wsdl4j.version>
<annogen.version>0.1.0</annogen.version>
<activation.version>1.1</activation.version>
<javamail.version>1.4</javamail.version>
-
<jaxen.version>1.1-beta-10</jaxen.version>
-
<stax.impl.groupid>org.codehaus.woodstox</stax.impl.groupid>
<stax.impl.artifactid>wstx-asl</stax.impl.artifactid>
<stax.impl.version>3.2.0</stax.impl.version>
@@ -524,6 +549,9 @@
<xalan.version>2.7.0</xalan.version>
<xerces.version>2.8.1</xerces.version>
+
+ <!-- distribution properties -->
+ <dist.dir>rampart-${pom.version}</dist.dir>
</properties>
<distributionManagement>
