You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by el...@apache.org on 2009/09/30 10:46:37 UTC
svn commit: r820209 - in /incubator/wink/trunk: pom.xml
wink-examples/client/GoogleDocs-client/pom.xml
wink-scripts/wink-dist/build.xml wink-scripts/wink-dist/pom.xml
Author: elman
Date: Wed Sep 30 08:46:37 2009
New Revision: 820209
URL: http://svn.apache.org/viewvc?rev=820209&view=rev
Log:
update distribution scripts according to WINK-183
Modified:
incubator/wink/trunk/pom.xml
incubator/wink/trunk/wink-examples/client/GoogleDocs-client/pom.xml
incubator/wink/trunk/wink-scripts/wink-dist/build.xml
incubator/wink/trunk/wink-scripts/wink-dist/pom.xml
Modified: incubator/wink/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/pom.xml?rev=820209&r1=820208&r2=820209&view=diff
==============================================================================
--- incubator/wink/trunk/pom.xml (original)
+++ incubator/wink/trunk/pom.xml Wed Sep 30 08:46:37 2009
@@ -1,560 +1,561 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- Licensed to the Apache Software Foundation (ASF) under one or
- more contributor license agreements. See the NOTICE file
- distributed with this work for additional information regarding
- copyright ownership. The ASF licenses this file to you under the
- Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain
- a copy of the License at
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to you under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed
- under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions
- and limitations under the License.
- -->
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+ -->
-<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.apache.wink</groupId>
- <artifactId>wink</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Apache Wink</name>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>6</version>
- </parent>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <javadoc.aggregate>true</javadoc.aggregate>
- <javadoc.exclude.patterns>*.internal:org.apache.wink.example.*</javadoc.exclude.patterns>
- <maven.compile.source>1.5</maven.compile.source>
- <maven.compile.target>1.5</maven.compile.target>
- </properties>
- <modules>
- <module>wink-component-test-support</module>
- <module>wink-common</module>
- <module>wink-server</module>
- <module>wink-client</module>
- <module>wink-client-apache-httpclient</module>
- <module>wink-spring-support</module>
- <module>wink-webdav</module>
- <module>wink-providers</module>
- <module>wink-examples</module>
- <module>wink-scripts</module>
- </modules>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/wink/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/wink/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/wink/trunk</url>
- </scm>
- <build>
- <plugins>
- <plugin>
- <groupId>com.google.code.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <header>src/etc/header.txt</header>
- <quiet>false</quiet>
- <failIfMissing>true</failIfMissing>
- <aggregate>true</aggregate>
- <includes>
- <include>**/src/**</include>
- <include>**/*.xml</include>
- </includes>
- <excludes>
- <exclude>**/*.txt</exclude>
- <exclude>**/*.docx</exclude>
- <exclude>**/*.pdf</exclude>
- <exclude>javax.ws.rs.ext.RuntimeDelegate</exclude>
- </excludes>
- <useDefaultExcludes>true</useDefaultExcludes>
- <mapping>
- <app>SCRIPT_STYLE</app>
- </mapping>
- <useDefaultMapping>true</useDefaultMapping>
- <encoding>UTF-8</encoding>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>verify-legal-files</goal>
- </goals>
- <configuration>
- <strict>true</strict>
- <searchPaths>
- <searchPath>apache-wink-${project.version}</searchPath>
- <searchPath>apache-wink-${project.version}-src</searchPath>
- <searchPath>meta-inf</searchPath>
- <searchPath>META-INF</searchPath>
- </searchPaths>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.google.code.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
- <version>1.4.0</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1-alpha-2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <!--
- Override dependencies to use Ant 1.7.0 with
- regular expressions and maven support
- -->
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-apache-regexp</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact-ant</artifactId>
- <version>2.0.4</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${maven.compile.source}</source>
- <target>${maven.compile.target}</target>
- <encoding>UTF-8</encoding>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>report-only</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
- <wtpversion>1.5</wtpversion>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.15</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifest-entries>
- <X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK>
- </manifest-entries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <!--
- HACK: Include legal files explicity,
- otherwise they will end up in the wrong path
- or in another jar file in the war. NOTE:
- targetPath is broken for webResources (as
- documented)
- -->
- <webResources>
- <resource>
- <directory>${project.build.outputDirectory}</directory>
- <includes>
- <include>META-INF/LICENSE*</include>
- <include>META-INF/NOTICE*</include>
- <include>META-INF/DISCLAIMER*</include>
- <include>META-INF/DEPENDENCIES*</include>
- </includes>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.apache.org/repos/asf/incubator/wink/tags</tagBase>
- <preparationGoals>clean install</preparationGoals>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
+<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.apache.wink</groupId>
+ <artifactId>wink</artifactId>
+ <version>0.2-incubating-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Apache Wink</name>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>6</version>
+ </parent>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <javadoc.aggregate>true</javadoc.aggregate>
+ <javadoc.exclude.patterns>*.internal:org.apache.wink.example.*</javadoc.exclude.patterns>
+ <maven.compile.source>1.5</maven.compile.source>
+ <maven.compile.target>1.5</maven.compile.target>
+ </properties>
+ <modules>
+ <module>wink-component-test-support</module>
+ <module>wink-common</module>
+ <module>wink-server</module>
+ <module>wink-client</module>
+ <module>wink-client-apache-httpclient</module>
+ <module>wink-spring-support</module>
+ <module>wink-webdav</module>
+ <module>wink-providers</module>
+ <module>wink-examples</module>
+ <module>wink-scripts</module>
+ </modules>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/wink/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/wink/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/incubator/wink/trunk</url>
+ </scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.google.code.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ <inherited>false</inherited>
+ <configuration>
+ <header>src/etc/header.txt</header>
+ <quiet>false</quiet>
+ <failIfMissing>true</failIfMissing>
+ <aggregate>true</aggregate>
+ <includes>
+ <include>**/src/**</include>
+ <include>**/*.xml</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.txt</exclude>
+ <exclude>**/*.docx</exclude>
+ <exclude>**/*.pdf</exclude>
+ <exclude>javax.ws.rs.ext.RuntimeDelegate</exclude>
+ </excludes>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <mapping>
+ <app>SCRIPT_STYLE</app>
+ </mapping>
+ <useDefaultMapping>true</useDefaultMapping>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <strict>true</strict>
+ <searchPaths>
+ <searchPath>apache-wink-${project.version}</searchPath>
+ <searchPath>apache-wink-${project.version}-src</searchPath>
+ <searchPath>meta-inf</searchPath>
+ <searchPath>META-INF</searchPath>
+ </searchPaths>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>com.google.code.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ <version>1.4.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <version>1.0-alpha-1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1-alpha-2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <!--
+ Override dependencies to use Ant 1.7.0 with regular expressions
+ and maven support
+ -->
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-regexp</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-ant</artifactId>
+ <version>2.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>${maven.compile.source}</source>
+ <target>${maven.compile.target}</target>
+ <encoding>UTF-8</encoding>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>report-only</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.5.1</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
+ <wtpversion>1.5</wtpversion>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.15</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifest-entries>
+ <X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
+ <X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK>
+ </manifest-entries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <!--
+ HACK: Include legal files explicity, otherwise they will end up
+ in the wrong path or in another jar file in the war. NOTE:
+ targetPath is broken for webResources (as documented)
+ -->
+ <webResources>
+ <resource>
+ <directory>${project.build.outputDirectory}</directory>
+ <includes>
+ <include>META-INF/LICENSE*</include>
+ <include>META-INF/NOTICE*</include>
+ <include>META-INF/DISCLAIMER*</include>
+ <include>META-INF/DEPENDENCIES*</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.apache.org/repos/asf/incubator/wink/tags</tagBase>
+ <preparationGoals>clean install</preparationGoals>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
- <!-- Add manifest configuration since it is not defined in apache pom-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <!-- Add manifest configuration since it is not defined in apache pom-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
- <!-- Add manifest configuration since it is not defined in apache pom-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <!-- Add manifest configuration since it is not defined in apache pom-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
- <!-- Repositories that we are working with -->
- <!--
- <repositories> <repository> <id>central</id> <url>TBD</url>
- </repository> <repository> <id>snapshots</id> <url>TBD</url>
- <releases> <enabled>false</enabled> </releases> <snapshots>
- <enabled>true</enabled> </snapshots> </repository>
- </repositories>
- -->
+ <!-- Repositories that we are working with -->
+ <!--
+ <repositories> <repository> <id>central</id> <url>TBD</url>
+ </repository> <repository> <id>snapshots</id> <url>TBD</url>
+ <releases> <enabled>false</enabled> </releases> <snapshots>
+ <enabled>true</enabled> </snapshots> </repository> </repositories>
+ -->
- <!-- plugins repositories that we will download from -->
- <!--
- <pluginRepositories> <pluginRepository> <id>central</id>
- <url>TBD</url> </pluginRepository> <pluginRepository>
- <id>snapshots</id> <url>TBD</url> <releases>
- <enabled>false</enabled> </releases> <snapshots>
- <enabled>true</enabled> </snapshots> </pluginRepository>
- </pluginRepositories>
- -->
- <dependencyManagement>
- <dependencies>
- <!-- Internal dependencies -->
- <dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-component-test-support</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-spring-support</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-json-provider</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <!-- plugins repositories that we will download from -->
+ <!--
+ <pluginRepositories> <pluginRepository> <id>central</id>
+ <url>TBD</url> </pluginRepository> <pluginRepository>
+ <id>snapshots</id> <url>TBD</url> <releases> <enabled>false</enabled>
+ </releases> <snapshots> <enabled>true</enabled> </snapshots>
+ </pluginRepository> </pluginRepositories>
+ -->
+ <dependencyManagement>
+ <dependencies>
+ <!-- Internal dependencies -->
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-component-test-support</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-spring-support</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-json-provider</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <!-- 3rd party dependencies -->
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>2.5</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- <version>2.5</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <scope>test</scope>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.4</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20080701</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <!--
- Fix for test's re-run
- http://jira.codehaus.org/browse/SUREFIRE-257
- -->
- <reportSets>
- <reportSet>
- <reports>
- <report>report-only</report>
- </reports>
- </reportSet>
- </reportSets>
- <!--
- End of :Fix for test's re-run
- http://jira.codehaus.org/browse/SUREFIRE-257
- -->
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
- <profiles>
- <!--
- This profile should be activated during CI build.
- -->
- <profile>
- <id>CIBuild</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <property>
- <name>build</name>
- <value>CI</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <excludePackageNames>${javadoc.exclude.patterns}</excludePackageNames>
- <maxmemory>1024m</maxmemory>
- <minmemory>512m</minmemory>
- <groups>
- <group>
- <title>Common Packages</title>
- <packages>org.apache.wink.common*</packages>
- </group>
- <group>
- <title>Server Packages</title>
- <packages>org.apache.wink.server*</packages>
- </group>
- <group>
- <title>Client Packages</title>
- <packages>org.apache.wink.client*</packages>
- </group>
- <group>
- <title>Spring Support Packages</title>
- <packages>org.apache.wink.spring*</packages>
- </group>
- <group>
- <title>WebDAV Packages</title>
- <packages>org.apache.wink.webdav*</packages>
- </group>
- </groups>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>aggregate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <!--
- properties>
- <distribution.deploy.directory>ast</distribution.deploy.directory>
- </properties -->
- </profile>
- </profiles>
- <inceptionYear>2009</inceptionYear>
+ <!-- 3rd party dependencies -->
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>2.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ <version>2.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <scope>test</scope>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20080701</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <!--
+ Fix for test's re-run http://jira.codehaus.org/browse/SUREFIRE-257
+ -->
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>report-only</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <!--
+ End of :Fix for test's re-run
+ http://jira.codehaus.org/browse/SUREFIRE-257
+ -->
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+ <profiles>
+ <!--
+ This profile should be activated during CI build.
+ -->
+ <profile>
+ <id>CIBuild</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>build</name>
+ <value>CI</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <excludePackageNames>${javadoc.exclude.patterns}</excludePackageNames>
+ <maxmemory>1024m</maxmemory>
+ <minmemory>512m</minmemory>
+ <groups>
+ <group>
+ <title>Common Packages</title>
+ <packages>org.apache.wink.common*</packages>
+ </group>
+ <group>
+ <title>Server Packages</title>
+ <packages>org.apache.wink.server*</packages>
+ </group>
+ <group>
+ <title>Client Packages</title>
+ <packages>org.apache.wink.client*</packages>
+ </group>
+ <group>
+ <title>Spring Support Packages</title>
+ <packages>org.apache.wink.spring*</packages>
+ </group>
+ <group>
+ <title>WebDAV Packages</title>
+ <packages>org.apache.wink.webdav*</packages>
+ </group>
+ </groups>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <!--
+ properties>
+ <distribution.deploy.directory>ast</distribution.deploy.directory>
+ </properties
+ -->
+ </profile>
+ </profiles>
+ <inceptionYear>2009</inceptionYear>
</project>
Modified: incubator/wink/trunk/wink-examples/client/GoogleDocs-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/client/GoogleDocs-client/pom.xml?rev=820209&r1=820208&r2=820209&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/client/GoogleDocs-client/pom.xml (original)
+++ incubator/wink/trunk/wink-examples/client/GoogleDocs-client/pom.xml Wed Sep 30 08:46:37 2009
@@ -1,45 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to you under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+ -->
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<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>
- <artifactId>GoogleDocs-client</artifactId>
- <name>Apache Wink Examples Clients :: GoogleDocs</name>
- <parent>
- <groupId>org.apache.wink.example</groupId>
- <artifactId>client</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
- </parent>
- <build>
- <finalName>GoogleDocs-client</finalName>
- </build>
- <!-- Dependency on Wink SDK library -->
- <dependencies>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-client</artifactId>
- </dependency>
- </dependencies>
+<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>
+ <artifactId>GoogleDocs-client</artifactId>
+ <name>Apache Wink Examples Clients :: GoogleDocs</name>
+ <parent>
+ <groupId>org.apache.wink.example</groupId>
+ <artifactId>client</artifactId>
+ <version>0.2-incubating-SNAPSHOT</version>
+ </parent>
+ <build>
+ <finalName>GoogleDocs-client</finalName>
+ </build>
+ <!-- Dependency on Wink SDK library -->
+ <dependencies>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-client-apache-httpclient</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</project>
Modified: incubator/wink/trunk/wink-scripts/wink-dist/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-scripts/wink-dist/build.xml?rev=820209&r1=820208&r2=820209&view=diff
==============================================================================
--- incubator/wink/trunk/wink-scripts/wink-dist/build.xml (original)
+++ incubator/wink/trunk/wink-scripts/wink-dist/build.xml Wed Sep 30 08:46:37 2009
@@ -27,13 +27,11 @@
2. When new component is added to the project at the root level (in addition to common, server and client),
the following targets are effected:
a. merge.sources - if component should be added to the javadoc.
- Notice that only packages that start with org.* are added to the javadoc.
b. create.dist.components - if the component's target includes jars that should be included in dist/components and in main jars.
3. When new component is added under the root level components (e.g. under server in addition to server-core),
the following targets are effected:
a. create.dist.lib - if component has dependencies
- 4. Assumption of create.dist.lib is that no third parties have word "wink" in it and should be removed.
- 5. Changes in examples should not effect this script.
+ 4. Changes in examples should not effect this script.
-->
<property name="tmp" value="${basedir}/target/tmp" />
@@ -42,32 +40,37 @@
<property name="dist.docs" value="${dist.root}/docs" />
<property name="dist.docs.api" value="${dist.docs}/api" />
<property name="dist.dist" value="${dist.root}/dist" />
+ <property name="dist.ext" value="${dist.root}/ext" />
<property name="dist.components" value="${dist.dist}" />
<property name="dist.examples" value="${dist.root}/examples" />
<property name="dist.lib" value="${dist.root}/lib" />
<property name="project.root" value="${basedir}/../.." />
<property name="project.site" value="${project.root}/target/site" />
+
+ <!-- Main components -->
<property name="project.common" value="${project.root}/wink-common" />
<property name="project.server" value="${project.root}/wink-server" />
<property name="project.client" value="${project.root}/wink-client" />
+
+ <!-- Extensions -->
<property name="project.apache.httpclient" value="${project.root}/wink-client-apache-httpclient" />
<property name="project.webdav" value="${project.root}/wink-webdav" />
<property name="project.spring" value="${project.root}/wink-spring-support" />
- <property name="project.examples" value="${project.root}/wink-examples" />
+ <property name="project.abdera" value="${project.root}/wink-providers/wink-abdera-provider" />
+ <property name="project.jettison" value="${project.root}/wink-providers/wink-jettison-provider" />
+ <property name="project.json" value="${project.root}/wink-providers/wink-json-provider" />
+ <!-- Examples -->
+ <property name="project.examples" value="${project.root}/wink-examples" />
- <property name="tmp.src" value="${tmp}/src" />
<property name="tmp.binary" value="${tmp}/binary" />
-
<property name="wink.main.jar.name" value="wink-${project.version}.jar" />
<property name="project.developerGuide.file" value="${basedir}/../../src/doc/DeveloperGuide/Apache_Wink_User_Guide.pdf" />
<!-- Init -->
<target name="init">
-
<fail message="This script is not intend to be run standalone, but should run from maven only. Run 'mvn antrun:run'." unless="project.version" />
-
<echo message="Building distribution of ${project.name}" />
<delete dir="target" />
</target>
@@ -95,85 +98,137 @@
<copy todir="${dist.components}" flatten="true" includeemptydirs="false">
<fileset dir="${project.common}">
<include name="**/*.jar" />
+ <exclude name="**/*sources.jar" />
+ <exclude name="**/*javadoc.jar" />
</fileset>
<fileset dir="${project.server}">
<include name="**/*.jar" />
- <exclude name="**/*test-support*" />
+ <exclude name="**/*sources.jar" />
+ <exclude name="**/*javadoc.jar" />
</fileset>
<fileset dir="${project.client}">
<include name="**/*.jar" />
- </fileset>
- <fileset dir="${project.apache.httpclient}">
- <include name="**/*.jar" />
- </fileset>
- <fileset dir="${project.webdav}">
- <include name="**/*.jar" />
- </fileset>
- <fileset dir="${project.spring}">
- <include name="**/*.jar" />
+ <exclude name="**/*sources.jar" />
+ <exclude name="**/*javadoc.jar" />
</fileset>
</copy>
-
</target>
<!-- Creates lib folder with the third party jars -->
- <target name="create.dist.lib" depends="init">
+ <target name="create.dist.lib" depends="create.dist.components">
<echo>Making lib directory</echo>
<mkdir dir="${dist.lib}" />
<!-- Copies components dependencies -->
- <ant target="copy.pom.dependencied">
+ <ant target="copy.pom.dependencies">
<property name="pom.file" value="${project.root}/wink-common/pom.xml" />
+ <property name="dependency.target" value="${dist.lib}" />
</ant>
- <ant target="copy.pom.dependencied">
+ <ant target="copy.pom.dependencies">
<property name="pom.file" value="${project.root}/wink-client/pom.xml" />
+ <property name="dependency.target" value="${dist.lib}" />
</ant>
- <ant target="copy.pom.dependencied">
+ <ant target="copy.pom.dependencies">
<property name="pom.file" value="${project.root}/wink-server/pom.xml" />
+ <property name="dependency.target" value="${dist.lib}" />
</ant>
- <ant target="copy.pom.dependencied">
- <property name="pom.file" value="${project.root}/wink-webdav/pom.xml" />
+
+ <!-- Delete files that already appear in the distribution -->
+ <foreach target="delete.files" param="filename" delimiter=";">
+ <param name="delete.in" value="${dist.lib}" />
+ <path id="lib.path.ref">
+ <fileset dir="${dist.components}" includes="*.jar" />
+ </path>
+ </foreach>
+ </target>
+
+ <target name="create.extensions" depends="create.dist.lib">
+ <echo>Making ext directory</echo>
+ <ant target="create.extension">
+ <property name="extension.name" value="spring" />
+ <property name="extension.folder" value="${project.spring}" />
</ant>
- <ant target="copy.pom.dependencied">
- <property name="pom.file" value="${project.spring}/pom.xml" />
+
+ <ant target="create.extension">
+ <property name="extension.name" value="apache-httpclient" />
+ <property name="extension.folder" value="${project.apache.httpclient}" />
</ant>
- <!-- Copies retrotranslator dependencies -->
- <dependencies filesetId="apis.fileset.retrotranslator">
- <dependency groupId="org.apache.geronimo.specs" artifactId="geronimo-j2ee_1.4_spec" version="1.1" scope="compile" />
- </dependencies>
+ <ant target="create.extension">
+ <property name="extension.name" value="web-dav" />
+ <property name="extension.folder" value="${project.webdav}" />
+ </ant>
- <dependencies filesetId="examples.lib">
- <dependency groupId="commons-cli" artifactId="commons-cli" version="1.2" scope="compile" />
- </dependencies>
+ <ant target="create.extension">
+ <property name="extension.name" value="abdera" />
+ <property name="extension.folder" value="${project.abdera}" />
+ </ant>
- <mkdir dir="${dist.lib}/examples" />
- <copy todir="${dist.lib}/examples" flatten="true" overwrite="false">
- <fileset refid="examples.lib" />
- </copy>
+ <ant target="create.extension">
+ <property name="extension.name" value="jettison" />
+ <property name="extension.folder" value="${project.jettison}" />
+ </ant>
+
+ <ant target="create.extension">
+ <property name="extension.name" value="json" />
+ <property name="extension.folder" value="${project.json}" />
+ </ant>
+ </target>
- <mkdir dir="${dist.lib}/apis" />
- <copy todir="${dist.lib}/apis" flatten="true" overwrite="false">
- <fileset refid="apis.fileset.retrotranslator" />
+ <target name="create.extension">
+
+ <echo>Creating extension: ${extension.name}</echo>
+ <!-- Copy jars -->
+ <mkdir dir="${dist.ext}/${extension.name}" />
+ <copy todir="${dist.ext}/${extension.name}" flatten="true" includeemptydirs="false">
+ <fileset dir="${extension.folder}/target">
+ <include name="**/*.jar" />
+ <exclude name="**/*sources.jar" />
+ <exclude name="**/*javadoc.jar" />
+ </fileset>
</copy>
- <!-- Delete project dependencies (if any), since they are already in dist directory -->
- <delete dir="${dist.lib}">
- <include name="**/wink*${project.version}*" />
- </delete>
+ <!-- Copy dependencies -->
+ <mkdir dir="${dist.ext}/${extension.name}/lib" />
+ <ant target="copy.pom.dependencies">
+ <property name="pom.file" value="${extension.folder}/pom.xml" />
+ <property name="dependency.target" value="${dist.ext}/${extension.name}/lib" />
+ </ant>
+ <!-- Delete files that already appear in distribution or main lib -->
+ <foreach target="delete.files" param="filename" delimiter=";">
+ <param name="delete.in" value="${dist.ext}/${extension.name}/lib" />
+ <path>
+ <fileset dir="${dist.lib}" includes="*.jar" />
+ <fileset dir="${dist.components}" includes="*.jar" />
+ </path>
+ </foreach>
+ </target>
+
+ <target name="delete.files">
+ <basename file="${filename}" property="shortFileName" />
+ <available file="${delete.in}/${shortFileName}" property="fileExists">
+ </available>
+ <if>
+ <equals arg1="${fileExists}" arg2="true" />
+ <then>
+ <echo>Deleting ${delete.in}/${shortFileName}</echo>
+ <delete dir="${delete.in}">
+ <include name="${shortFileName}" />
+ </delete>
+ </then>
+ </if>
</target>
<!-- Copies dependencies of the specific pom.file to dist.lib folder. -->
- <!-- Runs from create.dist.lib target -->
- <target name="copy.pom.dependencied">
+ <target name="copy.pom.dependencies">
<echo>"${pom.file}"</echo>
<pom id="maven.project" file="${pom.file}" />
<dependencies filesetId="dependency.fileset" useScope="runtime">
<pom refid="maven.project" />
</dependencies>
- <copy todir="${dist.lib}" flatten="true" overwrite="false">
+ <copy todir="${dependency.target}" flatten="true" overwrite="false">
<fileset refid="dependency.fileset" />
</copy>
</target>
@@ -187,10 +242,6 @@
<fileset dir="${project.root}" includes="NOTICE*" />
<fileset dir="${project.root}" includes="release_notes.txt" />
</copy>
- <!-- replace the version in the copied readme.txt files -->
- <!--replace file="${dist.root}/readme.txt">
- <replacefilter token="@PROJECT_VERSION@" value="${project.version}" />
- </replace-->
<!-- Copy PDF Developer Guide that exists under trunk/src/doc/DeveloperGuide into doc directory -->
<copy file="${project.developerGuide.file}" todir="${dist.docs}" />
</target>
@@ -208,18 +259,6 @@
</target>
- <!-- Creates jar that aggregates sources of all components -->
- <target name="create.dist.main.sources.jar" depends="create.dist.components">
- <echo>Making all in one sources jar</echo>
- <ant target="create.dist.aggregator.jar">
- <property name="tmp.unzip" value="${tmp.binary}" />
- <property name="aggregator.target" value="${dist.components}" />
- <property name="aggregator.includes" value="*-${project.version}-sources.jar" />
- <property name="aggregator.jar.name" value="${dist.dist}/wink-${project.version}-sources.jar" />
- <property name="aggregator.title" value="Apache Wink Sources" />
- </ant>
- </target>
-
<!-- Merges several jars from aggregator.target using aggregator.includes to a signle jar with aggregator.jar.name -->
<target name="create.dist.aggregator.jar">
<echo>aggregator.jar.name: ${aggregator.jar.name}</echo>
@@ -272,14 +311,41 @@
<include name="**/pom.xml" />
<include name="**/readme.txt" />
<include name="**/src/main/**" />
- <exclude name="**/GoogleServices-client/**" />
<exclude name="**/target/**" />
</fileset>
</copy>
</target>
+ <!-- Creates lib under examples. This lib doesn't include any dependencies that were already included in other modules: dist, lib or ext -->
+ <target name="create.examples.lib" depends="create.examples, create.extensions">
+ <mkdir dir="${dist.examples}/lib" />
+
+ <!-- Collect all dependencies -->
+ <foreach target="copy.pom.dependencies" param="pom.file" delimiter=";">
+ <param name="dependency.target" value="${dist.examples}/lib" />
+ <path>
+ <fileset dir="${dist.examples}" id="example.poms">
+ <include name="**/pom.xml" />
+ </fileset>
+ </path>
+ </foreach>
+
+ <!-- Remove dependencies that already appear -->
+ <foreach target="delete.files" param="filename" delimiter=";">
+ <param name="delete.in" value="${dist.examples}/lib" />
+ <path>
+ <fileset dir="${dist.examples}/lib" includes="*.war" />
+ <fileset dir="${dist.lib}" includes="*.jar" />
+ <fileset dir="${dist.components}" includes="*.jar" />
+ <fileset dir="${dist.ext}" includes="**/*.jar" />
+ </path>
+ </foreach>
+
+ </target>
+
+
<!-- Done building distribution -->
- <target name="dist" depends="create.javadoc, create.dist.components, create.dist.lib, create.dist.root.docs, create.dist.main.jar, create.dist.main.sources.jar, create.examples">
+ <target name="dist" depends="create.javadoc, create.dist.components, create.dist.lib, create.extensions, create.dist.root.docs, create.dist.main.jar, create.examples, create.examples.lib">
</target>
</project>
Modified: incubator/wink/trunk/wink-scripts/wink-dist/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-scripts/wink-dist/pom.xml?rev=820209&r1=820208&r2=820209&view=diff
==============================================================================
--- incubator/wink/trunk/wink-scripts/wink-dist/pom.xml (original)
+++ incubator/wink/trunk/wink-scripts/wink-dist/pom.xml Wed Sep 30 08:46:37 2009
@@ -75,6 +75,9 @@
<inherited>false</inherited>
<configuration>
<tasks>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties">
+ <classpath refid="maven.dependency.classpath" />
+ </taskdef>
<typedef resource="org/apache/maven/artifact/ant/antlib.xml">
<classpath refid="maven.dependency.classpath" />
</typedef>