You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by bl...@apache.org on 2009/10/22 02:16:39 UTC

svn commit: r828263 - in /incubator/wink/trunk: ./ wink-assembly/ wink-assembly/wink-assembly-aggregatejar/ wink-assembly/wink-assembly-aggregatejar/src/ wink-assembly/wink-assembly-aggregatejar/src/main/ wink-assembly/wink-assembly-aggregatejar/src/ma...

Author: bluk
Date: Thu Oct 22 00:16:38 2009
New Revision: 828263

URL: http://svn.apache.org/viewvc?rev=828263&view=rev
Log:
Add wink-assembly to use maven-assembly-plugin

Generates similar output as
wink-dist/wink-scripts

See [WINK-67]

Added:
    incubator/wink/trunk/wink-assembly/
    incubator/wink/trunk/wink-assembly/pom.xml   (with props)
    incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/
    incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/DEPENDENCIES
    incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/DISCLAIMER   (with props)
    incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/NOTICE   (with props)
    incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/pom.xml   (with props)
    incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/src/
    incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/src/main/
    incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/src/main/assembly/
    incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/src/main/assembly/aggregatejar.xml   (with props)
    incubator/wink/trunk/wink-assembly/wink-assembly-dist/
    incubator/wink/trunk/wink-assembly/wink-assembly-dist/pom.xml   (with props)
    incubator/wink/trunk/wink-assembly/wink-assembly-dist/src/
    incubator/wink/trunk/wink-assembly/wink-assembly-dist/src/main/
    incubator/wink/trunk/wink-assembly/wink-assembly-dist/src/main/assembly/
    incubator/wink/trunk/wink-assembly/wink-assembly-dist/src/main/assembly/distbin.xml   (with props)
    incubator/wink/trunk/wink-assembly/wink-assembly-dist/src/main/assembly/distsrc.xml   (with props)
Modified:
    incubator/wink/trunk/pom.xml

Modified: incubator/wink/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/pom.xml?rev=828263&r1=828262&r2=828263&view=diff
==============================================================================
--- incubator/wink/trunk/pom.xml (original)
+++ incubator/wink/trunk/pom.xml Thu Oct 22 00:16:38 2009
@@ -47,6 +47,7 @@
         <module>wink-providers</module>
         <module>wink-examples</module>
         <module>wink-scripts</module>
+        <module>wink-assembly</module>
     </modules>
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/wink/trunk</connection>
@@ -374,6 +375,26 @@
                 <artifactId>wink-json-provider</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.wink</groupId>
+                <artifactId>wink-client-apache-httpclient</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.wink</groupId>
+                <artifactId>wink-abdera-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.wink</groupId>
+                <artifactId>wink-jettison-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.wink</groupId>
+                <artifactId>wink-webdav</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <!-- 3rd party dependencies -->
             <dependency>

Added: incubator/wink/trunk/wink-assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-assembly/pom.xml?rev=828263&view=auto
==============================================================================
--- incubator/wink/trunk/wink-assembly/pom.xml (added)
+++ incubator/wink/trunk/wink-assembly/pom.xml Thu Oct 22 00:16:38 2009
@@ -0,0 +1,50 @@
+<?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
+    
+     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-assembly</artifactId>
+    <name>Apache Wink Assembly</name>
+    <packaging>pom</packaging>
+    <parent>
+        <groupId>org.apache.wink</groupId>
+        <artifactId>wink</artifactId>
+        <version>0.2-incubating-SNAPSHOT</version>
+    </parent>
+    <modules>
+        <module>wink-assembly-aggregatejar</module>
+        <module>wink-assembly-dist</module>
+    </modules>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.2-beta-4</version>
+                    <configuration>
+                        <tarLongFileMode>gnu</tarLongFileMode>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>

Propchange: incubator/wink/trunk/wink-assembly/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/DEPENDENCIES
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/DEPENDENCIES?rev=828263&view=auto
==============================================================================
--- incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/DEPENDENCIES (added)
+++ incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/DEPENDENCIES Thu Oct 22 00:16:38 2009
@@ -0,0 +1,48 @@
+// ------------------------------------------------------------------
+// Transitive dependencies of this project determined from the
+// maven pom organized by organization.
+// ------------------------------------------------------------------
+
+Apache Wink
+
+
+From: 'an unknown organization'
+  - Unnamed - com.sun.xml.bind:jaxb-impl:jar:2.1.4  com.sun.xml.bind:jaxb-impl:jar:2.1.4
+
+  - Unnamed - javax.activation:activation:jar:1.1  javax.activation:activation:jar:1.1
+
+  - Unnamed - javax.xml.bind:jaxb-api:jar:2.1  javax.xml.bind:jaxb-api:jar:2.1
+
+  - Streaming API for XML  javax.xml.stream:stax-api:jar:1.0-2
+    License: GNU General Public Library  (http://www.gnu.org/licenses/gpl.txt)    License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0  (http://www.sun.com/cddl/cddl.html)
+  - Unnamed - xerces:xercesImpl:jar:2.6.2  xerces:xercesImpl:jar:2.6.2
+
+From: 'QOS.ch' (http://www.qos.ch)
+  - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.5.8
+
+  - SLF4J Simple Binding (http://www.slf4j.org) org.slf4j:slf4j-simple:jar:1.5.8
+
+From: 'Spring Framework' (http://www.springframework.org/)
+  - Spring Framework (http://www.springframework.org) org.springframework:spring:jar:2.5
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+From: 'Sun Microsystems, Inc' (http://www.sun.com/)
+  - jsr311-api (https://jsr311.dev.java.net) javax.ws.rs:jsr311-api:jar:1.0
+    License: CDDL License  (http://www.opensource.org/licenses/cddl1.php)
+
+From: 'The Apache Software Foundation' (http://jakarta.apache.org)
+  - Lang (http://jakarta.apache.org/commons/lang/) commons-lang:commons-lang:jar:2.3
+    License: The Apache Software License, Version 2.0  (/LICENSE.txt)
+
+From: 'The Apache Software Foundation' (http://www.apache.org/)
+  - Apache Wink Common (http://www.apache.org/wink/wink-common) org.apache.wink:wink-common:jar:0.2-incubating-SNAPSHOT
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+  - Apache Wink Server (http://www.apache.org/wink/wink-server) org.apache.wink:wink-server:jar:0.2-incubating-SNAPSHOT
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+  - HttpClient (http://hc.apache.org/httpcomponents-client) org.apache.httpcomponents:httpclient:jar:4.0-beta2
+    License: Apache License  (../LICENSE.txt)
+  - HttpCore (http://hc.apache.org/httpcomponents-core/) org.apache.httpcomponents:httpcore:jar:4.0-beta3
+    License: Apache License  (http://www.apache.org/licenses/LICENSE-2.0.html)
+
+
+

Added: incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/DISCLAIMER?rev=828263&view=auto
==============================================================================
--- incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/DISCLAIMER (added)
+++ incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/DISCLAIMER Thu Oct 22 00:16:38 2009
@@ -0,0 +1,10 @@
+Apache Wink is an effort undergoing incubation at the Apache Software 
+Foundation (ASF), sponsored by the Apache Incubator PMC. 
+
+Incubation is required of all newly accepted projects until a further review 
+indicates that the infrastructure, communications, and decision making process 
+have stabilized in a manner consistent with other successful ASF projects. 
+
+While incubation status is not necessarily a reflection of the completeness 
+or stability of the code, it does indicate that the project has yet to be 
+fully endorsed by the ASF.

Propchange: incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/DISCLAIMER
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/NOTICE
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/NOTICE?rev=828263&view=auto
==============================================================================
--- incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/NOTICE (added)
+++ incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/NOTICE Thu Oct 22 00:16:38 2009
@@ -0,0 +1,8 @@
+
+Apache Wink
+Copyright 2009 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+

Propchange: incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/NOTICE
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/pom.xml?rev=828263&view=auto
==============================================================================
--- incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/pom.xml (added)
+++ incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/pom.xml Thu Oct 22 00:16:38 2009
@@ -0,0 +1,98 @@
+<?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
+    
+     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-assembly-aggregatejar</artifactId>
+    <name>Apache Wink Assembly :: Aggregate JAR</name>
+    <packaging>pom</packaging>
+    <parent>
+        <groupId>org.apache.wink</groupId>
+        <artifactId>wink-assembly</artifactId>
+        <version>0.2-incubating-SNAPSHOT</version>
+    </parent>
+    <properties>
+        <SDK_JAR_NAME>wink-${project.version}.jar</SDK_JAR_NAME>
+        <SDK_COMMON_JAR_NAME>wink-common-${project.version}.jar</SDK_COMMON_JAR_NAME>
+        <SDK_CLIENT_JAR_NAME>wink-client-${project.version}.jar</SDK_CLIENT_JAR_NAME>
+    </properties>
+    <profiles>
+        <profile>
+            <id>CIBuild</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>build</name>
+                    <value>CI</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.wink</groupId>
+                    <artifactId>wink-common</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.wink</groupId>
+                    <artifactId>wink-server</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.wink</groupId>
+                    <artifactId>wink-client</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.wink</groupId>
+                    <artifactId>wink-spring-support</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.wink</groupId>
+                    <artifactId>wink-webdav</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.wink</groupId>
+                    <artifactId>wink-client-apache-httpclient</artifactId>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <inherited>false</inherited>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/aggregatejar.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>make-all-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>

Propchange: incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/src/main/assembly/aggregatejar.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/src/main/assembly/aggregatejar.xml?rev=828263&view=auto
==============================================================================
--- incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/src/main/assembly/aggregatejar.xml (added)
+++ incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/src/main/assembly/aggregatejar.xml Thu Oct 22 00:16:38 2009
@@ -0,0 +1,104 @@
+<?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
+    
+     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.
+-->
+<assembly>
+    <id>aggregatejar</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <includes>
+                <include>org.apache.wink:wink-common</include>
+            </includes>
+            <unpack>true</unpack>
+            <excludes>
+                <exclude>**/NOTICE</exclude>
+                <exclude>**/DEPENDENCIES</exclude>
+                <exclude>**/DISCLAIMER</exclude>
+            </excludes>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.apache.wink:wink-client</include>
+            </includes>
+            <unpack>true</unpack>
+            <excludes>
+                <exclude>**/NOTICE</exclude>
+                <exclude>**/DEPENDENCIES</exclude>
+                <exclude>**/DISCLAIMER</exclude>
+            </excludes>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.apache.wink:wink-server</include>
+            </includes>
+            <unpack>true</unpack>
+            <excludes>
+                <exclude>**/NOTICE</exclude>
+                <exclude>**/DEPENDENCIES</exclude>
+                <exclude>**/DISCLAIMER</exclude>
+            </excludes>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.apache.wink:wink-webdav</include>
+            </includes>
+            <unpack>true</unpack>
+            <excludes>
+                <exclude>**/NOTICE</exclude>
+                <exclude>**/DEPENDENCIES</exclude>
+                <exclude>**/DISCLAIMER</exclude>
+            </excludes>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.apache.wink:wink-spring-support</include>
+            </includes>
+            <unpack>true</unpack>
+            <excludes>
+                <exclude>**/NOTICE</exclude>
+                <exclude>**/DEPENDENCIES</exclude>
+                <exclude>**/DISCLAIMER</exclude>
+            </excludes>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.apache.wink:wink-client-apache-httpclient</include>
+            </includes>
+            <unpack>true</unpack>
+            <excludes>
+                <exclude>**/NOTICE</exclude>
+                <exclude>**/DEPENDENCIES</exclude>
+                <exclude>**/DISCLAIMER</exclude>
+            </excludes>
+        </dependencySet>
+     </dependencySets>
+    <fileSets>
+        <fileSet>
+            <includes>
+                <include>NOTICE</include>
+                <include>DEPENDENCIES</include>
+                <include>DISCLAIMER</include>
+            </includes>
+            <outputDirectory>META-INF</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>

Propchange: incubator/wink/trunk/wink-assembly/wink-assembly-aggregatejar/src/main/assembly/aggregatejar.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/wink/trunk/wink-assembly/wink-assembly-dist/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-assembly/wink-assembly-dist/pom.xml?rev=828263&view=auto
==============================================================================
--- incubator/wink/trunk/wink-assembly/wink-assembly-dist/pom.xml (added)
+++ incubator/wink/trunk/wink-assembly/wink-assembly-dist/pom.xml Thu Oct 22 00:16:38 2009
@@ -0,0 +1,142 @@
+<?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
+    
+     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-assembly-dist</artifactId>
+    <name>Apache Wink Assembly :: Distribution</name>
+    <packaging>pom</packaging>
+    <parent>
+        <groupId>org.apache.wink</groupId>
+        <artifactId>wink-assembly</artifactId>
+        <version>0.2-incubating-SNAPSHOT</version>
+    </parent>
+    <properties>
+        <SDK_JAR_NAME>wink-${project.version}.jar</SDK_JAR_NAME>
+        <SDK_COMMON_JAR_NAME>wink-common-${project.version}.jar</SDK_COMMON_JAR_NAME>
+        <SDK_CLIENT_JAR_NAME>wink-client-${project.version}.jar</SDK_CLIENT_JAR_NAME>
+    </properties>
+   <profiles>
+        <profile>
+            <id>CIBuild</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>build</name>
+                    <value>CI</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.wink</groupId>
+                    <artifactId>wink-common</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.wink</groupId>
+                    <artifactId>wink-server</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.wink</groupId>
+                    <artifactId>wink-client</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.wink</groupId>
+                    <artifactId>wink-spring-support</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.wink</groupId>
+                    <artifactId>wink-webdav</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.wink</groupId>
+                    <artifactId>wink-client-apache-httpclient</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.wink</groupId>
+                    <artifactId>wink-abdera-provider</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.wink</groupId>
+                    <artifactId>wink-jettison-provider</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.wink</groupId>
+                    <artifactId>wink-json-provider</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.wink</groupId>
+                    <artifactId>wink-assembly-aggregatejar</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>aggregatejar</classifier>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.wink.example</groupId>
+                    <artifactId>GoogleDocs-client</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+                    <scope>runtime</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <inherited>false</inherited>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>make-bin-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <finalName>apache-wink-${project.version}</finalName>
+                                    <appendAssemblyId>false</appendAssemblyId>
+                                    <descriptors>
+                                        <descriptor>src/main/assembly/distbin.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>make-src-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <finalName>apache-wink-${project.version}-src</finalName>
+                                    <appendAssemblyId>false</appendAssemblyId>
+                                    <descriptors>
+                                        <descriptor>src/main/assembly/distsrc.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>

Propchange: incubator/wink/trunk/wink-assembly/wink-assembly-dist/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/wink/trunk/wink-assembly/wink-assembly-dist/src/main/assembly/distbin.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-assembly/wink-assembly-dist/src/main/assembly/distbin.xml?rev=828263&view=auto
==============================================================================
--- incubator/wink/trunk/wink-assembly/wink-assembly-dist/src/main/assembly/distbin.xml (added)
+++ incubator/wink/trunk/wink-assembly/wink-assembly-dist/src/main/assembly/distbin.xml Thu Oct 22 00:16:38 2009
@@ -0,0 +1,229 @@
+<?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
+    
+     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.
+-->
+<assembly>
+    <id>bin</id>
+    <formats>
+        <format>zip</format>
+        <format>tar.gz</format>
+    </formats>
+    <includeBaseDirectory>true</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <includes>
+                <include>org.apache.wink:wink-assembly-aggregatejar:jar:aggregatejar:${project.version}</include>
+            </includes>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>dist</outputDirectory>
+            <outputFileNameMapping>wink-${project.version}.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.apache.wink:wink-common</include>
+                <include>org.apache.wink:wink-server</include>
+                <include>org.apache.wink:wink-client</include>
+            </includes>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>dist</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>javax.activation:activation</include>
+                <include>commons-lang:commons-lang</include>
+                <include>com.sun.xml.bind:jaxb-impl</include>
+                <include>javax.xml.bind:jaxb-api</include>
+                <include>javax.ws.rs:jsr311-api</include>
+                <include>org.slf4j:slf4j-api</include>
+                <include>org.slf4j:slf4j-simple</include>
+                <include>stax:stax-api:*:1.0.2</include>
+            </includes>
+            <useProjectArtifact>false</useProjectArtifact>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <outputDirectory>lib</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.apache.wink:wink-abdera-provider</include>
+            </includes>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>ext/wink-abdera-provider</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.apache.abdera:*</include>
+                <include>org.apache.ws.commons.axiom:*</include>
+                <include>commons-codec:commons-codec</include>
+                <include>nu.validator.htmlparser:htmlparser</include>
+                <include>jaxen:jaxen</include>
+                <include>org.codehaus.woodstox:wstx-asl</include>
+                <include>xerces:xercesImpl</include>
+                <include>xml-apis:xml-apis</include>
+            </includes>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>ext/wink-abdera-provider/lib</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.apache.wink:wink-client-apache-httpclient</include>
+            </includes>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>ext/wink-client-apache-httpclient</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>commons-logging:commons-logging</include>
+                <include>commons-codec:commons-codec</include>
+                <include>org.apache.httpcomponents:httpcore</include>
+                <include>org.apache.httpcomponents:httpclient</include>
+                <include>net.jcip:jcip-annotations</include>
+            </includes>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>ext/wink-client-apache-httpclient</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.apache.wink:wink-jettison-provider</include>
+            </includes>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>ext/wink-jettison-provider</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.codehaus.jettison:jettison</include>
+            </includes>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>ext/wink-jettison-provider/lib</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.apache.wink:wink-json-provider</include>
+            </includes>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>ext/wink-json-provider</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.json:json</include>
+            </includes>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>ext/wink-json-provider/lib</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.apache.wink:wink-spring-support</include>
+            </includes>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>ext/wink-spring-support</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.slf4j:jcl-over-slf4j</include>
+                <include>org.springframework:spring</include>
+            </includes>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>ext/wink-spring-support/lib</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.apache.wink:wink-webdav</include>
+            </includes>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>ext/wink-webdav</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>commons-cli:commons-cli</include>
+            </includes>
+            <useProjectArtifact>false</useProjectArtifact>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <outputDirectory>examples/lib</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+        </dependencySet>
+        <dependencySet>
+            <includes>
+                <include>org.apache.geronimo.specs:geronimo-j2ee_1.4_spec</include>
+            </includes>
+            <useProjectArtifact>false</useProjectArtifact>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+            <outputDirectory>examples/lib</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+        </dependencySet>
+       </dependencySets>
+     <fileSets>
+        <fileSet>
+            <directory>../../target/site/apidocs</directory>
+            <outputDirectory>docs/api</outputDirectory>
+            <excludes>
+                <exclude>**/javadoc.*</exclude>
+                <exclude>**/options</exclude>
+                <exclude>**/packages</exclude>
+            </excludes>
+            <useStrictFiltering>true</useStrictFiltering>
+        </fileSet>
+        <fileSet>
+            <directory>../../src/doc/DeveloperGuide</directory>
+            <outputDirectory>docs</outputDirectory>
+            <includes>
+                <include>Apache_Wink_User_Guide.pdf</include>
+            </includes>
+            <useStrictFiltering>true</useStrictFiltering>
+        </fileSet>
+        <fileSet>
+            <directory>../../</directory>
+            <outputDirectory>.</outputDirectory>
+            <includes>
+                <include>NOTICE</include>
+                <include>LICENSE</include>
+                <include>DISCLAIMER</include>
+                <include>release_notes.txt</include>
+            </includes>
+            <useStrictFiltering>true</useStrictFiltering>
+        </fileSet>
+        <fileSet>
+            <directory>../../wink-examples</directory>
+            <outputDirectory>examples</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
+            <includes>
+                <include>**/pom.xml</include>
+                <include>**/src/**</include>
+                <include>**/readme.txt</include>
+                <include>**/build.xml</include>
+            </includes>
+            <excludes>
+                <exclude>**/target/**</exclude>
+                <exclude>**/QADefectWithSpring/**</exclude>
+            </excludes>
+            <filtered>true</filtered>
+        </fileSet>
+    </fileSets>
+</assembly>

Propchange: incubator/wink/trunk/wink-assembly/wink-assembly-dist/src/main/assembly/distbin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/wink/trunk/wink-assembly/wink-assembly-dist/src/main/assembly/distsrc.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-assembly/wink-assembly-dist/src/main/assembly/distsrc.xml?rev=828263&view=auto
==============================================================================
--- incubator/wink/trunk/wink-assembly/wink-assembly-dist/src/main/assembly/distsrc.xml (added)
+++ incubator/wink/trunk/wink-assembly/wink-assembly-dist/src/main/assembly/distsrc.xml Thu Oct 22 00:16:38 2009
@@ -0,0 +1,41 @@
+<?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
+    
+     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.
+-->
+
+
+<assembly>
+    <id>src</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>zip</format>
+        <format>tar.gz</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <directory>../../</directory>
+            <useDefaultExcludes>true</useDefaultExcludes>
+            <outputDirectory>apache-wink-${project.version}-src</outputDirectory>
+            <excludes>
+                <exclude>**/target</exclude>
+                <exclude>**/target/**</exclude>
+                <exclude>KEYS</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+</assembly>

Propchange: incubator/wink/trunk/wink-assembly/wink-assembly-dist/src/main/assembly/distsrc.xml
------------------------------------------------------------------------------
    svn:eol-style = native